Changeset 540 for trunk/thune/gl/draw_list.c

Timestamp:

07/04/08 03:46:13 (5 months ago)

Author:

krobillard

Message:

Thune

• Implemented date!. Added ur_arrayExpand(), save.

ThuneGL

• Added line-edit widget, blit, move-glyphs.
• Can now make font from texture & binary.
• Optimized renderGlyphXY() a bit.
• twidget close event handler works again.
• Updated thune-gl.spec for renamed glv RPM.

Files:

• trunk/thune/gl/draw_list.c (modified) (6 diffs)

trunk/thune/gl/draw_list.c

@@ -242 +242 @@
   Advances x.
 */
-static TexFontGlyph* renderGlyphXY( const TexFont* txf, int c,
-                                    GLfloat* xp, GLfloat y,
+static TexFontGlyph* renderGlyphXY( const TexFont* txf,
+                                    GLfloat texW, GLfloat texH,
+                                    int c, GLfloat* xp, GLfloat y,
                                     const TexFontGlyph* leftGI )
 {
-    GLfloat w, h;
-    GLfloat tw, th;
+    GLfloat gw, gh;
     GLfloat gx, gy;
     GLfloat min_s, max_s;
@@ -257 +257 @@
     if( tgi )
     {
-        w = (GLfloat) txf->tex_width;
-        h = (GLfloat) txf->tex_height;
-
-        tw = (GLfloat) tgi->width;
-        th = (GLfloat) tgi->height;
-
+        gw = (GLfloat) tgi->width;
+        gh = (GLfloat) tgi->height;
         gx = (GLfloat) tgi->x;
         gy = (GLfloat) tgi->y;
 
-        min_s = gx / w;
-        min_t = 1.0f - (gy / h);
-        max_s = (gx + tw) / w;
-        max_t = 1.0f - ((gy + th) / h);
+        min_s = gx / texW;
+        max_s = (gx + gw) / texW;
+#if 0
+        min_t = 1.0f - (gy / texH);
+        max_t = 1.0f - ((gy + gh) / texH);
+#else
+        min_t = gy / texH;
+        max_t = (gy - gh) / texH;
+#endif
 
         xkern = leftGI ? txf_kerning( txf, leftGI, tgi ) : 0;
@@ -278 +279 @@
 
         glTexCoord2f( min_s, min_t );  glVertex2f( gx, gy );
-        glTexCoord2f( max_s, min_t );  glVertex2f( gx + tw, gy );
-        glTexCoord2f( max_s, max_t );  glVertex2f( gx + tw, gy + th );
-        glTexCoord2f( min_s, max_t );  glVertex2f( gx, gy + th );
+        glTexCoord2f( max_s, min_t );  glVertex2f( gx + gw, gy );
+        glTexCoord2f( max_s, max_t );  glVertex2f( gx + gw, gy + gh );
+        glTexCoord2f( min_s, max_t );  glVertex2f( gx, gy + gh );
     }
     return tgi;
@@ -302 +303 @@
 {
     GLfloat x, y;
+    GLfloat tw, th;
     TexFontGlyph* prev = 0;
+
+    tw = (GLfloat) tf->tex_width;
+    th = (GLfloat) tf->tex_height;
 
     if( (it != end) )
@@ -317 +322 @@
             {
                 x = (GLfloat) tf->max_ascent;
-                y -= x * 1.5f;  // Estimate of line spacing.
+                y -= txf_lineSpacing( tf );
                 x = grState.penX;
                 prev = 0;
@@ -328 +333 @@
             else
             {
-                prev = renderGlyphXY( tf, *it, &x, y, prev );
+                prev = renderGlyphXY( tf, tw, th, *it, &x, y, prev );
             }
             ++it;