2
0
Эх сурвалжийг харах

include stb_connected_components.h in main stb compile tests, add test app

Sean Barrett 9 жил өмнө
parent
commit
1392344cdd

BIN
data/map_01.png


BIN
data/map_02.png


BIN
data/map_03.png


+ 5 - 1
tests/stb.dsp

@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "MAIN_TEST" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "GRID_TEST" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -86,6 +86,10 @@ LINK32=link.exe
 # Name "stb - Win32 Debug"
 # Name "stb - Win32 Debug"
 # Begin Source File
 # Begin Source File
 
 
+SOURCE=.\grid_reachability.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\docs\other_libs.md
 SOURCE=..\docs\other_libs.md
 # End Source File
 # End Source File
 # Begin Source File
 # Begin Source File

+ 5 - 0
tests/test_c_compilation.c

@@ -9,6 +9,7 @@
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STB_VOXEL_RENDER_IMPLEMENTATION
 #define STB_VOXEL_RENDER_IMPLEMENTATION
 #define STB_EASY_FONT_IMPLEMENTATION
 #define STB_EASY_FONT_IMPLEMENTATION
+#define STB_CONNECTED_COMPONENTS_IMPLEMENTATION
 
 
 #include "stb_easy_font.h"
 #include "stb_easy_font.h"
 #include "stb_herringbone_wang_tile.h"
 #include "stb_herringbone_wang_tile.h"
@@ -21,6 +22,10 @@
 #include "stb_image_resize.h"
 #include "stb_image_resize.h"
 #include "stb_rect_pack.h"
 #include "stb_rect_pack.h"
 
 
+#define STBCC_GRID_COUNT_X_LOG2  10
+#define STBCC_GRID_COUNT_Y_LOG2  10
+#include "stb_connected_components.h"
+
 #define STBVOX_CONFIG_MODE 1
 #define STBVOX_CONFIG_MODE 1
 #include "stb_voxel_render.h"
 #include "stb_voxel_render.h"
 
 

+ 5 - 0
tests/test_cpp_compilation.cpp

@@ -8,6 +8,7 @@
 #define STB_HERRINGBONE_WANG_TILE_IMPLEMENTATION
 #define STB_HERRINGBONE_WANG_TILE_IMPLEMENTATION
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STB_RECT_PACK_IMPLEMENTATION
 #define STB_VOXEL_RENDER_IMPLEMENTATION
 #define STB_VOXEL_RENDER_IMPLEMENTATION
+#define STB_CONNECTED_COMPONENTS_IMPLEMENTATION
 
 
 #define STBI_MALLOC     my_malloc
 #define STBI_MALLOC     my_malloc
 #define STBI_FREE       my_free
 #define STBI_FREE       my_free
@@ -27,6 +28,10 @@ void my_free(void *) { }
 #include "stb_divide.h"
 #include "stb_divide.h"
 #include "stb_herringbone_wang_tile.h"
 #include "stb_herringbone_wang_tile.h"
 
 
+#define STBCC_GRID_COUNT_X_LOG2  10
+#define STBCC_GRID_COUNT_Y_LOG2  10
+#include "stb_connected_components.h"
+
 #define STBVOX_CONFIG_MODE 1
 #define STBVOX_CONFIG_MODE 1
 #include "stb_voxel_render.h"
 #include "stb_voxel_render.h"
 
 

+ 2 - 2
tests/test_truetype.c

@@ -3,13 +3,13 @@
 #include "stb_truetype.h"
 #include "stb_truetype.h"
 #include "stb_image_write.h"
 #include "stb_image_write.h"
 
 
+#ifdef TT_TEST
+
 #include <stdio.h>
 #include <stdio.h>
 
 
 char ttf_buffer[1<<25];
 char ttf_buffer[1<<25];
 unsigned char output[512*100];
 unsigned char output[512*100];
 
 
-#ifdef TT_TEST
-
 void debug(void)
 void debug(void)
 {
 {
    stbtt_fontinfo font;
    stbtt_fontinfo font;