williamjcm/small3dlib
1
0
Fork 0
mirror of https://git.coom.tech/drummyfish/small3dlib.git synced 2024-11-21 20:39:57 +01:00
Code Activity

Update obj tool

Browse source
This commit is contained in:
Miloslav Číž 2019-06-16 19:40:15 +02:00
parent 5677939c68
commit d17c534194
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
programs/cat1Model.h
View file

@ -399,7 +399,8 @@ S3L_Model3D cat1Model =
.vertices = cat1Vertices, .vertices = cat1Vertices,
.vertexCount = CAT1_VERTEX_COUNT, .vertexCount = CAT1_VERTEX_COUNT,
.triangles = cat1TriangleIndices, .triangles = cat1TriangleIndices,
.triangleCount = CAT1_TRIANGLE_COUNT .triangleCount = CAT1_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

3
programs/cat2Model.h
View file

@ -399,7 +399,8 @@ S3L_Model3D cat2Model =
.vertices = cat2Vertices, .vertices = cat2Vertices,
.vertexCount = CAT2_VERTEX_COUNT, .vertexCount = CAT2_VERTEX_COUNT,
.triangles = cat2TriangleIndices, .triangles = cat2TriangleIndices,
.triangleCount = CAT2_TRIANGLE_COUNT .triangleCount = CAT2_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

3
programs/chestModel.h
View file

@ -758,7 +758,8 @@ S3L_Model3D chestModel =
.vertices = chestVertices, .vertices = chestVertices,
.vertexCount = CHEST_VERTEX_COUNT, .vertexCount = CHEST_VERTEX_COUNT,
.triangles = chestTriangleIndices, .triangles = chestTriangleIndices,
.triangleCount = CHEST_TRIANGLE_COUNT .triangleCount = CHEST_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

3
programs/cityModel.h
View file

@ -950,7 +950,8 @@ S3L_Model3D cityModel =
.vertices = cityVertices, .vertices = cityVertices,
.vertexCount = CITY_VERTEX_COUNT, .vertexCount = CITY_VERTEX_COUNT,
.triangles = cityTriangleIndices, .triangles = cityTriangleIndices,
.triangleCount = CITY_TRIANGLE_COUNT .triangleCount = CITY_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

3
programs/houseModel.h
View file

@ -722,7 +722,8 @@ S3L_Model3D houseModel =
.vertices = houseVertices, .vertices = houseVertices,
.vertexCount = HOUSE_VERTEX_COUNT, .vertexCount = HOUSE_VERTEX_COUNT,
.triangles = houseTriangleIndices, .triangles = houseTriangleIndices,
.triangleCount = HOUSE_TRIANGLE_COUNT .triangleCount = HOUSE_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

3
programs/plantModel.h
View file

@ -46,7 +46,8 @@ S3L_Model3D plantModel =
.vertices = plantVertices, .vertices = plantVertices,
.vertexCount = PLANT_VERTEX_COUNT, .vertexCount = PLANT_VERTEX_COUNT,
.triangles = plantTriangleIndices, .triangles = plantTriangleIndices,
.triangleCount = PLANT_TRIANGLE_COUNT .triangleCount = PLANT_TRIANGLE_COUNT,
.customTransformMatrix = 0
}; };
#endif // guard #endif // guard

5
tools/obj2array.py
View file

@ -185,13 +185,14 @@ if COMPACT:
print("{.vertices=" + print("{.vertices=" +
NAME + "Vertices,.vertexCount=" + str(len(vertices)) + NAME + "Vertices,.vertexCount=" + str(len(vertices)) +
",.triangles=" + NAME.upper() + "TriangleIndices,\n.triangleCount=" + ",.triangles=" + NAME.upper() + "TriangleIndices,\n.triangleCount=" +
str(len(triangles)) + "};"); str(len(triangles)) + ",.customTransformMatrix=0};");
else: else:
print("{") print("{")
print(" .vertices = " + NAME + "Vertices,") print(" .vertices = " + NAME + "Vertices,")
print(" .vertexCount = " + NAME.upper() + "_VERTEX_COUNT,") print(" .vertexCount = " + NAME.upper() + "_VERTEX_COUNT,")
print(" .triangles = " + NAME + "TriangleIndices,") print(" .triangles = " + NAME + "TriangleIndices,")
print(" .triangleCount = " + NAME.upper() + "_TRIANGLE_COUNT") print(" .triangleCount = " + NAME.upper() + "_TRIANGLE_COUNT,")
print(" .customTransformMatrix = 0")
print("};") print("};")
if GUARDS: if GUARDS: