aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authortheviper121 <theviper121@gmail.com>2020-04-26 12:32:04 -0500
committerGitHub <noreply@github.com>2020-04-26 19:32:04 +0200
commite1fc72c6f3450c82e2dd3e0892838498a6a8a092 (patch)
treec0bbe6f13cb52f988d3ba9bbe45b7c4e51c699c3 /src/client
parentbc60e44d80a02bd48163440da2fd3165c0910376 (diff)
downloadminetest-e1fc72c6f3450c82e2dd3e0892838498a6a8a092.tar.gz
minetest-e1fc72c6f3450c82e2dd3e0892838498a6a8a092.tar.bz2
minetest-e1fc72c6f3450c82e2dd3e0892838498a6a8a092.zip
Fix UpdateBonePosition() breaking animations (#9577)
Diffstat (limited to 'src/client')
-rw-r--r--src/client/content_cao.cpp48
1 files changed, 39 insertions, 9 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index e9e1cebd3..aadd33bb9 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -890,6 +890,11 @@ void GenericCAO::updateNodePos()
void GenericCAO::step(float dtime, ClientEnvironment *env)
{
+ if (m_animated_meshnode) {
+ m_animated_meshnode->animateJoints();
+ updateBonePosition();
+ }
+
// Handle model animations and update positions instantly to prevent lags
if (m_is_local_player) {
LocalPlayer *player = m_env->getLocalPlayer();
@@ -1360,16 +1365,41 @@ void GenericCAO::updateBonePosition()
return;
m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render
- for(std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator
- ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) {
- std::string bone_name = (*ii).first;
- v3f bone_pos = (*ii).second.X;
- v3f bone_rot = (*ii).second.Y;
+ for (auto &it : m_bone_position) {
+ std::string bone_name = it.first;
irr::scene::IBoneSceneNode* bone = m_animated_meshnode->getJointNode(bone_name.c_str());
- if(bone)
- {
- bone->setPosition(bone_pos);
+ if (bone) {
+ bone->setPosition(it.second.X);
+ bone->setRotation(it.second.Y);
+ }
+ }
+
+ // search through bones to find mistakenly rotated bones due to bug in Irrlicht
+ for (u32 i = 0; i < m_animated_meshnode->getJointCount(); ++i) {
+ irr::scene::IBoneSceneNode *bone = m_animated_meshnode->getJointNode(i);
+ if (!bone)
+ continue;
+
+ //If bone is manually positioned there is no need to perform the bug check
+ bool skip = false;
+ for (auto &it : m_bone_position) {
+ if (it.first == bone->getName()) {
+ skip = true;
+ break;
+ }
+ }
+ if (skip)
+ continue;
+
+ // Workaround for Irrlicht bug
+ // We check each bone to see if it has been rotated ~180deg from its expected position due to a bug in Irricht
+ // when using EJUOR_CONTROL joint control. If the bug is detected we update the bone to the proper position
+ // and update the bones transformation.
+ v3f bone_rot = bone->getRelativeTransformation().getRotationDegrees();
+ float offset = fabsf(bone_rot.X - bone->getRotation().X);
+ if (offset > 179.9f && offset < 180.1f) {
bone->setRotation(bone_rot);
+ bone->updateAbsolutePosition();
}
}
}
@@ -1583,7 +1613,7 @@ void GenericCAO::processMessage(const std::string &data)
v3f rotation = readV3F32(is);
m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
- updateBonePosition();
+ // updateBonePosition(); now called every step
} else if (cmd == AO_CMD_ATTACH_TO) {
u16 parent_id = readS16(is);
std::string bone = deSerializeString(is);