From c046b8ffd35c5aaffd953999eca5c3828d97b2c5 Mon Sep 17 00:00:00 2001
From: amantley <amantley@googlemail.com>
Date: Fri, 1 Mar 2019 15:12:37 -0800
Subject: [PATCH] made is so the boneLengthScale is only computed once per
 animation clip

---
 libraries/animation/src/AnimClip.cpp | 80 +++++++++++++---------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index 9b87d058fd..4fe02e9307 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -123,6 +123,42 @@ void AnimClip::copyFromNetworkAnim() {
     const int animFrameCount = animModel.animationFrames.size();
     _anim.resize(animFrameCount);
 
+    // find the size scale factor for translation in the animation.
+    const int avatarHipsParentIndex = avatarSkeleton->getParentIndex(avatarSkeleton->nameToJointIndex("Hips"));
+    const int animHipsParentIndex = animSkeleton.getParentIndex(animSkeleton.nameToJointIndex("Hips"));
+    const AnimPose& avatarHipsAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarSkeleton->nameToJointIndex("Hips"));
+    const AnimPose& animHipsAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animSkeleton.nameToJointIndex("Hips"));
+
+    // the get the units and the heights for the animation and the avatar
+    const float avatarUnitScale = extractScale(avatarSkeleton->getGeometryOffset()).y;
+    const float animationUnitScale = extractScale(animModel.offset).y;
+    const float avatarHeightInMeters = avatarUnitScale * avatarHipsAbsoluteDefaultPose.trans().y;
+    const float animHeightInMeters = animationUnitScale * animHipsAbsoluteDefaultPose.trans().y;
+
+    // get the parent scales for the avatar and the animation
+    float avatarHipsParentScale = 1.0f;
+    if (avatarHipsParentIndex >= 0) {
+        const AnimPose& avatarHipsParentAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarHipsParentIndex);
+        avatarHipsParentScale = avatarHipsParentAbsoluteDefaultPose.scale().y;
+    }
+    float animHipsParentScale = 1.0f;
+    if (animHipsParentIndex >= 0) {
+        const AnimPose& animationHipsParentAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animHipsParentIndex);
+        animHipsParentScale = animationHipsParentAbsoluteDefaultPose.scale().y;
+    }
+
+    const float EPSILON = 0.0001f;
+    float boneLengthScale = 1.0f;
+    // compute the ratios for the units, the heights in meters, and the parent scales
+    if ((fabsf(animHeightInMeters) > EPSILON) && (animationUnitScale > EPSILON) && (animHipsParentScale > EPSILON)) {
+        const float avatarToAnimationHeightRatio = avatarHeightInMeters / animHeightInMeters;
+        const float unitsRatio = 1.0f / (avatarUnitScale / animationUnitScale);
+        const float parentScaleRatio = 1.0f / (avatarHipsParentScale / animHipsParentScale);
+
+        boneLengthScale = avatarToAnimationHeightRatio * unitsRatio * parentScaleRatio;
+    }
+
+
     for (int frame = 0; frame < animFrameCount; frame++) {
         const HFMAnimationFrame& animFrame = animModel.animationFrames[frame];
 
@@ -162,7 +198,6 @@ void AnimClip::copyFromNetworkAnim() {
         avatarSkeleton->convertAbsoluteRotationsToRelative(avatarRotations);
 
         _anim[frame].reserve(avatarJointCount);
-
         for (int avatarJointIndex = 0; avatarJointIndex < avatarJointCount; avatarJointIndex++) {
             const AnimPose& avatarDefaultPose = avatarSkeleton->getRelativeDefaultPose(avatarJointIndex);
 
@@ -177,49 +212,6 @@ void AnimClip::copyFromNetworkAnim() {
 
                 // retarget translation from animation to avatar
                 const glm::vec3& animZeroTrans = animModel.animationFrames[0].translations[animJointIndex];
-                float boneLengthScale = 1.0f;
-                const float EPSILON = 0.0001f;
-
-                const int avatarHipsParentIndex = avatarSkeleton->getParentIndex(avatarSkeleton->nameToJointIndex("Hips"));
-                const int animHipsParentIndex = animSkeleton.getParentIndex(animSkeleton.nameToJointIndex("Hips"));
-                if (avatarJointIndex == avatarSkeleton->nameToJointIndex("Hips") && (avatarHipsParentIndex >= 0) || (animHipsParentIndex >= 0)) {
-
-                    const AnimPose& animHipsAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animSkeleton.nameToJointIndex("Hips"));
-                    const AnimPose& avatarHipsAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarSkeleton->nameToJointIndex("Hips"));
-
-                    // the get the units and the heights for the animation and the avatar
-                    const float animationUnitScale = extractScale(animModel.offset).y;
-                    const float avatarUnitScale = extractScale(avatarSkeleton->getGeometryOffset()).y;
-                    const float avatarHeightInMeters = avatarUnitScale * avatarHipsAbsoluteDefaultPose.trans().y;
-                    const float animHeightInMeters = animationUnitScale * animHipsAbsoluteDefaultPose.trans().y;
-
-                    // get the parent scales for the avatar and the animation
-                    float avatarHipsParentScale = 1.0f;
-                    float animHipsParentScale = 1.0f;
-                    if (avatarHipsParentIndex >= 0) {
-                        const AnimPose& avatarHipsParentAbsoluteDefaultPose = avatarSkeleton->getAbsoluteDefaultPose(avatarHipsParentIndex);
-                        avatarHipsParentScale = avatarHipsParentAbsoluteDefaultPose.scale().y;
-                    }
-                    if (animHipsParentIndex >= 0) {
-                        const AnimPose& animationHipsParentAbsoluteDefaultPose = animSkeleton.getAbsoluteDefaultPose(animHipsParentIndex);
-                        animHipsParentScale = animationHipsParentAbsoluteDefaultPose.scale().y;
-                    }
-
-                    // compute the ratios for the units, the heights in meters, and the parent scales
-                    if ((fabsf(animHeightInMeters) > EPSILON) && (animationUnitScale > EPSILON) && (animHipsParentScale > EPSILON)) {
-                        const float avatarToAnimationHeightRatio = avatarHeightInMeters / animHeightInMeters;
-                        const float unitsRatio = 1.0f / (avatarUnitScale / animationUnitScale);
-                        const float parentScaleRatio = 1.0f / (avatarHipsParentScale / animHipsParentScale);
-
-                        boneLengthScale = avatarToAnimationHeightRatio * unitsRatio * parentScaleRatio;
-                    }
-                } else {
-
-                    if (fabsf(glm::length(animZeroTrans)) > EPSILON) {
-                        boneLengthScale = glm::length(avatarDefaultPose.trans()) / glm::length(animZeroTrans);
-                    }
-                }
-
                 relativeTranslation = avatarDefaultPose.trans() + boneLengthScale * (animTrans - animZeroTrans);
             } else {
                 // This joint is NOT in the animation at all.