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

REVIEWED: LoadModel(), removed cube fallback mechanism #3459

Browse Source
This commit is contained in:
Ray
2023-10-31 11:32:07 +01:00
parent ab61bad168
commit 0d186a0557
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rmodels.c
View File

@@ -1052,26 +1052,16 @@ Model LoadModel(const char *fileName)
// Make sure model transform is set to identity matrix! // Make sure model transform is set to identity matrix!
model.transform = MatrixIdentity(); model.transform = MatrixIdentity();
if (model.meshCount == 0) if ((model.meshCount != 0) && (model.meshes != NULL))
{ {
model.meshCount = 1; // Upload vertex data to GPU (static meshes)
model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh));
#if defined(SUPPORT_MESH_GENERATION)
TRACELOG(LOG_WARNING, "MESH: [%s] Failed to load mesh data, default to cube mesh", fileName);
model.meshes[0] = GenMeshCube(1.0f, 1.0f, 1.0f);
#else
TRACELOG(LOG_WARNING, "MESH: [%s] Failed to load mesh data", fileName);
#endif
}
else
{
// Upload vertex data to GPU (static mesh)
for (int i = 0; i < model.meshCount; i++) UploadMesh(&model.meshes[i], false); for (int i = 0; i < model.meshCount; i++) UploadMesh(&model.meshes[i], false);
} }
else TRACELOG(LOG_WARNING, "MESH: [%s] Failed to load model mesh(es) data", fileName);
if (model.materialCount == 0) if (model.materialCount == 0)
{ {
TRACELOG(LOG_WARNING, "MATERIAL: [%s] Failed to load material data, default to white material", fileName); TRACELOG(LOG_WARNING, "MATERIAL: [%s] Failed to load model material data, default to white material", fileName);
model.materialCount = 1; model.materialCount = 1;
model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material)); model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material));