luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-11-07 10:45:18 +01:00
Code Activity

Fix interpolating to identity bone overrides (#16609)

Browse Source 
The previous code immediately dropped identity overrides, even if there still was an interpolation to be done.
Also a little bit of cleanup, and setting an appropriate identity default for the scale property when interpolating.

For modders: As a workaround, you can add a tiny offset so that overrides aren't identity overrides.
This commit is contained in:
Lars Müller
2025-10-29 10:25:50 +01:00
committed by GitHub
parent 93ccb4b355
commit 7331156650
5 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/client/content_cao.cpp
View File

@@ -702,17 +702,21 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
});
m_animated_meshnode->setOnAnimateCallback([&](f32 dtime) {
for (auto &it : m_bone_override) {
auto* bone = m_animated_meshnode->getJointNode(it.first.c_str());
if (!bone)
continue;
BoneOverride &props = it.second;
for (auto it = m_bone_override.begin(); it != m_bone_override.end();) {
BoneOverride &props = it->second;
props.dtime_passed += dtime;
bone->setPosition(props.getPosition(bone->getPosition()));
bone->setRotation(props.getRotationEulerDeg(bone->getRotation()));
bone->setScale(props.getScale(bone->getScale()));
if (props.isIdentity()) {
it = m_bone_override.erase(it);
continue;
}
if (auto *bone = m_animated_meshnode->getJointNode(it->first.c_str())) {
bone->setPosition(props.getPosition(bone->getPosition()));
bone->setRotation(props.getRotationEulerDeg(bone->getRotation()));
bone->setScale(props.getScale(bone->getScale()));
}
++it;
}
});
} else
@@ -1689,9 +1693,9 @@ void GenericCAO::processMessage(const std::string &data)
props.scale.previous = props.scale.vector;
} else {
// Disable interpolation
props.position.interp_timer = 0.0f;
props.rotation.interp_timer = 0.0f;
props.scale.interp_timer = 0.0f;
props.position.interp_duration = 0.0f;
props.rotation.interp_duration = 0.0f;
props.scale.interp_duration = 0.0f;
}
// Read new values
props.position.vector = readV3F32(is);
@@ -1703,19 +1707,15 @@ void GenericCAO::processMessage(const std::string &data)
props.position.absolute = true;
props.rotation.absolute = true;
} else {
props.position.interp_timer = readF32(is);
props.rotation.interp_timer = readF32(is);
props.scale.interp_timer = readF32(is);
props.position.interp_duration = readF32(is);
props.rotation.interp_duration = readF32(is);
props.scale.interp_duration = readF32(is);
u8 absoluteFlag = readU8(is);
props.position.absolute = (absoluteFlag & 1) > 0;
props.rotation.absolute = (absoluteFlag & 2) > 0;
props.scale.absolute = (absoluteFlag & 4) > 0;
}
if (props.isIdentity()) {
m_bone_override.erase(bone);
} else {
m_bone_override[bone] = props;
}
m_bone_override[bone] = props;
} else if (cmd == AO_CMD_ATTACH_TO) {
u16 parent_id = readS16(is);
std::string bone = deSerializeString16(is);