Getting bit/color mapping correct

src/dhgr.tk/makefile

@@ -9,6 +9,7 @@ DHGREASY   = dhgr.tk/utils/DHGREASY.REL
 DHGRRGB    = dhgr.tk/utils/DHGRRGB.REL
 DHGRSHOW   = dhgr.tk/utils/DHGRSHOW.REL
 DLGRCONV   = dhgr.tk/utils/DLGRCONV.REL
+TTFCONV    = dhgr.tk/utils/ttfconv
 PENGUINS   = dhgr.tk/demos/penguins/PENGUINS.REL
 
 
@@ -36,6 +37,8 @@ demos: $(PENGUINS)
 	cp $(PENGUINS) prodos/dhgr.tk/demos/penguins/
 	cp dhgr.tk/demos/penguins/*.BIN prodos/dhgr.tk/demos/penguins/
 
+ttfconv: $(TTFCONV)
+
 all: libs test utils demos
 
 clean:
@@ -43,6 +46,10 @@ clean:
 	-rm dhgr.tk/test/*.o dhgr.tk/test/*.REL dhgr.tk/test/*.a
 	-rm dhgr.tk/utils/*.o dhgr.tk/utils/*.REL dhgr.tk/utils/*.a
 
+
+$(TTFCONV): dhgr.tk/utils/ttfconv.c
+	cc `pkg-config --cflags freetype2` dhgr.tk/utils/ttfconv.c -o dhgr.tk/utils/ttfconv -lfreetype
+
 $(DHGRLIB): dhgr.tk/libs/dhgrlib.pla dhgr.tk/inc/dhgrlib.plh
 	./plasm -AMOW dhgr.tk/libs/dhgrlib.pla
 	acme --setpc 4094 -o $(DHGRLIB) dhgr.tk/libs/dhgrlib.a

src/dhgr.tk/test/dhgrtest.pla

@@ -151,6 +151,13 @@ end
 //             Test Harness             //
 //                                      //
 //////////////////////////////////////////
+def fontTest#0
+  var xorg,yorg,width,height,pixptr,t_ptr,f_ptr
+
+  xorg,yorg,width,height,pixptr = spriteRead("trade.spr")
+  dcgrPixmap(70-xorg,96-yorg,width,height,pixptr)
+  getc
+end
 def dhgrTest#0
   word i
 
@@ -445,6 +452,7 @@ end
 rlesprptr = heapmark
 heapalloc(dcgrEncPixMap(SPR_W,SPR_H,@sprite,rlesprptr))
 dhgrMode(DHGR_COLOR_MODE)
+fontTest
 dhgrTest
 screenRead("splash.dhgr")
 dhgrOp(OP_SRC)

src/dhgr.tk/utils/ttfconv.c

@@ -9,23 +9,31 @@
 #include <freetype2/ft2build.h>
 #include <freetype/freetype.h>
 //#include FT_FREETYPE2_H
-#define FONT_WIDTH 12
+#define FONT_WIDTH  32 // 12
-#define FONT_HEIGHT 20
+#define FONT_HEIGHT 12 // 20
+/*
+ * Bit reversals
+ */
+unsigned char pixReverse[256];
+unsigned char clrSwap[256];
+unsigned char clrRot[] = {0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,
+                           0x01,0x03,0x05,0x07,0x09,0x0B,0x0D,0x0F};
 /*
  * Glyph render routines.
  */
 unsigned char *glyph_buf;
-int glyph_width, glyph_height, glyph_base, glyph_pitch;
+int glyph_width, glyph_byte_width, glyph_height, glyph_base, glyph_pitch;
-void pixblt(unsigned char *srcbuf, int srcpitch, unsigned char *dstbuf, int dstpitch, int width, int height)
+void bitblt(unsigned char *srcbuf, int srcpitch, unsigned char *dstbuf, int dstpitch, int width, int height)
 {
     int i, j;
 
+    width = (width + 7) / 8;
     for (j = 0; j < height; j++)
     {
-    for (i = 0; i < width; i++)
+        for (i = 0; i < width; i++)
-        dstbuf[i] = srcbuf[i];
+            dstbuf[i] = srcbuf[i];
-    srcbuf += srcpitch;
+        srcbuf += srcpitch;
-    dstbuf += dstpitch;
+        dstbuf += dstpitch;
     }
 }
 void strblt(char *string, unsigned char *dstbuf, int dstpitch, int x, int y)
@@ -34,13 +42,13 @@ void strblt(char *string, unsigned char *dstbuf, int dstpitch, int x, int y)
     dstbuf += x + y * dstpitch;
     for (c = 0; c < l; c++)
     {
-    pixblt(glyph_buf + (string[c] - 32) * glyph_width,
+        bitblt(glyph_buf + (string[c] - 32) * glyph_byte_width,
-           glyph_pitch,
+               glyph_pitch,
-           dstbuf,
+               dstbuf,
-           dstpitch,
+               dstpitch,
-           glyph_width,
+               glyph_width,
-           glyph_height);
+               glyph_height);
-    dstbuf += glyph_width;
+        dstbuf += glyph_width;
     }
 }
 void create_font_glyphs(FT_Face face)
@@ -48,20 +56,28 @@ void create_font_glyphs(FT_Face face)
     int c, glyph_top;
 
     FT_Set_Pixel_Sizes(face, glyph_width * 1.5, glyph_height);
-    glyph_pitch = glyph_width * (128-32);
+    glyph_pitch = (128-32+1) * glyph_byte_width;
     glyph_buf = malloc(glyph_pitch * glyph_height);
     memset(glyph_buf, 0, glyph_pitch * glyph_height);
     for (c = 32; c < 128; c++)
     {
-    FT_Load_Char(face, c, FT_LOAD_RENDER);
+        FT_Load_Char(face, c, FT_LOAD_RENDER | FT_LOAD_MONOCHROME);
-    glyph_top = glyph_base - face->glyph->bitmap_top;
+        glyph_top = glyph_base - face->glyph->bitmap_top;
-    if (glyph_top > 0 && glyph_top < glyph_height)
+        if (glyph_top > 0 && glyph_top < glyph_height)
-        pixblt(face->glyph->bitmap.buffer,
+            /*
-           face->glyph->bitmap.pitch,
+            bitblt(face->glyph->bitmap.buffer,
-           glyph_buf + (c - 32) * glyph_width + face->glyph->bitmap_left + glyph_top * glyph_pitch,
+               face->glyph->bitmap.pitch,
-           glyph_pitch,
+               glyph_buf + ((c - 32) * glyph_width + face->glyph->bitmap_left) / 8 + glyph_top * glyph_pitch,
-           face->glyph->bitmap.width,
+               glyph_pitch,
-           face->glyph->bitmap.rows);
+               face->glyph->bitmap.width,
+               face->glyph->bitmap.rows);
+            */
+            bitblt(face->glyph->bitmap.buffer, // + face->glyph->bitmap_left,
+               face->glyph->bitmap.pitch,
+               glyph_buf + (c - 32) * glyph_byte_width + glyph_top * glyph_pitch,
+               glyph_pitch,
+               face->glyph->bitmap.width,
+               face->glyph->bitmap.rows);
     }
 }
 void die(char *str)
@@ -69,16 +85,63 @@ void die(char *str)
     fprintf(stderr,"error: %s\n", str);
     exit(-1);
 }
+int writeGlyphFile(char *filename, int xorg, int yorg, int width, int height, unsigned char *buf, int pitch)
+{
+    FILE *fp;
+    unsigned char sprdef[4], *swapbuf;
+    int i;
+
+    if ((fp = fopen(filename, "wb")))
+    {
+        //fprintf(fp, "P4\n%d\n%d\n", width, height);
+        sprdef[0] = xorg;
+        sprdef[1] = yorg;
+        sprdef[2] = width/4;
+        sprdef[3] = height;
+        fwrite(&sprdef, 1, 4, fp);
+        swapbuf = malloc(pitch * height);
+        for (i = 0; i < pitch * height; i++)
+            swapbuf[i] = clrSwap[buf[i]];
+        fwrite(swapbuf, 1, pitch * height, fp);
+        free(swapbuf);
+        fclose(fp);
+        return 1;
+    }
+    return 0;
+}
 int main(int argc, char **argv)
 {
-    char *fontfile;
+    char *fontfile, *glyph_file;
     FT_Library ft;
     FT_Face face;
+    unsigned char pixReverse;
+    int i;
 
+    glyph_file = NULL;
     if (argc > 1)
+    {
         fontfile = argv[1];
+        if (argc > 2)
+            glyph_file = argv[2];
+    }
     else
         die( "Missing font file");
+    /*
+     * Bit/color reversal
+     */
+    for (i = 0; i < 256; i++)
+    {
+        pixReverse = ((i & 0x01) << 7)
+                   | ((i & 0x02) << 5)
+                   | ((i & 0x04) << 3)
+                   | ((i & 0x08) << 1)
+                   | ((i & 0x10) >> 1)
+                   | ((i & 0x20) >> 3)
+                   | ((i & 0x40) >> 5)
+                   | ((i & 0x80) >> 7);
+        clrSwap[i] =  clrRot[pixReverse & 0x0F]
+                   | (clrRot[pixReverse >> 4] << 4);
+    }
     /*
      * Init FreeType library.
      */
@@ -96,9 +159,22 @@ int main(int argc, char **argv)
         glyph_width  = FONT_WIDTH;
         glyph_height = FONT_HEIGHT;
     }
+    glyph_byte_width = (glyph_width + 7) / 8;
     glyph_base = glyph_height * 3 / 4;
-    create_font_glyphs(face);
+    //create_font_glyphs(face);
-
+    FT_Set_Pixel_Sizes(face, glyph_width /* 1.5*/, glyph_height);
+    FT_Load_Char(face, 'A', FT_LOAD_RENDER | FT_LOAD_MONOCHROME);
+    if (glyph_file)
+    {
+        if (!writeGlyphFile(glyph_file,
+                           -face->glyph->bitmap_left,
+                            face->glyph->bitmap_top,
+                            face->glyph->bitmap.width,
+                            face->glyph->bitmap.rows,
+                            face->glyph->bitmap.buffer,
+                            face->glyph->bitmap.pitch))
+            die("Error writing glyph file");
+    }
     return 0;
 }