MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the default vertex colors are not black for undefined material maps

Browse Source
This commit is contained in:
Jeff Myers 2024-03-05 08:41:07 -08:00
parent c7b362d19d
commit dfdebe198d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/rmodels.c
View File

@ -5716,7 +5716,7 @@ static Model LoadM3D(const char *fileName)
if (!m3d || M3D_ERR_ISFATAL(m3d->errcode)) if (!m3d || M3D_ERR_ISFATAL(m3d->errcode))
{ {
TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load M3D data, error code %d", fileName, m3d? m3d->errcode : -2); TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load M3D data, error code %d", fileName, m3d ? m3d->errcode : -2);
if (m3d) m3d_free(m3d); if (m3d) m3d_free(m3d);
UnloadFileData(fileData); UnloadFileData(fileData);
return model; return model;
@ -5768,9 +5768,9 @@ static Model LoadM3D(const char *fileName)
} }
*/ */
model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh)); model.meshes = (Mesh*)RL_CALLOC(model.meshCount, sizeof(Mesh));
model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); model.meshMaterial = (int*)RL_CALLOC(model.meshCount, sizeof(int));
model.materials = (Material *)RL_CALLOC(model.materialCount + 1, sizeof(Material)); model.materials = (Material*)RL_CALLOC(model.materialCount + 1, sizeof(Material));
// Map no material to index 0 with default shader, everything else materialid + 1 // Map no material to index 0 with default shader, everything else materialid + 1
model.materials[0] = LoadMaterialDefault(); model.materials[0] = LoadMaterialDefault();
@ -5784,9 +5784,9 @@ static Model LoadM3D(const char *fileName)
if (k + 1 >= model.meshCount) if (k + 1 >= model.meshCount)
{ {
model.meshCount++; model.meshCount++;
model.meshes = (Mesh *)RL_REALLOC(model.meshes, model.meshCount*sizeof(Mesh)); model.meshes = (Mesh*)RL_REALLOC(model.meshes, model.meshCount * sizeof(Mesh));
memset(&model.meshes[model.meshCount - 1], 0, sizeof(Mesh)); memset(&model.meshes[model.meshCount - 1], 0, sizeof(Mesh));
model.meshMaterial = (int *)RL_REALLOC(model.meshMaterial, model.meshCount*sizeof(int)); model.meshMaterial = (int*)RL_REALLOC(model.meshMaterial, model.meshCount * sizeof(int));
} }
k++; k++;
@ -5801,15 +5801,22 @@ static Model LoadM3D(const char *fileName)
!m3d->vertex[m3d->face[j].vertex[2]].color) vcolor = 1; !m3d->vertex[m3d->face[j].vertex[2]].color) vcolor = 1;
} }
model.meshes[k].vertexCount = l*3; model.meshes[k].vertexCount = l * 3;
model.meshes[k].triangleCount = l; model.meshes[k].triangleCount = l;
model.meshes[k].vertices = (float *)RL_CALLOC(model.meshes[k].vertexCount*3, sizeof(float)); model.meshes[k].vertices = (float*)RL_CALLOC(model.meshes[k].vertexCount * 3, sizeof(float));
model.meshes[k].texcoords = (float *)RL_CALLOC(model.meshes[k].vertexCount*2, sizeof(float)); model.meshes[k].texcoords = (float*)RL_CALLOC(model.meshes[k].vertexCount * 2, sizeof(float));
model.meshes[k].normals = (float *)RL_CALLOC(model.meshes[k].vertexCount*3, sizeof(float)); model.meshes[k].normals = (float*)RL_CALLOC(model.meshes[k].vertexCount * 3, sizeof(float));
// If no map is provided, or we have colors defined, we allocate storage for vertex colors // If no map is provided, or we have colors defined, we allocate storage for vertex colors
// M3D specs only consider vertex colors if no material is provided, however raylib uses both and mixes the colors // M3D specs only consider vertex colors if no material is provided, however raylib uses both and mixes the colors
if ((mi == M3D_UNDEF) || vcolor) model.meshes[k].colors = RL_CALLOC(model.meshes[k].vertexCount*4, sizeof(unsigned char)); if ((mi == M3D_UNDEF) || vcolor) model.meshes[k].colors = RL_CALLOC(model.meshes[k].vertexCount * 4, sizeof(unsigned char));
// If no map is provided and we allocated vertex colors, set them too white
if ((mi == M3D_UNDEF) && model.meshes[k].colors != NULL)
{
for (int c = 0; c < model.meshes[k].vertexCount * 4; c++)
model.meshes[k].colors[c] = 255;
}
if (m3d->numbone && m3d->numskin) if (m3d->numbone && m3d->numskin)
{ {