From beb1f037e97a8f0ebb5c7b698f1af538e46ff167 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 2 Apr 2020 14:30:22 +0900
Subject: [PATCH] Add startAtCurrentTime parameter to GetAnimation()

---
 osu.Game/Skinning/IAnimationTimeReference.cs | 4 ++++
 osu.Game/Skinning/LegacySkinExtensions.cs    | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Skinning/IAnimationTimeReference.cs b/osu.Game/Skinning/IAnimationTimeReference.cs
index bcff10a24b..4ed5ef64c3 100644
--- a/osu.Game/Skinning/IAnimationTimeReference.cs
+++ b/osu.Game/Skinning/IAnimationTimeReference.cs
@@ -9,6 +9,10 @@ namespace osu.Game.Skinning
     /// <summary>
     /// Denotes an object which provides a reference time to start animations from.
     /// </summary>
+    /// <remarks>
+    /// This should not be used to start an animation immediately at the current time.
+    /// To do so, use <see cref="LegacySkinExtensions.GetAnimation"/> with <code>startAtCurrentTime = true</code> instead.
+    /// </remarks>
     [Cached]
     public interface IAnimationTimeReference
     {
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 8765b161d4..a736174f13 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Skinning
 {
     public static class LegacySkinExtensions
     {
-        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-")
+        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-",
+                                            bool startAtCurrentTime = false)
         {
             Texture texture;
 
@@ -24,7 +25,7 @@ public static Drawable GetAnimation(this ISkin source, string componentName, boo
 
                 if (textures.Length > 0)
                 {
-                    var animation = new SkinnableTextureAnimation
+                    var animation = new SkinnableTextureAnimation(startAtCurrentTime)
                     {
                         DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
                         Repeat = looping,
@@ -60,8 +61,8 @@ public class SkinnableTextureAnimation : TextureAnimation
             [Resolved(canBeNull: true)]
             private IAnimationTimeReference timeReference { get; set; }
 
-            public SkinnableTextureAnimation()
-                : base(false)
+            public SkinnableTextureAnimation(bool startAtCurrentTime = true)
+                : base(startAtCurrentTime)
             {
             }