various fixes for compilation test

tests/resize.dsp

@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /WX /Gm /GX /ZI /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

tests/stb.dsp

@@ -126,10 +126,18 @@ SOURCE=..\stb_perlin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\stb_rect_pack.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\stb_textedit.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\stb_tilemap_editor.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\stb_truetype.h
 # End Source File
 # Begin Source File

tests/test_c_compilation.c

@@ -6,6 +6,7 @@
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_HERRINGBONE_WANG_TILE_IMEPLEMENTATIOn
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
+#define STB_RECT_PACK_IMPLEMENTATION
 
 #include "stb_herringbone_wang_tile.h"
 #include "stb_image.h"
@@ -15,9 +16,9 @@
 #include "stb_c_lexer.h"
 #include "stb_divide.h"
 #include "stb_image_resize.h"
+#include "stb_rect_pack.h"
 
-
-#define STBTE_DRAW_RECT(x0,y0,x1,y1,color) 0
-#define STBTE_DRAW_TILE(x,y,id,highlight)  0
+#define STBTE_DRAW_RECT(x0,y0,x1,y1,color)      0
+#define STBTE_DRAW_TILE(x,y,id,highlight,data)  0
 #define STB_TILEMAP_EDITOR_IMPLEMENTATION
 #include "stb_tilemap_editor.h"

tests/test_cpp_compilation.cpp

@@ -6,6 +6,7 @@
 #define STB_DIVIDE_IMPLEMENTATION
 #define STB_IMAGE_IMPLEMENTATION
 #define STB_HERRINGBONE_WANG_TILE_IMPLEMENTATION
+#define STB_RECT_PACK_IMPLEMENTATION
 
 #include "stb_truetype.h"
 #include "stb_image_write.h"
@@ -15,8 +16,9 @@
 #include "stb_divide.h"
 #include "stb_image.h"
 #include "stb_herringbone_wang_tile.h"
+#include "stb_rect_pack.h"
 
-#define STBTE_DRAW_RECT(x0,y0,x1,y1,color)
-#define STBTE_DRAW_TILE(x,y,id,highlight)
+#define STBTE_DRAW_RECT(x0,y0,x1,y1,color)      do ; while(0)
+#define STBTE_DRAW_TILE(x,y,id,highlight,data)  do ; while(0)
 #define STB_TILEMAP_EDITOR_IMPLEMENTATION
 #include "stb_tilemap_editor.h"

tests/test_truetype.c

@@ -1,5 +1,7 @@
+#include "stb_rect_pack.h"
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb_truetype.h"
+#include "stb_image_write.h"
 
 #include <stdio.h>
 
@@ -17,16 +19,55 @@ void debug(void)
    stbtt_MakeGlyphBitmap(&font, output, 6, 9, 512, 5.172414E-03f, 5.172414E-03f, 54);
 }
 
+#define BITMAP_W  256
+#define BITMAP_H  400
+unsigned char temp_bitmap[BITMAP_H][BITMAP_W];
+stbtt_bakedchar cdata[256*2]; // ASCII 32..126 is 95 glyphs
 int main(int argc, char **argv)
 {
    stbtt_fontinfo font;
    unsigned char *bitmap;
    int w,h,i,j,c = (argc > 1 ? atoi(argv[1]) : 34807), s = (argc > 2 ? atoi(argv[2]) : 32);
 
-   debug();
+   //debug();
 
+   // @TODO: why is minglui.ttc failing? 
    fread(ttf_buffer, 1, 1<<25, fopen(argc > 3 ? argv[3] : "c:/windows/fonts/mingliu.ttc", "rb"));
 
+   stbtt_BakeFontBitmap(ttf_buffer,stbtt_GetFontOffsetForIndex(ttf_buffer,0), 40.0, temp_bitmap[0],BITMAP_W,BITMAP_H, 32,96, cdata); // no guarantee this fits!
+   stbi_write_png("fonttest1.png", BITMAP_W, BITMAP_H, 1, temp_bitmap, 0);
+
+   stbtt_BakeFontBitmap(ttf_buffer,stbtt_GetFontOffsetForIndex(ttf_buffer,0), 40.0, temp_bitmap[0],BITMAP_W,BITMAP_H, 32,96, cdata); // no guarantee this fits!
+
+   {
+      stbtt_pack_context pc;
+      stbtt_PackBegin(&pc, temp_bitmap[0], BITMAP_W, BITMAP_H, 0, NULL);
+      stbtt_PackFontRange(&pc, ttf_buffer, 0, 40.0, 32, 95, cdata);
+      stbtt_PackFontRange(&pc, ttf_buffer, 0, 40.0, 0xa0, 0x100-0xa0, cdata);
+      stbtt_PackEnd(&pc);
+      stbi_write_png("fonttest2.png", BITMAP_W, BITMAP_H, 1, temp_bitmap, 0);
+   }
+
+   {
+      stbtt_pack_context pc;
+      stbtt_pack_range pr[2];
+      stbtt_PackBegin(&pc, temp_bitmap[0], BITMAP_W, BITMAP_H, 0, NULL);
+
+      pr[0].chardata_for_range = cdata;
+      pr[0].first_unicode_char_in_range = 32;
+      pr[0].num_chars_in_range = 95;
+      pr[0].font_size = 40.0;
+      pr[1].chardata_for_range = cdata+256;
+      pr[1].first_unicode_char_in_range = 0xa0;
+      pr[1].num_chars_in_range = 0x100 - 0xa0;
+      pr[1].font_size = 40.0;
+
+      stbtt_PackFontRanges(&pc, ttf_buffer, 0, pr, 2);
+      stbtt_PackEnd(&pc);
+      stbi_write_png("fonttest3.png", BITMAP_W, BITMAP_H, 1, temp_bitmap, 0);
+   }
+   return 0;
+
    stbtt_InitFont(&font, ttf_buffer, stbtt_GetFontOffsetForIndex(ttf_buffer,0));
    bitmap = stbtt_GetCodepointBitmap(&font, 0,stbtt_ScaleForPixelHeight(&font, (float)s), c, &w, &h, 0,0);