bugfixing extern arrays

PixelatedLagg · Nov 25, 2023 · 4d68a08 · 4d68a08
1 parent 1f83cd1
commit 4d68a08
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/levels/map.lvl b/levels/map.lvl
@@ -1,4 +1,4 @@
-q,2
+q,5
 0 0 0, 1 0 0, 1 1 0, 0 1 0
 t,1
 0 0 0, 1 0 0, 1 1 0
diff --git a/p3d.exe b/p3d.exe
diff --git a/src/main.c b/src/main.c
@@ -59,20 +59,21 @@ int main(int argc, char* argv[])
 {
     //debugging parsing...
     parse("levels/map.lvl");
-    printf("q,%i\n", sizeof(quads) / sizeof(quad));
-    for (int i = 0; i < sizeof(quads) / sizeof(quad); i++)
+
+
+    for (int i = 0; i < sizeof(*quads) / sizeof(quad); i++)
     {
         quad q = quads[i];
-        printf("%f %f %f, %f %f %f, %f %f %f, %f %f %f", q.v1_x, q.v1_y, q.v1_z, q.v2_x, q.v2_y, q.v2_z, q.v3_x, q.v3_y, q.v3_z, q.v4_x, q.v4_y, q.v4_z);
+        printf("%f %f %f, %f %f %f, %f %f %f, %f %f %f\n", q.v1_x, q.v1_y, q.v1_z, q.v2_x, q.v2_y, q.v2_z, q.v3_x, q.v3_y, q.v3_z, q.v4_x, q.v4_y, q.v4_z);
     }
-    printf("t,%i\n", sizeof(tris) / sizeof(tri));
-    for (int i = 0; i < sizeof(tris) / sizeof(tri); i++)
+    for (int i = 0; i < sizeof(*tris) / sizeof(tri); i++)
     {
         tri t = tris[i];
-        printf("%f %f %f, %f %f %f, %f %f %f");
-        printf("%f %f %f, %f %f %f, %f %f %f, %f %f %f", t.v1_x, t.v1_y, t.v1_z, t.v2_x, t.v2_y, t.v2_z, t.v3_x, t.v3_y, t.v3_z);
+        printf("%f %f %f, %f %f %f, %f %f %f\n", t.v1_x, t.v1_y, t.v1_z, t.v2_x, t.v2_y, t.v2_z, t.v3_x, t.v3_y, t.v3_z);
     }
-    /*
+    return 0;
+
+
     glutInit(&argc, argv);
     glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH);
 
@@ -89,6 +90,9 @@ int main(int argc, char* argv[])
     glutPassiveMotionFunc(passiveMotion);
 
     initDisplay();
-    glutMainLoop();*/
+    glutMainLoop();
+
+    free(quads);
+    free(tris);
     return 0;
 }
diff --git a/src/parse.c b/src/parse.c
@@ -2,9 +2,11 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "parse.h"
 #include "display.h"
+#include "prim.h"
 
 void parse(char* file)
 {
@@ -24,16 +26,17 @@ void parse(char* file)
             switch (currentChar)
             {
                 case 'q':
-                    quads = (quad*)malloc(atoi(count) * sizeof(quad)); //assign quad# from int in count
-                    break;
+                quads = calloc(atoi(count), sizeof(quad)); //assign quad# from int in count
+                break;
                 case 't':
-                    tris = (tri*)malloc(atoi(count) * sizeof(tri)); //assign tri# from int in count
-                    break;
+                tris = calloc(atoi(count), sizeof(tri)); //assign tri# from int in count
+                break;
             }
             free(count);
             primI = 0;
             continue;
         }
+        primI++;
         switch (currentChar)
         {
             case 'q': //parsing for 4 values, repeat parse by comma x4, and inside repeat parse by space x3
@@ -84,4 +87,5 @@ void parse(char* file)
         }
         primI++;
     }
+    fclose(data);
 }