cpp end

parseObj.py

@@ -37,23 +37,32 @@ for index, line in enumerate(content):
         faces = content[startFaces:-1]
         break
 
-colors = ["vec3(" + ",".join(vert.split(" ")[4:7]) + ")" for vert in verts]
+colors = ["{" + ",".join(vert.split(" ")[4:7]) + "}" for vert in verts]
 verts = ["{" + ",".join(vert.split(" ")[1:4]) + "}" for vert in verts]
 faces = [
-    ",".join([str(int((d.split("/")[0])) - 1) for d in face.split(" ")[1:4]])
+    ",".join(
+        [
+            str(int((d.split("/")[0])) - 1) + "," + str(int((d.split("/")[2])) - 1)
+            for d in face.split(" ")[1:4]
+        ]
+    )
     for face in faces
 ]
-normals = ["vec3(" + ",".join(normal.split(" ")[1:4]) + ")" for normal in normals]
+normals = ["{" + ",".join(normal.split(" ")[1:4]) + "}" for normal in normals]
 
 out = (
     '#include "../renderer.h" \n const model testModel = {(vec3[]){'
     + ",".join(verts)
     + "},(int[]){"
     + ",".join(faces)
+    + "},(vec3[]){"
+    + ",".join(normals)
+    + "},(vec3[]){"
+    + ",".join(colors)
     + "},"
     + str(len(verts))
     + ","
-    + str(len(faces) * 3)
+    + str(len(faces) * 6)
     + "};"
 )