ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/pango-render.c
(Generate patch)

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.9 by root, Sat Aug 11 11:41:24 2007 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC

… …
164static void 164static void
165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
166{ 166{
167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g; 168 glyph_info *g;
169 float x1, y1, x2, y2;
170 169
171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 170 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172 { 171 {
173 glyph = pango_opengl_get_unknown_glyph (font); 172 glyph = pango_opengl_get_unknown_glyph (font);
174 173
… …
181 if (!g || g->generation != tc_generation) 180 if (!g || g->generation != tc_generation)
182 { 181 {
183 Glyph bm; 182 Glyph bm;
184 font_render_glyph (&bm, font, glyph); 183 font_render_glyph (&bm, font, glyph);
185 184
186 if (g) 185 if (!g)
187 g->generation = tc_generation;
188 else
189 { 186 {
190 g = g_slice_new (glyph_info); 187 g = g_slice_new (glyph_info);
191 188
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 189 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 190 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 } 191 }
195 192
196 tc_get (&g->tex, bm.width, bm.height); 193 g->generation = tc_generation;
197 194
198 g->left = bm.left; 195 g->left = bm.left;
199 g->top = bm.top; 196 g->top = bm.top;
200 197
198 tc_get (&g->tex, bm.width, bm.height);
199
200 if (bm.width && bm.height)
201 {
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 202 glBindTexture (GL_TEXTURE_2D, g->tex.name);
202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 203 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 204 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
204 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); 205 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 206 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4); 207 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
208 }
207 } 209 }
208 210
209 x += g->left; 211 x += g->left;
210 y -= g->top; 212 y -= g->top;
211 213
212 x1 = g->tex.x * (1. / TC_WIDTH );
213 y1 = g->tex.y * (1. / TC_HEIGHT);
214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
216
217 if (g->tex.name != renderer->key.texname) 214 if (g->tex.name != renderer->key.texname)
218 { 215 {
219 renderer->key.texname = g->tex.name; 216 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 217 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 218 }
222 219
223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0); 220 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
227} 221}
228 222
229static void 223static void
230draw_trapezoid (PangoRenderer *renderer_, 224draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 225 PangoRenderPart part,
… …
252 rc_v2f (arr, x12, y2); 246 rc_v2f (arr, x12, y2);
253} 247}
254 248
255void 249void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 250pango_opengl_render_layout_subpixel (PangoLayout *layout,
251 rc_t *rc,
257 int x, int y, 252 int x, int y,
258 float r, float g, float b, float a, 253 float r, float g, float b, float a,
259 int flags) 254 int flags)
260{ 255{
261 PangoContext *context; 256 PangoContext *context;
… …
266 context = pango_layout_get_context (layout); 261 context = pango_layout_get_context (layout);
267 fontmap = pango_context_get_font_map (context); 262 fontmap = pango_context_get_font_map (context);
268 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 263 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
269 gl = PANGO_OPENGL_RENDERER (renderer); 264 gl = PANGO_OPENGL_RENDERER (renderer);
270 265
271 gl->rc = rc_alloc (); 266 gl->rc = rc;
272 gl->r = r; 267 gl->r = r;
273 gl->g = g; 268 gl->g = g;
274 gl->b = b; 269 gl->b = b;
275 gl->a = a; 270 gl->a = a;
276 gl->flags = flags; 271 gl->flags = flags;
277 272
278 glEnable (GL_TEXTURE_2D);
279 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
280 glEnable (GL_BLEND);
281 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
282 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
283 glEnable (GL_ALPHA_TEST);
284 glAlphaFunc (GL_GREATER, 0.01f);
285
286 pango_renderer_draw_layout (renderer, layout, x, y); 273 pango_renderer_draw_layout (renderer, layout, x, y);
287
288 rc_draw (gl->rc);
289
290 glDisable (GL_ALPHA_TEST);
291 glDisable (GL_BLEND);
292 glDisable (GL_TEXTURE_2D);
293
294 rc_free (gl->rc);
295} 274}
296 275
297void 276void
298pango_opengl_render_layout (PangoLayout *layout, 277pango_opengl_render_layout (PangoLayout *layout,
278 rc_t *rc,
299 int x, int y, 279 int x, int y,
300 float r, float g, float b, float a, 280 float r, float g, float b, float a,
301 int flags) 281 int flags)
302{ 282{
303 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 283 pango_opengl_render_layout_subpixel (
284 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
285 );
304} 286}
305 287
306static void 288static void
307pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 289pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
308{ 290{
… …
324 306
325 renderer->underline = PANGO_UNDERLINE_NONE; 307 renderer->underline = PANGO_UNDERLINE_NONE;
326 renderer->strikethrough = FALSE; 308 renderer->strikethrough = FALSE;
327 309
328 gl->key.mode = GL_QUADS; 310 gl->key.mode = GL_QUADS;
329 gl->key.format = GL_T2F_V3F; 311 gl->key.format = 0; // glyphs
330 gl->key.texname = 0; 312 gl->key.texname = 0;
331 313
332 for (l = run->item->analysis.extra_attrs; l; l = l->next) 314 for (l = run->item->analysis.extra_attrs; l; l = l->next)
333 { 315 {
334 PangoAttribute *attr = l->data; 316 PangoAttribute *attr = l->data;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines