Fix preserve loop going to a longer animation starting in the middle …

…of it
acidbubbles · Dec 30, 2021 · 3ae5afe · 3ae5afe
1 parent cb44239
commit 3ae5afe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/AtomAnimations/Animations/AtomAnimation.cs b/src/AtomAnimations/Animations/AtomAnimation.cs
@@ -764,7 +764,7 @@ private void TransitionClips(AtomAnimationClip from, AtomAnimationClip to)
                     if (!from.loop)
                         to.clipTime = Mathf.Abs(to.animationLength - (from.animationLength - from.clipTime));
                     else if (to.preserveLoops)
-                        to.clipTime = from.clipTime;
+                        to.clipTime = (to.animationLength - (from.animationLength - from.clipTime)).Modulo(to.animationLength);
                 }
             }
 

diff --git a/src/AtomAnimations/Utils/FloatExtensions.cs b/src/AtomAnimations/Utils/FloatExtensions.cs
@@ -55,5 +55,10 @@ public static float RoundToNearest(this float value, float modulo)
             var half = modulo / 2;
             return value + half - (value + half) % modulo;
         }
+
+        public static float Modulo(this float value, float mod)
+        {
+            return (value % mod + mod) % mod;
+        }
     }
 }