From 5cf8a963cdd4481d67254b4adad946c065dbdc51 Mon Sep 17 00:00:00 2001 From: amantley Date: Thu, 21 Feb 2019 15:41:16 -0800 Subject: [PATCH] make spine2 rotation damping only happen in optimized code. the regular code is already damped --- interface/src/avatar/MySkeletonModel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp index 13cdedc830..aa45a1f0bb 100755 --- a/interface/src/avatar/MySkeletonModel.cpp +++ b/interface/src/avatar/MySkeletonModel.cpp @@ -265,7 +265,9 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) { if (spine2Exists && headExists && hipsExists) { AnimPose rigSpaceYaw(myAvatar->getSpine2RotationRigSpace()); +#if defined(Q_OS_ANDROID) || defined(HIFI_USE_OPTIMIZED_IK) rigSpaceYaw.rot() = safeLerp(Quaternions::IDENTITY, rigSpaceYaw.rot(), 0.5f); +#endif glm::vec3 u, v, w; glm::vec3 fwd = rigSpaceYaw.rot() * glm::vec3(0.0f, 0.0f, 1.0f); glm::vec3 up = currentHeadPose.trans() - currentHipsPose.trans();