Changeset 287 for trunk/thune/gl

Timestamp:

09/30/06 03:47:37 (2 years ago)

Author:

krobillard

Message:

Thune GL - Fixed font! bugs.

Location:

trunk/thune/gl

Files:

• TexFont.c (modified) (1 diff)
• TexFont.h (modified) (1 diff)
• draw_list.c (modified) (1 diff)
• gx.c (modified) (1 diff)
• rfont.c (modified) (4 diffs)
• test.t (modified) (3 diffs)

trunk/thune/gl/TexFont.c

@@ -499 +499 @@
             free( txf->kerning );
         txf->kerning = (uint8_t*) kern.ptr;
+        txf->kern_bytes = kern.used;
+    }
+    else
+    {
+        txf->kerning = 0;
+        txf->kern_bytes = 0;
     }
 #endif

trunk/thune/gl/TexFont.h

@@ -24 +24 @@
 typedef struct
 {
+    TexGlyphInfo* tgi;
+    TexGlyphInfo** table;
+    uint8_t* kerning;
+
     int16_t tex_width;
     int16_t tex_height;
     int16_t max_ascent;
     int16_t max_descent;
-    int32_t num_glyphs;
+    int16_t num_glyphs;
     int16_t min_glyph;
     int16_t table_size;
-
-    TexGlyphInfo* tgi;
-    TexGlyphInfo** table;
-    uint8_t* kerning;
+    int16_t kern_bytes;
 }
 TexFont;

trunk/thune/gl/draw_list.c

@@ -143 +143 @@
 
 
-/**
+/*
   Returns TexGlyphInfo of rendered glyph.
   Advances x.

trunk/thune/gl/gx.c

@@ -33 +33 @@
 /*
 #include "math3d.h"
-#include "res_font.h"
-#include "dlist.h"
 #include <time.h>
 */

trunk/thune/gl/rfont.c

@@ -93 +93 @@
     " ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz"
     "?.;,!*:\"/+-|'@#$%^&<>()[]{}_";
-
-
-static int _kernTableSize( uint8_t* kern )
-{
-    int count = 0;
-    if( kern )
-    {
-        while( *kern++ )
-            ++count;
-    }
-    return count;
-}
 
 
@@ -145 +133 @@
             TexFont* btf;
             int gs, ts, ks;
+            TexGlyphInfo** dst;
+            TexGlyphInfo** src;
+            TexGlyphInfo** end;
 
             // TODO: Track & delete texture.
@@ -154 +145 @@
             gs = sizeof(TexGlyphInfo) * tf.num_glyphs;
             ts = sizeof(TexGlyphInfo*) * tf.table_size;
-            ks = _kernTableSize( tf.kerning );
+            ks = tf.kerning ? tf.kern_bytes : 0;
 
             binN = ur_makeBinary( sizeof(TexFont) + gs + ts + ks );
             bin = ur_binPtr( binN );
+            bin->used = bin->avail;
 
             btf = (TexFont*) bin->ptr.v;
@@ -163 +155 @@
 
             btf->table = (TexGlyphInfo**) (btf + 1);
-            memCpy( btf->table, tf.table, ts );
-
-            btf->tgi = (TexGlyphInfo*) (btf->table + tf.table_size);
+            btf->tgi   = (TexGlyphInfo*) (btf->table + tf.table_size);
+
+            src = tf.table;
+            end = src + tf.table_size;
+            dst = btf->table;
+            while( src != end )
+            {
+                if( *src )
+                    *dst++ = btf->tgi + (*src - tf.tgi);
+                else
+                    *dst++ = 0;
+                ++src;
+            }
+            //memCpy( btf->table, tf.table, ts );
+
             memCpy( btf->tgi, tf.tgi, gs );
 

trunk/thune/gl/test.t

@@ -117 +117 @@
             call bg-list
         pop
+
         font fontA  color $ffffff
         text "Hello^/There"
@@ -122 +123 @@
         text -200,-200 "-200,-200"
         text mouse-pos mouse-pos
+
+        ;font fontF
+        ;text 0,40 "Ceti Alpha III"
+
         ;children ['draw get do] iter
     ]
@@ -223 +228 @@
 
 font! ["data/20thfont.ttf" 22] make :fontA
+;font! ["data/FederationBold_KR.ttf" 12 256,128] make :fontF