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.10 by root, Sat Aug 11 12:07:54 2007 UTC vs.
Revision 1.11 by root, Sun Aug 12 08:44:22 2007 UTC

207 } 207 }
208 208
209 x += g->left; 209 x += g->left;
210 y -= g->top; 210 y -= g->top;
211 211
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) 212 if (g->tex.name != renderer->key.texname)
218 { 213 {
219 renderer->key.texname = g->tex.name; 214 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 215 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 216 }
222 217
223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0); 218 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} 219}
228 220
229static void 221static void
230draw_trapezoid (PangoRenderer *renderer_, 222draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 223 PangoRenderPart part,
312 304
313 renderer->underline = PANGO_UNDERLINE_NONE; 305 renderer->underline = PANGO_UNDERLINE_NONE;
314 renderer->strikethrough = FALSE; 306 renderer->strikethrough = FALSE;
315 307
316 gl->key.mode = GL_QUADS; 308 gl->key.mode = GL_QUADS;
317 gl->key.format = GL_T2F_V3F; 309 gl->key.format = 0; // glyphs
318 gl->key.texname = 0; 310 gl->key.texname = 0;
319 311
320 for (l = run->item->analysis.extra_attrs; l; l = l->next) 312 for (l = run->item->analysis.extra_attrs; l; l = l->next)
321 { 313 {
322 PangoAttribute *attr = l->data; 314 PangoAttribute *attr = l->data;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines