From 8a40b27e8fc3cf9b17069439e8af130a72d7564e Mon Sep 17 00:00:00 2001
From: David Zhao <nyquill@ppy.sh>
Date: Wed, 3 Apr 2019 20:32:53 +0900
Subject: [PATCH] Remove need for logo relativePositionAxes none

---
 osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs |  1 -
 osu.Game/Graphics/Containers/LogoFacadeContainer.cs  | 10 ++++------
 osu.Game/Screens/Menu/ButtonSystem.cs                |  2 --
 osu.Game/Screens/Play/PlayerLoader.cs                |  1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs b/osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs
index b4d7976e4a..bd1fb932bb 100644
--- a/osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs
+++ b/osu.Game.Tests/Visual/TestCaseLogoFacadeContainer.cs
@@ -177,7 +177,6 @@ namespace osu.Game.Tests.Visual
                 Scheduler.AddDelayed(() =>
                 {
                     logoFacadeContainer.Tracking = true;
-                    //logo.RelativePositionAxes = Axes.None;
                     visualBox.Colour = Color4.Tomato;
                 }, 700);
             });
diff --git a/osu.Game/Graphics/Containers/LogoFacadeContainer.cs b/osu.Game/Graphics/Containers/LogoFacadeContainer.cs
index c9f41e75e7..76903a20b3 100644
--- a/osu.Game/Graphics/Containers/LogoFacadeContainer.cs
+++ b/osu.Game/Graphics/Containers/LogoFacadeContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Graphics.Containers
             startPosition = null;
         }
 
-        private Vector2 localSpaceConversion()
+        private Vector2 logoTrackingPosition()
         {
             Vector2 local;
             local.X = logo.Parent.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre).X / logo.Parent.RelativeToAbsoluteFactor.X;
@@ -62,8 +62,6 @@ namespace osu.Game.Graphics.Containers
             return local;
         }
 
-        private Vector2 logoTrackingPosition => logo.RelativePositionAxes == Axes.None ? logo.Parent.ToLocalSpace(LogoFacade.ScreenSpaceDrawQuad.Centre) : localSpaceConversion();
-
         protected override void Update()
         {
             base.Update();
@@ -74,7 +72,7 @@ namespace osu.Game.Graphics.Containers
             // Account for the scale of the actual logo container, as SizeForFlow only accounts for the sprite scale.
             LogoFacade.Size = new Vector2(logo.SizeForFlow * logo.Scale.X * facadeScale);
 
-            if (LogoFacade.Parent != null && logo.Position != logoTrackingPosition)
+            if (LogoFacade.Parent != null && logo.Position != logoTrackingPosition())
             {
                 // If this is our first update since tracking has started, initialize our starting values for interpolation
                 if (startTime == null || startPosition == null)
@@ -90,11 +88,11 @@ namespace osu.Game.Graphics.Containers
                     var mount = (float)Interpolation.ApplyEasing(easing, Math.Min(elapsedDuration / duration, 1));
 
                     // Interpolate the position of the logo, where mount 0 is where the logo was when it first began interpolating, and mount 1 is the target location.
-                    logo.Position = Vector2.Lerp(startPosition ?? throw new ArgumentNullException(nameof(startPosition)), logoTrackingPosition, mount);
+                    logo.Position = Vector2.Lerp(startPosition ?? throw new ArgumentNullException(nameof(startPosition)), logoTrackingPosition(), mount);
                 }
                 else
                 {
-                    logo.Position = logoTrackingPosition;
+                    logo.Position = logoTrackingPosition();
                 }
             }
         }
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 607700649d..f13dadf3dd 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -290,7 +290,6 @@ namespace osu.Game.Screens.Menu
                             break;
                         case ButtonSystemState.Initial:
                             logo.ClearTransforms(targetMember: nameof(Position));
-                            logo.RelativePositionAxes = Axes.None;
 
                             bool impact = logo.Scale.X > 0.6f;
 
@@ -311,7 +310,6 @@ namespace osu.Game.Screens.Menu
                             break;
                         default:
                             logo.ClearTransforms(targetMember: nameof(Position));
-                            logo.RelativePositionAxes = Axes.None;
                             logoFacadeContainer.Tracking = true;
                             logo.ScaleTo(0.5f, 200, Easing.OutQuint);
                             break;
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 19607129a0..2ba5bd81d1 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -175,7 +175,6 @@ namespace osu.Game.Screens.Play
             Scheduler.AddDelayed(() =>
             {
                 content.Tracking = true;
-                //logo.RelativePositionAxes = Axes.None;
             }, resuming ? 0 : 500);
         }