From 5186cec942a2f260f6c188e3e2170eec941bb3aa Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Thu, 29 Jul 2021 10:33:21 +0200
Subject: [PATCH] Improve animation preview usability for debugging

---
 .../Editor/GUI/Timeline/AnimationTimeline.cs  |  2 ++
 .../Viewport/Previews/AnimatedModelPreview.cs | 19 +++++++++++++++++++
 .../Viewport/Previews/AnimationPreview.cs     |  4 ++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Source/Editor/GUI/Timeline/AnimationTimeline.cs b/Source/Editor/GUI/Timeline/AnimationTimeline.cs
index ffc06d5d6..50e5ddfdb 100644
--- a/Source/Editor/GUI/Timeline/AnimationTimeline.cs
+++ b/Source/Editor/GUI/Timeline/AnimationTimeline.cs
@@ -36,6 +36,7 @@ namespace FlaxEditor.GUI.Timeline
                 if (_preview == value)
                     return;
                 _preview = value;
+                value?.PreviewActor.UpdateAnimation();
                 UpdatePlaybackState();
                 PreviewChanged?.Invoke();
             }
@@ -154,6 +155,7 @@ namespace FlaxEditor.GUI.Timeline
         {
             if (_preview != null)
             {
+                frame = Mathf.Clamp(frame, 0, DurationFrames - 1);
                 var time = frame / FramesPerSecond;
                 Editor.Internal_SetAnimationTime(Object.GetUnmanagedPtr(_preview.PreviewActor), time);
                 if (!_preview.PlayAnimation)
diff --git a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
index 27e76dbf8..ca5cd22d0 100644
--- a/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimatedModelPreview.cs
@@ -21,6 +21,7 @@ namespace FlaxEditor.Viewport.Previews
         private StaticModel _floorModel;
         private ContextMenuButton _showCurrentLODButton;
         private bool _playAnimation;
+        private float _playSpeed = 1.0f;
 
         /// <summary>
         /// Gets or sets the skinned model asset to preview.
@@ -46,7 +47,10 @@ namespace FlaxEditor.Viewport.Previews
             {
                 if (_playAnimation == value)
                     return;
+                if (!value)
+                    _playSpeed = _previewModel.UpdateSpeed;
                 _playAnimation = value;
+                _previewModel.UpdateSpeed = value ? _playSpeed : 0.0f;
                 PlayAnimationChanged?.Invoke();
             }
         }
@@ -56,6 +60,21 @@ namespace FlaxEditor.Viewport.Previews
         /// </summary>
         public event Action PlayAnimationChanged;
 
+        /// <summary>
+        /// Gets or sets the animation playback speed.
+        /// </summary>
+        public float PlaySpeed
+        {
+            get => _playAnimation ? _previewModel.UpdateSpeed : _playSpeed;
+            set
+            {
+                if (_playAnimation)
+                    _previewModel.UpdateSpeed = value;
+                else
+                    _playSpeed = value;
+            }
+        }
+
         /// <summary>
         /// Gets or sets a value indicating whether show animated model skeleton nodes debug view.
         /// </summary>
diff --git a/Source/Editor/Viewport/Previews/AnimationPreview.cs b/Source/Editor/Viewport/Previews/AnimationPreview.cs
index b931bacfb..6e7903c7b 100644
--- a/Source/Editor/Viewport/Previews/AnimationPreview.cs
+++ b/Source/Editor/Viewport/Previews/AnimationPreview.cs
@@ -32,8 +32,8 @@ namespace FlaxEditor.Viewport.Previews
                 {
                     Parent = playbackSpeed
                 };
-                playbackSpeedValue.ValueChanged += () => PreviewActor.UpdateSpeed = playbackSpeedValue.Value;
-                ViewWidgetButtonMenu.VisibleChanged += control => playbackSpeedValue.Value = PreviewActor.UpdateSpeed;
+                playbackSpeedValue.ValueChanged += () => PlaySpeed = playbackSpeedValue.Value;
+                ViewWidgetButtonMenu.VisibleChanged += control => playbackSpeedValue.Value = PlaySpeed;
             }
 
             // Play/Pause widget