phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 09:33:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(wom): sanitize per-keyframe translation/rotation/scale + movingSpeed NaN

Browse source 
Bone interpolation returns NaN for any NaN input. A single bad keyframe
in any animation would corrupt the entire skeleton during playback —
even bones that weren't being keyed in that animation got NaN final
matrices via parent-chain multiplication. Also catches movingSpeed which
leaks into the engine's displacement maths.
This commit is contained in:
Kelsi 2026-05-06 05:22:32 -07:00
parent f0abd1794b
commit a3fb267e0b
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pipeline/wowee_model.cpp
View file

@ -132,6 +132,8 @@ WoweeModel WoweeModelLoader::load(const std::string& basePath) {
f.read(reinterpret_cast<char*>(&anim.id), 4);
f.read(reinterpret_cast<char*>(&anim.durationMs), 4);
f.read(reinterpret_cast<char*>(&anim.movingSpeed), 4);
// Reject NaN movingSpeed; it leaks into displacement maths.
if (!std::isfinite(anim.movingSpeed)) anim.movingSpeed = 0.0f;
anim.boneKeyframes.resize(model.bones.size());
for (size_t bi = 0; bi < model.bones.size(); bi++) {
@ -143,6 +145,19 @@ WoweeModel WoweeModelLoader::load(const std::string& basePath) {
f.read(reinterpret_cast<char*>(&kf.translation), 12);
f.read(reinterpret_cast<char*>(&kf.rotation), 16);
f.read(reinterpret_cast<char*>(&kf.scale), 12);
// Sanitize keyframe floats — bone interp returns NaN
// for any NaN input and corrupts the whole skeleton.
auto fixVec = [](glm::vec3& v, float def) {
if (!std::isfinite(v.x)) v.x = def;
if (!std::isfinite(v.y)) v.y = def;
if (!std::isfinite(v.z)) v.z = def;
};
fixVec(kf.translation, 0.0f);
fixVec(kf.scale, 1.0f);
if (!std::isfinite(kf.rotation.x)) kf.rotation.x = 0.0f;
if (!std::isfinite(kf.rotation.y)) kf.rotation.y = 0.0f;
if (!std::isfinite(kf.rotation.z)) kf.rotation.z = 0.0f;
if (!std::isfinite(kf.rotation.w)) kf.rotation.w = 1.0f;
anim.boneKeyframes[bi].push_back(kf);
}
}