Merge pull request #23 from winnerspiros/hide-spinner-background-hidden-mod-17611171314315578141

Hide spinner background in Hidden mod

Author: winnerspiros

osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -77,8 +77,14 @@ private void applyHiddenState(DrawableHitObject drawableObject, bool increaseVis
                 }
                 else if (drawableObject is DrawableSpinner spinner)
                 {
-                    spinner.Body.OnSkinChanged += () => hideSpinnerApproachCircle(spinner);
+                    spinner.Body.OnSkinChanged += () =>
+                    {
+                        hideSpinnerApproachCircle(spinner);
+                        hideSpinnerBackground(spinner);
+                    };
+
                     hideSpinnerApproachCircle(spinner);
+                    hideSpinnerBackground(spinner);
                 }
             }
 
@@ -130,8 +136,6 @@ private void applyHiddenState(DrawableHitObject drawableObject, bool increaseVis
 
                 case DrawableSpinner spinner:
                     // hide elements we don't care about.
-                    // todo: hide background
-
                     using (spinner.BeginAbsoluteSequence(fadeStartTime))
                         spinner.FadeOut(fadeDuration);
 
@@ -192,5 +196,15 @@ private static void hideSpinnerApproachCircle(DrawableSpinner spinner)
             using (spinner.BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt))
                 approachCircle.Hide();
         }
+
+        private static void hideSpinnerBackground(DrawableSpinner spinner)
+        {
+            var spinnerBackground = (spinner.Body.Drawable as IHasSpinnerBackground)?.SpinnerBackground;
+            if (spinnerBackground == null)
+                return;
+
+            using (spinner.BeginAbsoluteSequence(spinner.HitObject.StartTime - spinner.HitObject.TimePreempt))
+                spinnerBackground.Hide();
+        }
     }
 }

osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinner.cs

@@ -14,7 +14,7 @@
 
 namespace osu.Game.Rulesets.Osu.Skinning.Default
 {
-    public partial class DefaultSpinner : CompositeDrawable
+    public partial class DefaultSpinner : CompositeDrawable, IHasSpinnerBackground
     {
         private DrawableSpinner drawableSpinner = null!;
 
@@ -23,6 +23,10 @@ public partial class DefaultSpinner : CompositeDrawable
         private Container spmContainer = null!;
         private OsuSpriteText spmCounter = null!;
 
+        private DefaultSpinnerDisc disc = null!;
+
+        public Drawable SpinnerBackground => disc.SpinnerBackground;
+
         [Resolved]
         private OsuColour colours { get; set; } = null!;
 
@@ -40,7 +44,7 @@ private void load(DrawableHitObject drawableHitObject)
 
             AddRangeInternal(new Drawable[]
             {
-                new DefaultSpinnerDisc
+                disc = new DefaultSpinnerDisc
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,

osu.Game.Rulesets.Osu/Skinning/Default/DefaultSpinnerDisc.cs

@@ -39,6 +39,8 @@ public partial class DefaultSpinnerDisc : CompositeDrawable
         private SpinnerCentreLayer centre = null!;
         private SpinnerBackgroundLayer background = null!;
 
+        public Drawable SpinnerBackground => background;
+
         public DefaultSpinnerDisc()
         {
             // we are slightly bigger than our parent, to clip the top and bottom of the circle

osu.Game.Rulesets.Osu/Skinning/IHasSpinnerBackground.cs

@@ -0,0 +1,12 @@
+// 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 osu.Framework.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Skinning
+{
+    public interface IHasSpinnerBackground
+    {
+        Drawable SpinnerBackground { get; }
+    }
+}

osu.Game.Rulesets.Osu/Skinning/Legacy/LegacyOldStyleSpinner.cs

@@ -19,14 +19,17 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
     /// <summary>
     /// Legacy skinned spinner with one main spinning layer and a background layer.
     /// </summary>
-    public partial class LegacyOldStyleSpinner : LegacySpinner
+    public partial class LegacyOldStyleSpinner : LegacySpinner, IHasSpinnerBackground
     {
         private Sprite disc = null!;
         private Sprite metreSprite = null!;
         private Container metre = null!;
+        private Sprite background = null!;
 
         private bool spinnerBlink;
 
+        public Drawable SpinnerBackground => background;
+
         private const float final_metre_height = 692 * SPRITE_SCALE;
 
         [BackgroundDependencyLoader]
@@ -36,7 +39,7 @@ private void load(ISkinSource source)
 
             AddRangeInternal(new[]
             {
-                new Sprite
+                background = new Sprite
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.Centre,