mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-09-21 10:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[models] Fixed counting loop for face amount per material (#1967)

Browse Source
This commit is contained in:
Tristan Schulz
2021-09-01 21:29:20 +02:00
committed by GitHub
parent 68bcfa1192
commit e8fa7ceb79
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/models.c
View File

@@ -3491,6 +3491,11 @@ RayCollision GetRayCollisionQuad(Ray ray, Vector3 p1, Vector3 p2, Vector3 p3, Ve
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#if defined(SUPPORT_FILEFORMAT_OBJ) #if defined(SUPPORT_FILEFORMAT_OBJ)
// Load OBJ mesh data // Load OBJ mesh data
//
// Keep the following information in mind when reading this
// - A mesh is created for every material present in the obj file
// - the model.meshCount is therefore the materialCount returned from tinyobj
// - the mesh is automatically triangulated by tinyobj
static Model LoadOBJ(const char *fileName) static Model LoadOBJ(const char *fileName)
{ {
Model model = { 0 }; Model model = { 0 };
@@ -3542,15 +3547,12 @@ static Model LoadOBJ(const char *fileName)
// Count the faces for each material // Count the faces for each material
int *matFaces = RL_CALLOC(materialCount, sizeof(int)); int *matFaces = RL_CALLOC(materialCount, sizeof(int));
for (unsigned int mi = 0; mi < meshCount; mi++) for(int fi = 0; fi< attrib.num_faces; fi++){
{ tinyobj_vertex_index_t face = attrib.faces[fi];
for (unsigned int fi = 0; fi < meshes[mi].length; fi++) int idx = attrib.material_ids[fi];
{
int idx = attrib.material_ids[meshes[mi].face_offset + fi];
if (idx == -1) idx = 0; // for no material face (which could be the whole model)
matFaces[idx]++; matFaces[idx]++;
} }
}
//-------------------------------------- //--------------------------------------
// Create the material meshes // Create the material meshes