feat: Improve progress bar UI

SolarianZ · May 4, 2023 · 3d47520 · 3d47520
1 parent 4a3a191
commit 3d47520
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 10 deletions.
diff --git a/Editor/Scripts/Node/AnimationClipPlayableNode.cs b/Editor/Scripts/Node/AnimationClipPlayableNode.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using GBG.PlayableGraphMonitor.Editor.GraphView;
+using GBG.PlayableGraphMonitor.Editor.Utility;
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.Animations;
@@ -59,16 +60,18 @@ protected override void OnUpdate(PlayableGraphViewUpdateContext updateContext, b
                 {
                     if (clip.isLooping)
                     {
-                        var progress = (float)(Playable.GetTime() / clip.length % 1.0f * 100);
+                        var progress = Playable.GetTime() / clip.length;
+                        progress = GraphTool.Wrap01(progress) * 100;
                         // Expensive operations
-                        _progressBar.SetValueWithoutNotify(progress);
+                        _progressBar.SetValueWithoutNotify((float)progress);
                     }
                     else
                     {
-                        var progress = (float)(Playable.GetTime() / clip.length * 100);
-                        progress = Mathf.Clamp(progress, 0, 100);
+                        var progress = Playable.GetTime() / clip.length;
+                        progress = Mathf.Clamp((float)progress, -1, 1);
+                        progress = GraphTool.Wrap01(progress) * 100;
                         // Expensive operations
-                        _progressBar.SetValueWithoutNotify(progress);
+                        _progressBar.SetValueWithoutNotify((float)progress);
                     }
                 }
                 else

diff --git a/Editor/Scripts/Node/AudioClipPlayableNode.cs b/Editor/Scripts/Node/AudioClipPlayableNode.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using GBG.PlayableGraphMonitor.Editor.GraphView;
+using GBG.PlayableGraphMonitor.Editor.Utility;
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.Audio;
@@ -58,16 +59,18 @@ protected override void OnUpdate(PlayableGraphViewUpdateContext updateContext, b
                 {
                     if (clipPlayable.GetLooped())
                     {
-                        var progress = (float)(Playable.GetTime() / clip.length % 1.0f * 100);
+                        var progress = Playable.GetTime() / clip.length;
+                        progress = GraphTool.Wrap01(progress) * 100;
                         // Expensive operations
-                        _progressBar.SetValueWithoutNotify(progress);
+                        _progressBar.SetValueWithoutNotify((float)progress);
                     }
                     else
                     {
-                        var progress = (float)(Playable.GetTime() / clip.length * 100);
-                        progress = Mathf.Clamp(progress, 0, 100);
+                        var progress = Playable.GetTime() / clip.length;
+                        progress = Mathf.Clamp((float)progress, -1, 1);
+                        progress = GraphTool.Wrap01(progress) * 100;
                         // Expensive operations
-                        _progressBar.SetValueWithoutNotify(progress);
+                        _progressBar.SetValueWithoutNotify((float)progress);
                     }
                 }
                 else

diff --git a/Editor/Scripts/Utility/GraphTool.cs b/Editor/Scripts/Utility/GraphTool.cs
@@ -40,6 +40,40 @@ public static string DurationToString(this Playable playable, string format = "F
 
             return durationStr;
         }
+
+        /// <summary>
+        /// Wrap the value to the range of [0,1].
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static double Wrap01(double value)
+        {
+            if (value < 0)
+            {
+                var result = 1.0 + value % 1;
+                // Prevent wrapping -0 to 1
+                if (result == 1)
+                {
+                    result = 0;
+                }
+
+                return result;
+            }
+
+            if (value > 1)
+            {
+                var result = value % 1;
+                // Prevent wrapping 1 to 0
+                if (result == 0)
+                {
+                    result = 1;
+                }
+
+                return result;
+            }
+
+            return value;
+        }
 
         public static void SetNodeStyle(this GraphViewNode node, Color nodeColor,
             float titleFontSize = 15, Color? titleColor = null)