loading from files

c3d.c

@@ -2,6 +2,7 @@
 #include "raymath.h"
 #include "reader.h"
 #include <math.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -417,7 +418,7 @@ int main() {
 
     Vector3 point = (Vector3){0, 0, -10};
 
-    Tri internaltriarray[50];
+    static Tri internaltriarray[50000];
     TriArray tarr;
     tarr.arr = internaltriarray;
     tarr.length = 0;
@@ -427,12 +428,12 @@ int main() {
     TriArrayAppend(&tarr, (Tri){(Vector3){0, 0, -2000}, (Vector3){0, 800, -2000},
                                 (Vector3){800, 800, -2000}, BLUE});
 
-    Tri internaltransformedtriarray[50];
+    static Tri internaltransformedtriarray[50000];
     TriArray TransformedTris;
     TransformedTris.arr = internaltransformedtriarray;
     TransformedTris.length = 0;
 
-    Tri2D internaltri2darray[50];
+    static Tri2D internaltri2darray[50000];
     Tri2DArray Tri2Darr;
     Tri2Darr.length = 0;
     Tri2Darr.arr = internaltri2darray;
@@ -458,6 +459,11 @@ int main() {
     Tri2D norm = (Tri2D){(Vector2){500, 50}, (Vector2){0, 0}, (Vector2){250, 500}, 0, 0, 0, GREEN};
 
     bool run3d = true;
+	Object3D t = ReadObjectFromFile("teapot.obj");
+	for (int i = 0; i < t.triangles->length; i++){
+		printf("t: %f\n", t.triangles->arr[i].a.x);
+		TriArrayAppend(&tarr, t.triangles->arr[i]);
+	}
     while (!WindowShouldClose() && run3d) {
         float frametime = GetFrameTime();
         CtrlLocalCam(&camera, frametime);

c3dtypes.h

@@ -58,12 +58,10 @@ typedef struct Tri2DArray Tri2DArray;
 
 
 
-struct Object {
+struct Object3D {
 	char name[100];
-	Vector3 *VertexArray;
-	int VertexArrayLength;
 	TriArray  * triangles;
 };
-typedef struct Object Object;
+typedef struct Object3D Object3D;
 
 #endif

reader.c

@@ -1,60 +1,68 @@
 #include "c3dtypes.h"
+#include "arrayfuncs.h"
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
 int TestFunc(int x) {
     x = x + 1;
     return x;
 }
 
-
+Object3D ReadObjectFromFile(char * fname) {
-Object ReadObjectFromFile() {
+    Object3D out;
-	Object out;
+    Vector3 *VertexArray = malloc(10000 * sizeof(Vector3));
-	out.VertexArray = malloc(10000*sizeof(Vector3));
+    int VertexArrayLength = 0;
-	out.VertexArrayLength = 0;
 
     TriArray tarr;
-	tarr.arr = malloc(10000*sizeof(Tri));
+    tarr.arr = malloc(10000 * sizeof(Tri));
     tarr.length = 0;
 
-
     out.triangles = &tarr;
 
-	strncpy(out.name, "cube.obj", 100);
+    strncpy(out.name, fname, 100);
 
-
+    FILE *f = fopen(fname, "r");
-	FILE * f = fopen("cube.obj", "r");
 
     while (true) {
         char t[500];
-		char * fgetres = fgets(t, 500, f);
+        char *fgetres = fgets(t, 500, f);
         if (fgetres == NULL) {
             break;
         }
 
         char objtype[10];
-		double v1;
+        char v1[100];
-		double v2;
+        char v2[100];
-		double v3;
+        char v3[100];
-		sscanf(t, "%s %lf %lf %lf", objtype, &v1,&v2,&v3);
+        sscanf(t, "%s %s %s %s", objtype, v1, v2, v3);
-		if ( strcmp(t, "v")) {
+        if (strcmp(objtype, "v") == 0) {
-			out.VertexArray[out.VertexArrayLength].x = v1;
+            VertexArray[VertexArrayLength].x = atof(v1)*100;
-			out.VertexArray[out.VertexArrayLength].x = v2;
+            VertexArray[VertexArrayLength].y = atof(v2)*100;
-			out.VertexArray[out.VertexArrayLength].x = v3;
+            VertexArray[VertexArrayLength].z = atof(v3)*100;
-			out.VertexArrayLength = out.VertexArrayLength + 1;
+            VertexArrayLength = VertexArrayLength + 1;
         }
-		if ( strcmp(t, "f")) {
+        if (strcmp(objtype, "f") == 0 ) {
-			//TODO: append face to triarry
+            // TODO: append face to triarry
+            Tri temptri;
+
+
+            temptri.a = VertexArray[ atoi(v1) - 1];
+            temptri.b = VertexArray[ atoi(v2) - 1];
+            temptri.c = VertexArray[ atoi(v3) - 1];
+
+			printf("OLINE: %s\n", t);
+			printf("adding tri A: %d, B: %d, C: %d\n", atoi(v1), atoi(v2) , atoi(v3) );
+			
+			temptri.color = GREEN;
+			TriArrayAppend(&tarr, temptri);
         }
-		//need to bring in triarray functions into their own file 
+        // need to bring in triarray functions into their own file
-
-		
-		
     }
 
-	//TODO: use file object and read each line
+	return out;
+
+    // TODO: use file object and read each line
     //  add verticies to the vertex list, +1 ing the length value each time
     //  just fucking parse the obj file its not that hard
-
 }

reader.h

@@ -1,6 +1,7 @@
+#include "c3dtypes.h"
 #ifndef READER_HEADER
 #define READER_HEADER
 
 int TestFunc(int x);
-
+Object3D ReadObjectFromFile(char * fname);
 #endif