[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/pango-render.c

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.12 by root, Mon Aug 13 15:31:21 2007 UTC

 static void
 draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
 {
   PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
   glyph_info *g;
-  float x1, y1, x2, y2;
   if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
     {
       glyph = pango_opengl_get_unknown_glyph (font);
     }
   x += g->left;
   y -= g->top;
-  x1 = g->tex.x * (1. / TC_WIDTH );
-  y1 = g->tex.y * (1. / TC_HEIGHT);
-  x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
-  y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
   if (g->tex.name != renderer->key.texname)
     {
       renderer->key.texname = g->tex.name;
       renderer->arr = rc_array (renderer->rc, &renderer->key);
     }
-  rc_t2f_v3f (renderer->arr, x1, y1, x           , y           , 0);
+  rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
-  rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y           , 0);
-  rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
-  rc_t2f_v3f (renderer->arr, x1, y2, x           , y + g->tex.h, 0);
 }
 static void
 draw_trapezoid (PangoRenderer   *renderer_,
 		PangoRenderPart  part,
   renderer->underline = PANGO_UNDERLINE_NONE;
   renderer->strikethrough = FALSE;
   gl->key.mode    = GL_QUADS;
-  gl->key.format  = GL_T2F_V3F;
+  gl->key.format  = 0; // glyphs
   gl->key.texname = 0;
   for (l = run->item->analysis.extra_attrs; l; l = l->next)
     {
       PangoAttribute *attr = l->data;

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