From 031dd5639b69553fae579f4ded72f725b8538365 Mon Sep 17 00:00:00 2001 From: amantley Date: Mon, 4 Feb 2019 14:46:52 -0800 Subject: [PATCH] fixed pole vector over writing with the old json --- libraries/animation/src/Rig.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index f366c08cfe..faddfdebb3 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1069,23 +1069,16 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos t += deltaTime; if (_enableInverseKinematics) { - - // animIK node json _animVars.set("ikOverlayAlpha", 1.0f); - // animSpline json _animVars.set("splineIKEnabled", true); _animVars.set("leftHandIKEnabled", true); _animVars.set("rightHandIKEnabled", true); _animVars.set("leftFootIKEnabled", true); _animVars.set("rightFootIKEnabled", true); - _animVars.set("leftHandPoleVectorEnabled", true); - _animVars.set("rightHandPoleVectorEnabled", true); _animVars.set("leftFootPoleVectorEnabled", true); _animVars.set("rightFootPoleVectorEnabled", true); } else { - // animIK node json _animVars.set("ikOverlayAlpha", 0.0f); - // animSpline json _animVars.set("splineIKEnabled", false); _animVars.set("leftHandIKEnabled", false); _animVars.set("rightHandIKEnabled", false); @@ -1097,7 +1090,6 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos _animVars.set("rightFootPoleVectorEnabled", false); } _lastEnableInverseKinematics = _enableInverseKinematics; - } _lastForward = forward; _lastPosition = worldPosition;