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

Merge branch 'master' into 13-10-25MSVC_Warnings

Browse Source
This commit is contained in:
Ray 2025-10-15 19:02:18 +02:00 committed by GitHub
commit 95fbcb728f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rcore.c
View File

@ -3073,7 +3073,7 @@ unsigned int *ComputeSHA1(unsigned char *data, int dataSize)
hash[4] += e; hash[4] += e;
} }
free(msg); RL_FREE(msg);
return hash; return hash;
} }

79
src/rmodels.c
View File

@ -2352,6 +2352,8 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
Mesh mesh = model.meshes[m]; Mesh mesh = model.meshes[m];
Vector3 animVertex = { 0 }; Vector3 animVertex = { 0 };
Vector3 animNormal = { 0 }; Vector3 animNormal = { 0 };
Matrix boneMatrix = { 0 };
Matrix InverseBoneMatrix = { 0 };
int boneId = 0; int boneId = 0;
int boneCounter = 0; int boneCounter = 0;
float boneWeight = 0.0; float boneWeight = 0.0;
@ -2359,47 +2361,50 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
const int vValues = mesh.vertexCount*3; const int vValues = mesh.vertexCount*3;
// Skip if missing bone data, causes segfault without on some models // Skip if missing bone data, causes segfault without on some models
if ((mesh.boneWeights == NULL) || (mesh.boneIds == NULL)) continue; if ((mesh.boneWeights == NULL) || (mesh.boneIds == NULL)) continue;
for (int vCounter = 0; vCounter < vValues; vCounter += 3) // Iterates over 4 bones per vertex
{ for (int j = 0; j < 4; j++, boneCounter++)
mesh.animVertices[vCounter] = 0; {
mesh.animVertices[vCounter + 1] = 0; boneWeight = mesh.boneWeights[boneCounter];
mesh.animVertices[vCounter + 2] = 0; boneId = mesh.boneIds[boneCounter];
if (mesh.animNormals != NULL)
{
mesh.animNormals[vCounter] = 0;
mesh.animNormals[vCounter + 1] = 0;
mesh.animNormals[vCounter + 2] = 0;
}
// Iterates over 4 bones per vertex // Early stop when no transformation will be applied
for (int j = 0; j < 4; j++, boneCounter++) if (boneWeight == 0.0f) continue;
{
boneWeight = mesh.boneWeights[boneCounter];
boneId = mesh.boneIds[boneCounter];
// Early stop when no transformation will be applied boneMatrix = model.meshes[m].boneMatrices[boneId];
if (boneWeight == 0.0f) continue; InverseBoneMatrix = MatrixTranspose(MatrixInvert(boneMatrix));
animVertex = (Vector3){ mesh.vertices[vCounter], mesh.vertices[vCounter + 1], mesh.vertices[vCounter + 2] };
animVertex = Vector3Transform(animVertex,model.meshes[m].boneMatrices[boneId]);
mesh.animVertices[vCounter] += animVertex.x*boneWeight;
mesh.animVertices[vCounter+1] += animVertex.y*boneWeight;
mesh.animVertices[vCounter+2] += animVertex.z*boneWeight;
updated = true;
// Normals processing for (int vCounter = 0; vCounter < vValues; vCounter += 3)
// NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals) {
if ((mesh.normals != NULL) && (mesh.animNormals != NULL )) mesh.animVertices[vCounter] = 0;
{ mesh.animVertices[vCounter + 1] = 0;
animNormal = (Vector3){ mesh.normals[vCounter], mesh.normals[vCounter + 1], mesh.normals[vCounter + 2] }; mesh.animVertices[vCounter + 2] = 0;
animNormal = Vector3Transform(animNormal, MatrixTranspose(MatrixInvert(model.meshes[m].boneMatrices[boneId]))); if (mesh.animNormals != NULL)
mesh.animNormals[vCounter] += animNormal.x*boneWeight; {
mesh.animNormals[vCounter + 1] += animNormal.y*boneWeight; mesh.animNormals[vCounter] = 0;
mesh.animNormals[vCounter + 2] += animNormal.z*boneWeight; mesh.animNormals[vCounter + 1] = 0;
} mesh.animNormals[vCounter + 2] = 0;
} }
} animVertex = (Vector3){ mesh.vertices[vCounter], mesh.vertices[vCounter + 1], mesh.vertices[vCounter + 2] };
animVertex = Vector3Transform(animVertex, boneMatrix);
mesh.animVertices[vCounter] += animVertex.x*boneWeight;
mesh.animVertices[vCounter+1] += animVertex.y*boneWeight;
mesh.animVertices[vCounter+2] += animVertex.z*boneWeight;
updated = true;
// Normals processing
// NOTE: We use meshes.baseNormals (default normal) to calculate meshes.normals (animated normals)
if ((mesh.normals != NULL) && (mesh.animNormals != NULL))
{
animNormal = (Vector3){ mesh.normals[vCounter], mesh.normals[vCounter + 1], mesh.normals[vCounter + 2] };
animNormal = Vector3Transform(animNormal, InverseBoneMatrix);
mesh.animNormals[vCounter] += animNormal.x*boneWeight;
mesh.animNormals[vCounter + 1] += animNormal.y*boneWeight;
mesh.animNormals[vCounter + 2] += animNormal.z*boneWeight;
}
}
}
if (updated) if (updated)
{ {