Add: handle.Duration and handle.Loops

yn01-dev · Dec 21, 2024 · aae37fc · aae37fc
1 parent 67e0b9f
commit aae37fc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/LitMotion/Assets/LitMotion.Animation/Editor/LitMotionAnimationEditor.cs b/src/LitMotion/Assets/LitMotion.Animation/Editor/LitMotionAnimationEditor.cs
@@ -167,9 +167,9 @@ VisualElement CreateComponentsPanel()
 
                     var handle = component.TrackedHandle;
 
-                    if (handle.IsActive() && !double.IsInfinity(handle.Duration))
+                    if (handle.IsActive() && !double.IsInfinity(handle.TotalDuration))
                     {
-                        views[i].Progress = Mathf.InverseLerp(0f, (float)handle.Duration, (float)handle.Time);
+                        views[i].Progress = Mathf.InverseLerp(0f, (float)handle.TotalDuration, (float)handle.Time);
                     }
                     else
                     {

diff --git a/src/LitMotion/Assets/LitMotion/Runtime/Internal/MotionStorage.cs b/src/LitMotion/Assets/LitMotion/Runtime/Internal/MotionStorage.cs
@@ -422,7 +422,7 @@ public void AddToSequence(MotionHandle handle, out double motionDuration)
                 throw new ArgumentException("Cannot add a running motion to a sequence.");
             }
 
-            motionDuration = handle.Duration;
+            motionDuration = handle.TotalDuration;
             if (double.IsInfinity(motionDuration))
             {
                 throw new ArgumentException("Cannot add an infinitely looping motion to a sequence.");

diff --git a/src/LitMotion/Assets/LitMotion/Runtime/MotionHandle.cs b/src/LitMotion/Assets/LitMotion/Runtime/MotionHandle.cs
@@ -42,17 +42,39 @@ public readonly double Time
             }
         }
 
+        /// <summary>
+        /// The duration of the motion
+        /// </summary>
+        public readonly float Duration
+        {
+            get
+            {
+                return MotionManager.GetDataRef(this, false).Parameters.Duration;
+            }
+        }
+
         /// <summary>
         /// The total duration of the motion
         /// </summary>
-        public readonly double Duration
+        public readonly double TotalDuration
         {
             get
             {
                 return MotionManager.GetDataRef(this, false).Parameters.TotalDuration;
             }
         }
 
+        /// <summary>
+        /// The number of loops
+        /// </summary>
+        public readonly int Loops
+        {
+            get
+            {
+                return MotionManager.GetDataRef(this, false).Parameters.Loops;
+            }
+        }
+
         /// <summary>
         /// The number of loops completed
         /// </summary>

diff --git a/src/LitMotion/Assets/Sandbox/Sandbox.cs b/src/LitMotion/Assets/Sandbox/Sandbox.cs
@@ -23,7 +23,7 @@ void Start()
             .Preserve()
             .AddTo(this);
 
-        slider.maxValue = (float)handle.Duration;
+        slider.maxValue = (float)handle.TotalDuration;
     }
 
     void Update()