From 8e9377914d96a4d65a96335da0cd169e3721128d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 20 Dec 2024 15:04:37 +0900
Subject: [PATCH] Subclass menu logo visualisation

---
 .../Screens/Menu/MenuLogoVisualisation.cs     | 19 +++++++------------
 osu.Game/Screens/Menu/OsuLogo.cs              | 16 +++++++++-------
 osu.Game/Seasonal/OsuLogoChristmas.cs         |  2 ++
 .../Seasonal/SeasonalMenuLogoVisualisation.cs | 12 ++++++++++++
 4 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 osu.Game/Seasonal/SeasonalMenuLogoVisualisation.cs

diff --git a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
index 32b5c706a3..f152c0c93c 100644
--- a/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/MenuLogoVisualisation.cs
@@ -1,22 +1,19 @@
 // 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.
 
-#nullable disable
-
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Seasonal;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Menu
 {
-    internal partial class MenuLogoVisualisation : LogoVisualisation
+    public partial class MenuLogoVisualisation : LogoVisualisation
     {
-        private IBindable<APIUser> user;
-        private Bindable<Skin> skin;
+        private IBindable<APIUser> user = null!;
+        private Bindable<Skin> skin = null!;
 
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api, SkinManager skinManager)
@@ -24,15 +21,13 @@ namespace osu.Game.Screens.Menu
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
 
-            user.ValueChanged += _ => updateColour();
-            skin.BindValueChanged(_ => updateColour(), true);
+            user.ValueChanged += _ => UpdateColour();
+            skin.BindValueChanged(_ => UpdateColour(), true);
         }
 
-        private void updateColour()
+        protected virtual void UpdateColour()
         {
-            if (SeasonalUIConfig.ENABLED)
-                Colour = SeasonalUIConfig.AMBIENT_COLOUR_1;
-            else if (user.Value?.IsSupporter ?? false)
+            if (user.Value?.IsSupporter ?? false)
                 Colour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? Color4.White;
             else
                 Colour = Color4.White;
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index dc2dfefddb..31f47c1349 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -53,6 +53,8 @@ namespace osu.Game.Screens.Menu
         private Sample sampleClick;
         private SampleChannel sampleClickChannel;
 
+        protected virtual MenuLogoVisualisation CreateMenuLogoVisualisation() => new MenuLogoVisualisation();
+
         protected virtual double BeatSampleVariance => 0.1;
 
         protected Sample SampleBeat;
@@ -153,14 +155,14 @@ namespace osu.Game.Screens.Menu
                                             AutoSizeAxes = Axes.Both,
                                             Children = new Drawable[]
                                             {
-                                                visualizer = new MenuLogoVisualisation
+                                                visualizer = CreateMenuLogoVisualisation().With(v =>
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Origin = Anchor.Centre,
-                                                    Anchor = Anchor.Centre,
-                                                    Alpha = visualizer_default_alpha,
-                                                    Size = SCALE_ADJUST
-                                                },
+                                                    v.RelativeSizeAxes = Axes.Both;
+                                                    v.Origin = Anchor.Centre;
+                                                    v.Anchor = Anchor.Centre;
+                                                    v.Alpha = visualizer_default_alpha;
+                                                    v.Size = SCALE_ADJUST;
+                                                }),
                                                 LogoElements = new Container
                                                 {
                                                     AutoSizeAxes = Axes.Both,
diff --git a/osu.Game/Seasonal/OsuLogoChristmas.cs b/osu.Game/Seasonal/OsuLogoChristmas.cs
index ec9cac94ea..8975a69c32 100644
--- a/osu.Game/Seasonal/OsuLogoChristmas.cs
+++ b/osu.Game/Seasonal/OsuLogoChristmas.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Seasonal
 
         private bool hasHat;
 
+        protected override MenuLogoVisualisation CreateMenuLogoVisualisation() => new SeasonalMenuLogoVisualisation();
+
         [BackgroundDependencyLoader]
         private void load(TextureStore textures, AudioManager audio)
         {
diff --git a/osu.Game/Seasonal/SeasonalMenuLogoVisualisation.cs b/osu.Game/Seasonal/SeasonalMenuLogoVisualisation.cs
new file mode 100644
index 0000000000..f00da3fe7e
--- /dev/null
+++ b/osu.Game/Seasonal/SeasonalMenuLogoVisualisation.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.Game.Screens.Menu;
+
+namespace osu.Game.Seasonal
+{
+    internal partial class SeasonalMenuLogoVisualisation : MenuLogoVisualisation
+    {
+        protected override void UpdateColour() => Colour = SeasonalUIConfig.AMBIENT_COLOUR_1;
+    }
+}