]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Fix short 180 degree rotation when using set_bone_position (#10405)
authorLars Müller <34514239+appgurueu@users.noreply.github.com>
Sun, 4 Oct 2020 13:09:12 +0000 (15:09 +0200)
committerGitHub <noreply@github.com>
Sun, 4 Oct 2020 13:09:12 +0000 (15:09 +0200)
src/client/content_cao.cpp

index 71a9d4b545d8e1746a33e0466e12a493b8ac9835..c1715a289ea01552ab773726150537b01711234d 100644 (file)
@@ -1460,24 +1460,17 @@ void GenericCAO::updateBonePosition()
                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) {
+               float offset_X = fabsf(bone_rot.X - bone->getRotation().X);
+               float offset_Y = fabsf(bone_rot.Y - bone->getRotation().Y);
+               float offset_Z = fabsf(bone_rot.Z - bone->getRotation().Z);
+               if ((offset_X > 179.9f && offset_X < 180.1f)
+                               || (offset_Y > 179.9f && offset_Y < 180.1f)
+                               || (offset_Z > 179.9f && offset_Z < 180.1f)) {
                        bone->setRotation(bone_rot);
                        bone->updateAbsolutePosition();
                }