diff --git a/model.hpp b/model.hpp index d44065b..9e00273 100644 --- a/model.hpp +++ b/model.hpp @@ -3,10 +3,11 @@ #define MODEL_H #include "fastmath.hpp" +#include #include struct model { std::vector verts; - std::vector faces; + std::vector> faces; std::vector normals; }; diff --git a/parseObj.py b/parseObj.py index ff91634..28ff3ca 100644 --- a/parseObj.py +++ b/parseObj.py @@ -38,7 +38,7 @@ for index,line in enumerate(content): break verts = ["vec3(" +",".join(vert.split(" ")[1:4]) + ")" for vert in verts] -faces = [ ",".join([str(int((d.split("/")[0])) - 1) for d in face.split(" ")[1:4]]) for face in faces] +faces = [ ",".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] out = "#include \"model.hpp\" \n const model testModel({" + ",".join(verts) +"},{" + ",".join(faces) + "},{" + ",".join(normals) + "});"