From 474a97d0fcb6faf0365a0678ee0656c421e306d1 Mon Sep 17 00:00:00 2001 From: amantley Date: Wed, 6 Mar 2019 15:15:30 -0800 Subject: [PATCH] now update the ikOverlayAlpha every frame --- libraries/animation/src/Rig.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 344a98f8c4..0fe03c7074 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1064,18 +1064,10 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos t += deltaTime; - if (_enableInverseKinematics != _lastEnableInverseKinematics) { - if (_enableInverseKinematics) { - _animVars.set("ikOverlayAlpha", 1.0f); - } else { - _animVars.set("ikOverlayAlpha", 0.0f); - } - } - _lastEnableInverseKinematics = _enableInverseKinematics; - -#if defined(Q_OS_ANDROID) || defined(HIFI_USE_OPTIMIZED_IK) - - if (!_enableInverseKinematics) { + if (_enableInverseKinematics) { + _animVars.set("ikOverlayAlpha", 1.0f); + } else { + _animVars.set("ikOverlayAlpha", 0.0f); _animVars.set("splineIKEnabled", false); _animVars.set("leftHandIKEnabled", false); _animVars.set("rightHandIKEnabled", false); @@ -1086,8 +1078,7 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos _animVars.set("leftFootPoleVectorEnabled", false); _animVars.set("rightFootPoleVectorEnabled", false); } - -#endif + _lastEnableInverseKinematics = _enableInverseKinematics; } _lastForward = forward;