Bake in blend curves as well

LazyDuchess · May 9, 2024 · be73b02 · be73b02
1 parent 9222f64
commit be73b02
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/Assets/Scripts/OpenTS2/Content/DBPF/Scenegraph/ScenegraphAnimationAsset.cs b/Assets/Scripts/OpenTS2/Content/DBPF/Scenegraph/ScenegraphAnimationAsset.cs
@@ -76,7 +76,7 @@ private static void CreateBlendCurveForIkWeight(AnimationClip clip, AnimResource
             clip.SetCurve(property, typeof(TwoBoneIKConstraint), "m_Data.m_TargetPositionWeight", curve);
         }
 
-        private static void CreateBlendCurveForChannel(AnimationClip clip, AnimResourceConstBlock.SharedChannel channel,
+        public static void CreateBlendCurveForChannel(AnimationClip clip, AnimResourceConstBlock.SharedChannel channel,
             string relativePathToBlend)
         {
             if (channel.Type != AnimResourceConstBlock.ChannelType.Float1)

diff --git a/Assets/Scripts/OpenTS2/Engine/Tests/SimAnimationTest.cs b/Assets/Scripts/OpenTS2/Engine/Tests/SimAnimationTest.cs
@@ -99,7 +99,7 @@ IEnumerator PlayClipFrameDelayed(string animName, ScenegraphAnimationAsset anim)
 
             _sim.AdjustInverseKinematicWeightsForAnimation(anim.AnimResource);
 
-            yield return BakeAnimationIntoNewAnimation(animName);
+            yield return BakeAnimationIntoNewAnimation(animName, anim);
         }
 
         private ScenegraphAnimationAsset UpdateAnimationsListAndGetSelection()
@@ -112,7 +112,7 @@ private ScenegraphAnimationAsset UpdateAnimationsListAndGetSelection()
             return tenMatchedAnimations.Length == 0 ? null : tenMatchedAnimations[0].Value;
         }
 
-        IEnumerator BakeAnimationIntoNewAnimation(string animName)
+        IEnumerator BakeAnimationIntoNewAnimation(string animName, ScenegraphAnimationAsset anim)
         {
             var bakedName = $"{animName}_baked";
             if (_animationObj.GetClip(bakedName) != null)
@@ -168,6 +168,21 @@ IEnumerator BakeAnimationIntoNewAnimation(string animName)
                 bakedClip.SetCurve(relativeBonePath, typeof(Transform), "localRotation.w", new AnimationCurve(posAndRot.QuatW.ToArray()));
             }
 
+            // Add curves for blend channels.
+            foreach (var target in anim.AnimResource.AnimTargets)
+            {
+                foreach (var channel in target.Channels)
+                {
+                    if (!_sim.Scenegraph.BlendNamesToRelativePaths.TryGetValue(channel.ChannelName,
+                            out var relativePathsToBlend)) continue;
+
+                    foreach (var blendRelativePath in relativePathsToBlend)
+                    {
+                        ScenegraphAnimationAsset.CreateBlendCurveForChannel(bakedClip, channel, blendRelativePath);
+                    }
+                }
+            }
+
             _animationObj.AddClip(bakedClip, bakedName);
             baking = false;
         }