Changeset 540 for trunk/thune/gl/TexFont.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/TexFont.c (modified) (3 diffs)

trunk/thune/gl/TexFont.c

@@ -132 +132 @@
         it = (uint16_t*) KERN(tf);
         swap16( it, it + tf->kern_size );
+    }
+}
+
+
+/**
+  Change the texture position of all glyphs.
+*/
+void txf_moveGlyphs( TexFont* tf, int dx, int dy )
+{
+    TexFontGlyph* tgi = GLYPHS(tf);
+    TexFontGlyph* end = tgi + tf->glyph_count;
+    while( tgi != end )
+    {
+        tgi->x += dx;
+        tgi->y += dy;
+        ++tgi;
     }
 }
@@ -352 +368 @@
     // Most glyphs have no kerning adjustment, and those with it have only
     // a handful (at least at small font sizes).
-    kern_space = count * 5;     // 5 = 2 glyphs + terminator
+    kern_space = count * 7;     // 7 = 3 glyphs + terminator
 
     txf = (TexFont*) malloc(  sizeof(TexFont) +
@@ -437 +453 @@
         tgi->advance = FT_PIXELS(glyph->metrics.horiAdvance);
         tgi->x       = x /*+ tgi->xoffset*/;
+#if 0
         tgi->y       = img->height - y + tgi->yoffset;
+#else
+        tgi->y       = y - tgi->yoffset;
+#endif
 
 #ifdef DUMP