FIX simplify animator logic

Author: kikonen

src/animation/AnimationSystem.cpp

@@ -438,10 +438,7 @@ namespace animation
              if (!playB.m_active) {
                  changed = animator.animate(
                      *rig,
-                     glm::mat4{ 1.f },
                      nodeTransforms,
-                     jointPalette,
-                     socketPalette,
                      playA.m_clipIndex,
                      playA.m_startTime,
                      playA.m_speed,
@@ -451,10 +448,7 @@ namespace animation
             else {
                  changed = animator.animateBlended(
                      *rig,
-                     glm::mat4{ 1.f },
                      nodeTransforms,
-                     jointPalette,
-                     socketPalette,
                      playA.m_clipIndex,
                      playA.m_startTime,
                      playA.m_speed,
@@ -471,6 +465,23 @@ namespace animation
                 playB.m_active = false;
             }
 
+            if (changed) {
+                // STEP 2: update Joint Palette
+                for (const auto& joint : rig->m_jointContainer.m_joints)
+                {
+                    const auto& globalTransform = nodeTransforms[joint.m_nodeIndex];
+                    // NOTE KI m_offsetMatrix so that vertex is first converted to local space of joint
+                    jointPalette[joint.m_index] = globalTransform * joint.m_offsetMatrix;
+                }
+
+                // STEP 3: update Socket Palette
+                for (const auto& socket : rig->m_sockets) {
+                    // NOTE KI see AnimationSystem::registerInstance()
+                    socketPalette[socket.m_index] = socket.calculateGlobalTransform(
+                        nodeTransforms[socket.m_nodeIndex]);
+                }
+            }
+
             if (changed) {
                 rigNodeRegistry.markDirty(rigNodeBaseIndex, nodeTransforms.size());
                 jointRegistry.markDirty(jointBaseIndex, jointPalette.size());

src/animation/Animator.cpp

@@ -111,10 +111,7 @@ namespace {
 namespace animation {
     bool Animator::animate(
         const animation::RigContainer& rig,
-        const glm::mat4& inverseMeshRigTransform,
         std::span<glm::mat4> rigNodeTransforms,
-        std::span<glm::mat4> jointPalette,
-        std::span<glm::mat4> socketPalette,
         uint16_t clipIndex,
         double animationStartTime,
         float speed,
@@ -167,31 +164,12 @@ namespace animation {
             }
         }
 
-        // STEP 2: update Joint Palette
-        for (const auto& joint : rig.m_jointContainer.m_joints)
-        {
-            const auto& globalTransform = rigNodeTransforms[joint.m_nodeIndex];
-            // NOTE KI m_offsetMatrix so that vertex is first converted to local space of joint
-            jointPalette[joint.m_index] = inverseMeshRigTransform * globalTransform * joint.m_offsetMatrix;
-        }
-
-        // STEP 3: update Socket Palette
-        for (const auto& socket : rig.m_sockets)
-        {
-            // NOTE KI see AnimationSystem::registerInstance()
-            socketPalette[socket.m_index] = socket.calculateGlobalTransform(
-                rigNodeTransforms[socket.m_nodeIndex]);
-        }
-
         return true;
     }
 
     bool Animator::animateBlended(
         const animation::RigContainer& rig,
-        const glm::mat4& inverseMeshRigTransform,
         std::span<glm::mat4> rigNodeTransforms,
-        std::span<glm::mat4> jointPalette,
-        std::span<glm::mat4> socketPalette,
         uint16_t clipIndexA,
         double animationStartTimeA,
         float speedA,
@@ -292,34 +270,6 @@ namespace animation {
             }
         }
 
-        //// STEP 2: update Joint Palette
-        //for (size_t nodeIndex = 0; nodeIndex < rig.m_nodes.size(); nodeIndex++)
-        //{
-        //    const auto& rigNode = rig.m_nodes[nodeIndex];
-        //    const auto* joint = rig.m_jointContainer.getInfo(rigNode.m_jointIndex);
-
-        //    if (joint) {
-        //        const auto& globalTransform = rigNodeTransforms[rigNode.m_index];
-        //        // NOTE KI m_offsetMatrix so that vertex is first converted to local space of joint
-        //        jointPalette[joint->m_index] = inverseMeshRigTransform * globalTransform * joint->m_offsetMatrix;
-        //    }
-        //}
-
-        // STEP 2: update Joint Palette
-        for (const auto& joint : rig.m_jointContainer.m_joints)
-        {
-            const auto& globalTransform = rigNodeTransforms[joint.m_nodeIndex];
-            // NOTE KI m_offsetMatrix so that vertex is first converted to local space of joint
-            jointPalette[joint.m_index] = inverseMeshRigTransform * globalTransform * joint.m_offsetMatrix;
-        }
-
-        // STEP 3: update Socket Palette
-        for (const auto& socket : rig.m_sockets) {
-            // NOTE KI see AnimationSystem::registerInstance()
-            socketPalette[socket.m_index] = socket.calculateGlobalTransform(
-                rigNodeTransforms[socket.m_nodeIndex]);
-        }
-
         return true;
     }
 }

src/animation/Animator.h

@@ -20,10 +20,7 @@ namespace animation {
         // @return true if palette was changed
         bool animate(
             const animation::RigContainer& rig,
-            const glm::mat4& inverseMeshRigTransform,
             std::span<glm::mat4> rigNodeTransforms,
-            std::span<glm::mat4> jointPalette,
-            std::span<glm::mat4> socketPalette,
             uint16_t clipIndex,
             double animationStartTime,
             float speed,
@@ -34,10 +31,7 @@ namespace animation {
         // @return true if palette was changed
         bool animateBlended(
             const animation::RigContainer& rig,
-            const glm::mat4& inverseMeshRigTransform,
             std::span<glm::mat4> rigNodeTransforms,
-            std::span<glm::mat4> jointPalette,
-            std::span<glm::mat4> socketPalette,
             uint16_t clipIndexA,
             double animationStartTimeA,
             float speedA,

src/mesh/RigNodeTreeGenerator.cpp

@@ -25,9 +25,9 @@ namespace mesh {
         auto& vertexJoints = mesh->m_vertexJoints;
         auto& indeces = mesh->m_indeces;
 
-        vertices.reserve(rig.m_nodes.size());
-        vertexJoints.reserve(rig.m_nodes.size());
-        indeces.reserve(rig.m_nodes.size());
+        vertices.reserve(rig.m_jointContainer.m_joints.size());
+        vertexJoints.reserve(rig.m_jointContainer.m_joints.size());
+        indeces.reserve(rig.m_jointContainer.m_joints.size() * 2);
 
         std::map<int16_t, int16_t> jointToVertex;
 
@@ -101,9 +101,9 @@ namespace mesh {
         auto& vertexJoints = mesh->m_vertexJoints;
         auto& indeces = mesh->m_indeces;
 
-        vertices.reserve(rig.m_nodes.size());
-        vertexJoints.reserve(rig.m_nodes.size());
-        indeces.reserve(rig.m_nodes.size());
+        vertices.reserve(rig.m_jointContainer.m_joints.size());
+        vertexJoints.reserve(rig.m_jointContainer.m_joints.size());
+        indeces.reserve(rig.m_jointContainer.m_joints.size());
 
         std::map<int16_t, int16_t> jointToVertex;