From 1979e1dbc7aecca330bd504dc55dfcf032dd48d0 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 27 Aug 2019 16:37:37 -0700 Subject: [PATCH 1/2] apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) --- interface/src/avatar/MySkeletonModel.cpp | 5 +---- libraries/animation/src/Rig.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp index 6080911dd9..9d5693da33 100755 --- a/interface/src/avatar/MySkeletonModel.cpp +++ b/interface/src/avatar/MySkeletonModel.cpp @@ -337,10 +337,7 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) { eyeParams.modelTranslation = getTranslation(); eyeParams.leftEyeJointIndex = _rig.indexOfJoint("LeftEye"); eyeParams.rightEyeJointIndex = _rig.indexOfJoint("RightEye"); - - if (_owningAvatar->getHasProceduralEyeFaceMovement()) { - _rig.updateFromEyeParameters(eyeParams); - } + _rig.updateFromEyeParameters(eyeParams); updateFingers(); } diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 211c54def8..bd099af7c0 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1973,7 +1973,7 @@ void Rig::updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm // TODO: does not properly handle avatar scale. - if (isIndexValid(index)) { + if (isIndexValid(index) && !_internalPoseSet._overrideFlags[i]) { const glm::mat4 rigToWorld = createMatFromQuatAndPos(modelRotation, modelTranslation); const glm::mat4 worldToRig = glm::inverse(rigToWorld); const glm::vec3 lookAtVector = glm::normalize(transformPoint(worldToRig, lookAtSpot) - _internalPoseSet._absolutePoses[index].trans()); From f331b76c5161850399a4b074ce3e2782f796eaf0 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 27 Aug 2019 16:58:37 -0700 Subject: [PATCH 2/2] apply fake eye saccades if eye joints aren't overridden (rather than if HasProceduralEyeFaceMovement is true) --- libraries/animation/src/Rig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index bd099af7c0..153637f176 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1973,7 +1973,7 @@ void Rig::updateEyeJoint(int index, const glm::vec3& modelTranslation, const glm // TODO: does not properly handle avatar scale. - if (isIndexValid(index) && !_internalPoseSet._overrideFlags[i]) { + if (isIndexValid(index) && !_internalPoseSet._overrideFlags[index]) { const glm::mat4 rigToWorld = createMatFromQuatAndPos(modelRotation, modelTranslation); const glm::mat4 worldToRig = glm::inverse(rigToWorld); const glm::vec3 lookAtVector = glm::normalize(transformPoint(worldToRig, lookAtSpot) - _internalPoseSet._absolutePoses[index].trans());