UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED: UpdateModelAnimationBones(), break on first mesh found and formating

Browse source
This commit is contained in:
Ray 2024-12-18 11:43:43 +01:00
parent 35c2408413
commit f76734fc50
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/rmodels.c
View file

@ -2281,6 +2281,7 @@ void UpdateModelAnimationBones(Model model, ModelAnimation anim, int frame)
if (firstMeshWithBones == -1) if (firstMeshWithBones == -1)
{ {
firstMeshWithBones = i; firstMeshWithBones = i;
break;
} }
} }
} }
@ -2314,18 +2315,17 @@ void UpdateModelAnimationBones(Model model, ModelAnimation anim, int frame)
model.meshes[firstMeshWithBones].boneMatrices[boneId] = boneMatrix; model.meshes[firstMeshWithBones].boneMatrices[boneId] = boneMatrix;
} }
// Update remaining meshes with bones (Use Deep copy because shallow copy results in double free with 'UnloadModel()') // Update remaining meshes with bones
// NOTE: Using deep copy because shallow copy results in double free with 'UnloadModel()'
if (firstMeshWithBones != -1) if (firstMeshWithBones != -1)
{ {
for (int i = firstMeshWithBones + 1; i < model.meshCount; i++) for (int i = firstMeshWithBones + 1; i < model.meshCount; i++)
{ {
if (model.meshes[i].boneMatrices) if (model.meshes[i].boneMatrices)
{ {
memcpy( memcpy(model.meshes[i].boneMatrices,
model.meshes[i].boneMatrices,
model.meshes[firstMeshWithBones].boneMatrices, model.meshes[firstMeshWithBones].boneMatrices,
model.meshes[i].boneCount * sizeof(model.meshes[i].boneMatrices[0]) model.meshes[i].boneCount * sizeof(model.meshes[i].boneMatrices[0]));
);
} }
} }
} }
@ -2338,6 +2338,7 @@ void UpdateModelAnimationBones(Model model, ModelAnimation anim, int frame)
void UpdateModelAnimation(Model model, ModelAnimation anim, int frame) void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
{ {
UpdateModelAnimationBones(model,anim,frame); UpdateModelAnimationBones(model,anim,frame);
for (int m = 0; m < model.meshCount; m++) for (int m = 0; m < model.meshCount; m++)
{ {
Mesh mesh = model.meshes[m]; Mesh mesh = model.meshes[m];
@ -2346,8 +2347,9 @@ void UpdateModelAnimation(Model model, ModelAnimation anim, int frame)
int boneId = 0; int boneId = 0;
int boneCounter = 0; int boneCounter = 0;
float boneWeight = 0.0; float boneWeight = 0.0;
bool updated = false; // Flag to check when anim vertex information is updated bool updated = false; // Flag to check when anim vertex information is updated
const int vValues = mesh.vertexCount*3; const int vValues = mesh.vertexCount*3;
for (int vCounter = 0; vCounter < vValues; vCounter += 3) for (int vCounter = 0; vCounter < vValues; vCounter += 3)
{ {
mesh.animVertices[vCounter] = 0; mesh.animVertices[vCounter] = 0;