ogt: get ogt_vox and demo_vox compiling with gcc too

tested with onlinegdb, not a local toolchain.
rpnzl · Dec 6, 2019 · 84ed928 · 84ed928
1 parent 193b7c2
commit 84ed928
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/demo/demo_vox.cpp b/demo/demo_vox.cpp
@@ -10,13 +10,18 @@
 
 #define OGT_VOX_IMPLEMENTATION
 #include "..\src\ogt_vox.h"
-#include <io.h>
 
 
+#if defined(_MSC_VER)
+    #include <io.h>
+#else
+    #include <stdio.h>
+#endif
+
 // a helper function to load a magica voxel scene given a filename.
 const ogt_vox_scene* load_vox_scene(const char* pcFilename)
 {
-	// open the file
+    // open the file
 #if defined(_MSC_VER) && _MSC_VER >= 1400
     FILE * fp;
     if (0 != fopen_s(&fp, pcFilename, "rb"))
@@ -27,9 +32,13 @@ const ogt_vox_scene* load_vox_scene(const char* pcFilename)
     if (!fp)
         return NULL;
 
-	// load the file into a memory buffer
-    uint32_t buffersize = _filelength(_fileno(fp));
-    uint8_t* buffer = new uint8_t[buffersize];
+    // get the buffer size which matches the size of the file
+    fseek(fp, 0, SEEK_END);
+    uint32_t buffersize = ftell(fp);
+    fseek(fp, 0, SEEK_SET);
+
+    // load the file into a memory buffer
+    uint8_t * buffer = new uint8_t[buffersize];
     fread(buffer, buffersize, 1, fp);
     fclose(fp);
 

diff --git a/src/ogt_vox.h b/src/ogt_vox.h
@@ -75,8 +75,15 @@
     typedef signed int    int32_t;
     typedef unsigned int  uint32_t;
     #define UINT32_MAX	0xFFFFFFFF
-#else
+#elif defined(_MSC_VER)
+    // general VS* 
+    #include <inttypes.h>
+#elif defined(__GNUC__)
+    // any GCC*
     #include <inttypes.h>
+    #include <stdlib.h> // for size_t
+#else
+    #error some fixup needed for this platform?
 #endif
 
     // color
@@ -244,11 +251,12 @@
         #define _vox_strlen(a)               strlen(a)
         #define _vox_sprintf(str,str_max,fmt,...)    sprintf_s(str, str_max, fmt, __VA_ARGS__)
     #else
-        #define _vox_str_scanf(str,...)      scanf_s(str,__VA_ARGS__)
+        #define _vox_str_scanf(str,...)      scanf(str,__VA_ARGS__)
         #define _vox_strcpy_static(dst,src)  strcpy(dst,src)
         #define _vox_strcasecmp(a,b)         strcasecmp(a,b)
         #define _vox_strcmp(a,b)             strcmp(a,b)
         #define _vox_strlen(a)               strlen(a)
+        #define _vox_sprintf(str,str_max,fmt,...)    snprintf(str, str_max, fmt, __VA_ARGS__)        
     #endif
 
     // 3d vector utilities
@@ -509,7 +517,7 @@
                 vec3_make(0.0f, 0.0f, 0.0f)    // invalid!
             };
 
-            static const uint32_t k_row2_index[] = { ~0ul, ~0ul, ~0ul, 2, ~0ul, 1, 0, ~0ul};
+            static const uint32_t k_row2_index[] = { UINT32_MAX, UINT32_MAX, UINT32_MAX, 2, UINT32_MAX, 1, 0, UINT32_MAX };
 
             // compute the per-row indexes into k_vectors[] array.
             // unpack rotation bits. 
@@ -827,9 +835,9 @@
                     ogt_vox_transform frame_transform;
                     {
                         _vox_file_read_dict(&dict, fp);
-                        const char* pcRotationValue    = _vox_dict_get_value_as_string(&dict, "_r");
-                        const char* pcTranslationValue = _vox_dict_get_value_as_string(&dict, "_t");
-                        frame_transform = _vox_make_transform_from_dict_strings(pcRotationValue, pcTranslationValue);
+                        const char* rotation_value    = _vox_dict_get_value_as_string(&dict, "_r");
+                        const char* translation_value = _vox_dict_get_value_as_string(&dict, "_t");
+                        frame_transform = _vox_make_transform_from_dict_strings(rotation_value, translation_value);
                     }
                     // setup the transform node.
                     {
@@ -957,7 +965,7 @@
         else if (model_ptrs.size() == 1) {
             // add a single instance
             ogt_vox_instance new_instance;
-            new_instance.model_index  = 0;
+            new_instance.model_index = 0;
             new_instance.transform   = _vox_transform_identity();
             new_instance.layer_index = 0;
             new_instance.name        = 0;