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

Resolve review: NULL-check joint offset allocation, fail fast

Browse Source 
[rmodels] Address review feedback on glTF joint offset handling

Resolve the open review points raised on PR #5876 for the per-joint
extOffset precompute in LoadModelAnimationsGLTF.

* NULL check: validate the extOffset RL_MALLOC result before use, which
  was previously missing.

* Fail-fast handling: detect the allocation failure at its source and
  abort animation loading (log a warning, free resources, return NULL)
  instead of propagating a NULL pointer into the per-frame loop.

* Brace formatting: expand the collapsed one-line joint-match check
  (if (...) { isJoint = true; break; }) into raylib's standard Allman
  brace style.

* Readability: break the deeply nested MatrixMultiply(MatrixMultiply(...))
  into named nodeScale/nodeRotation/nodeTranslation/nodeTransform locals,
  mirroring the existing S/R/T composition later in the function.

* Spacing/line breaks: add blank lines within the precompute block to
  match the surrounding code style.
This commit is contained in:
Caleb Seelhoff 2026-05-29 10:25:36 -05:00 committed by GitHub
parent ca4dcd7fd1
commit b0f6ecb2d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/rmodels.c
View File

@ -6517,8 +6517,6 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
if (data->skins_count > 0) if (data->skins_count > 0)
{ {
cgltf_skin skin = data->skins[0]; cgltf_skin skin = data->skins[0];
*animCount = (int)data->animations_count;
animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation));
// Precompute, per joint, the static transform contributed by any // Precompute, per joint, the static transform contributed by any
// intermediate non-joint nodes between the joint and its nearest // intermediate non-joint nodes between the joint and its nearest
@ -6527,23 +6525,47 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
// joints themselves. Depends only on the skin, not the animation. // joints themselves. Depends only on the skin, not the animation.
int jointCount = (int)skin.joints_count; int jointCount = (int)skin.joints_count;
Matrix *extOffset = (Matrix *)RL_MALLOC(jointCount*sizeof(Matrix)); Matrix *extOffset = (Matrix *)RL_MALLOC(jointCount*sizeof(Matrix));
if (extOffset == NULL)
{
// Allocation failed: abort animation loading at the source rather than
// propagating a NULL pointer into the per-frame transform loop below
TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to allocate joint offset buffer", fileName);
cgltf_free(data);
UnloadFileData(fileData);
*animCount = 0;
return NULL;
}
*animCount = (int)data->animations_count;
animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation));
for (int k = 0; k < jointCount; k++) for (int k = 0; k < jointCount; k++)
{ {
extOffset[k] = MatrixIdentity(); extOffset[k] = MatrixIdentity();
cgltf_node *n = skin.joints[k]->parent; cgltf_node *n = skin.joints[k]->parent;
while (n != NULL) while (n != NULL)
{ {
bool isJoint = false; bool isJoint = false;
for (int jj = 0; jj < jointCount; jj++) for (int jj = 0; jj < jointCount; jj++)
{ {
if (skin.joints[jj] == n) { isJoint = true; break; } if (skin.joints[jj] == n)
{
isJoint = true;
break;
}
} }
if (isJoint) break; if (isJoint) break;
Matrix nm = MatrixMultiply(MatrixMultiply(
MatrixScale(n->scale[0], n->scale[1], n->scale[2]), // Compose the intermediate node's local TRS (scale, then rotation, then translation)
QuaternionToMatrix((Quaternion){ n->rotation[0], n->rotation[1], n->rotation[2], n->rotation[3] })), Matrix nodeScale = MatrixScale(n->scale[0], n->scale[1], n->scale[2]);
MatrixTranslate(n->translation[0], n->translation[1], n->translation[2])); Matrix nodeRotation = QuaternionToMatrix((Quaternion){ n->rotation[0], n->rotation[1], n->rotation[2], n->rotation[3] });
extOffset[k] = MatrixMultiply(extOffset[k], nm); Matrix nodeTranslation = MatrixTranslate(n->translation[0], n->translation[1], n->translation[2]);
Matrix nodeTransform = MatrixMultiply(MatrixMultiply(nodeScale, nodeRotation), nodeTranslation);
extOffset[k] = MatrixMultiply(extOffset[k], nodeTransform);
n = n->parent; n = n->parent;
} }
} }