BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Revert "Fix short 180 degree rotation when using set_bone_position (#10405)" (#10534)

Browse Source 
This reverts commit 0f98b54aa4b2361575002d92b29fe222703ba557.
This commit is contained in:
Lars Müller 2020-11-04 21:43:32 +01:00 committed by GitHub
parent 72b93ec0d7
commit e3bd6704a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/content_cao.cpp
View File

@ -1487,17 +1487,24 @@ void GenericCAO::updateBonePosition()
if (!bone) if (!bone)
continue; 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 // 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 // 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 // when using EJUOR_CONTROL joint control. If the bug is detected we update the bone to the proper position
// and update the bones transformation. // and update the bones transformation.
v3f bone_rot = bone->getRelativeTransformation().getRotationDegrees(); v3f bone_rot = bone->getRelativeTransformation().getRotationDegrees();
float offset_X = fabsf(bone_rot.X - bone->getRotation().X); float offset = fabsf(bone_rot.X - bone->getRotation().X);
float offset_Y = fabsf(bone_rot.Y - bone->getRotation().Y); if (offset > 179.9f && offset < 180.1f) {
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->setRotation(bone_rot);
bone->updateAbsolutePosition(); bone->updateAbsolutePosition();
} }