phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-08 18:13:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(wom): scrub NaN bone pivots and clamp parent indices at save time

Browse source 
Symmetric with the existing load-side guards. A bone with a NaN
pivot poisons its child bones' world matrices; an out-of-range
parent index would walk past the bones array during evaluation.
This commit is contained in:
Kelsi 2026-05-06 07:26:26 -07:00
parent 3b1fad7be9
commit c00bfab1a5
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pipeline/wowee_model.cpp
View file

@ -307,9 +307,19 @@ bool WoweeModelLoader::save(const WoweeModel& model, const std::string& basePath
uint32_t boneCount = static_cast<uint32_t>(model.bones.size()); uint32_t boneCount = static_cast<uint32_t>(model.bones.size());
f.write(reinterpret_cast<const char*>(&boneCount), 4); f.write(reinterpret_cast<const char*>(&boneCount), 4);
for (const auto& bone : model.bones) { for (const auto& bone : model.bones) {
// Symmetric scrub with load — pivot NaN propagates through
// skeleton matrices to every child bone; parent indices outside
// bone array would walk off the end during matrix evaluation.
glm::vec3 pivot = bone.pivot;
if (!std::isfinite(pivot.x)) pivot.x = 0.0f;
if (!std::isfinite(pivot.y)) pivot.y = 0.0f;
if (!std::isfinite(pivot.z)) pivot.z = 0.0f;
int16_t parent = bone.parentBone;
if (parent >= 0 && static_cast<uint32_t>(parent) >= boneCount)
parent = -1;
f.write(reinterpret_cast<const char*>(&bone.keyBoneId), 4); f.write(reinterpret_cast<const char*>(&bone.keyBoneId), 4);
f.write(reinterpret_cast<const char*>(&bone.parentBone), 2); f.write(reinterpret_cast<const char*>(&parent), 2);
f.write(reinterpret_cast<const char*>(&bone.pivot), 12); f.write(reinterpret_cast<const char*>(&pivot), 12);
f.write(reinterpret_cast<const char*>(&bone.flags), 4); f.write(reinterpret_cast<const char*>(&bone.flags), 4);
} }