From e89d3840fc99c8f3724d674d14aad779e994bb2f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 3 Nov 2022 15:11:26 +0900
Subject: [PATCH] Adjust completion animation

---
 .../Skinning/Argon/ArgonSpinnerProgressArc.cs | 14 +++++++----
 .../Skinning/Argon/ArgonSpinnerRingArc.cs     | 24 +++++++++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
index be7921a1f1..e998f55755 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerProgressArc.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Utils;
-using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK.Graphics;
@@ -24,8 +23,10 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
         private DrawableSpinner spinner = null!;
 
+        private CircularProgress background = null!;
+
         [BackgroundDependencyLoader]
-        private void load(DrawableHitObject drawableHitObject, OsuColour colours)
+        private void load(DrawableHitObject drawableHitObject)
         {
             RelativeSizeAxes = Axes.Both;
 
@@ -33,7 +34,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
 
             InternalChildren = new Drawable[]
             {
-                new CircularProgress
+                background = new CircularProgress
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -59,8 +60,11 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
         {
             base.Update();
 
-            fill.Alpha = (float)Interpolation.DampContinuously(fill.Alpha, spinner.Progress > 0 ? 1 : 0, 120f, (float)Math.Abs(Time.Elapsed));
-            fill.Current.Value = (float)Interpolation.DampContinuously(fill.Current.Value, arc_fill * spinner.Progress, 120f, (float)Math.Abs(Time.Elapsed));
+            background.Alpha = spinner.Progress >= 1 ? 0 : 1;
+
+            fill.Alpha = (float)Interpolation.DampContinuously(fill.Alpha, spinner.Progress > 0 && spinner.Progress < 1 ? 1 : 0, 40f, (float)Math.Abs(Time.Elapsed));
+            fill.Current.Value = (float)Interpolation.DampContinuously(fill.Current.Value, spinner.Progress >= 1 ? 0 : arc_fill * spinner.Progress, 40f, (float)Math.Abs(Time.Elapsed));
+
             fill.Rotation = (float)(90 - fill.Current.Value * 180);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerRingArc.cs b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerRingArc.cs
index ec9d7bbae5..57fb57a09e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerRingArc.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Argon/ArgonSpinnerRingArc.cs
@@ -1,24 +1,34 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Osu.Skinning.Argon
 {
     public class ArgonSpinnerRingArc : CompositeDrawable
     {
         private const float arc_fill = 0.31f;
+        private const float arc_fill_complete = 0.50f;
+
         private const float arc_radius = 0.02f;
 
+        private DrawableSpinner spinner = null!;
+        private CircularProgress fill = null!;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(DrawableHitObject drawableHitObject)
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChild = new CircularProgress
+            spinner = (DrawableSpinner)drawableHitObject;
+            InternalChild = fill = new CircularProgress
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -29,5 +39,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
                 RoundedCaps = true,
             };
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            fill.Current.Value = (float)Interpolation.DampContinuously(fill.Current.Value, spinner.Progress >= 1 ? arc_fill_complete : arc_fill, 40f, (float)Math.Abs(Time.Elapsed));
+            fill.InnerRadius = (float)Interpolation.DampContinuously(fill.InnerRadius, spinner.Progress >= 1 ? arc_radius * 2.2f : arc_radius, 40f, (float)Math.Abs(Time.Elapsed));
+
+            fill.Rotation = (float)(-fill.Current.Value * 180);
+        }
     }
 }