From dd6cf1379e279307bb384c99ef8754c2311b6216 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Feb 2018 11:42:28 +0900
Subject: [PATCH] Reduce parallax effect during gameplay

This also cleans up some shared code in OsuScreen.
---
 .../Graphics/Containers/ParallaxContainer.cs  |  4 ++-
 osu.Game/Screens/OsuScreen.cs                 | 27 ++++++++++++++-----
 osu.Game/Screens/Play/Player.cs               |  2 ++
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index cb894ca382..9a61feb7c1 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -13,7 +13,9 @@ namespace osu.Game.Graphics.Containers
 {
     public class ParallaxContainer : Container, IRequireHighFrequencyMousePosition
     {
-        public float ParallaxAmount = 0.02f;
+        public const float DEFAULT_PARALLAX_AMOUNT = 0.02f;
+
+        public float ParallaxAmount = DEFAULT_PARALLAX_AMOUNT;
 
         private Bindable<bool> parallaxEnabled;
 
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index a2d41dc206..8f4e08d4a2 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -52,6 +52,10 @@ namespace osu.Game.Screens
 
         protected readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
+        protected virtual float BackgroundParallaxAmount => 1;
+
+        private ParallaxContainer backgroundParallaxContainer;
+
         public WorkingBeatmap InitialBeatmap
         {
             set
@@ -102,11 +106,10 @@ namespace osu.Game.Screens
 
         protected override void OnResuming(Screen last)
         {
-            base.OnResuming(last);
-            logo.AppendAnimatingAction(() => LogoArriving(logo, true), true);
             sampleExit?.Play();
+            applyArrivingDefaults(true);
 
-            ShowOverlays.Value = ShowOverlaysOnEnter;
+            base.OnResuming(last);
         }
 
         protected override void OnSuspending(Screen next)
@@ -123,6 +126,8 @@ namespace osu.Game.Screens
 
             if (lastOsu?.Background != null)
             {
+                backgroundParallaxContainer = lastOsu.backgroundParallaxContainer;
+
                 if (bg == null || lastOsu.Background.Equals(bg))
                     //we can keep the previous mode's background.
                     Background = lastOsu.Background;
@@ -136,7 +141,7 @@ namespace osu.Game.Screens
                 // this makes up for the fact our padding changes when the global toolbar is visible.
                 bg.Scale = new Vector2(1.06f);
 
-                AddInternal(new ParallaxContainer
+                AddInternal(backgroundParallaxContainer = new ParallaxContainer
                 {
                     Depth = float.MaxValue,
                     Children = new[]
@@ -149,11 +154,9 @@ namespace osu.Game.Screens
             if ((logo = lastOsu?.logo) == null)
                 LoadComponentAsync(logo = new OsuLogo { Alpha = 0 }, AddInternal);
 
-            logo.AppendAnimatingAction(() => LogoArriving(logo, false), true);
+            applyArrivingDefaults(false);
 
             base.OnEntering(last);
-
-            ShowOverlays.Value = ShowOverlaysOnEnter;
         }
 
         protected override bool OnExiting(Screen next)
@@ -193,6 +196,16 @@ namespace osu.Game.Screens
             logo.Ripple = true;
         }
 
+        private void applyArrivingDefaults(bool isResuming)
+        {
+            logo.AppendAnimatingAction(() => LogoArriving(logo, isResuming), true);
+
+            if (backgroundParallaxContainer != null)
+                backgroundParallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * BackgroundParallaxAmount;
+
+            ShowOverlays.Value = ShowOverlaysOnEnter;
+        }
+
         private void onExitingLogo()
         {
             logo.AppendAnimatingAction(() => { LogoExiting(logo); }, false);
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 4954618ef9..9a11f57754 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Screens.Play
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap);
 
+        protected override float BackgroundParallaxAmount => 0.1f;
+
         public override bool ShowOverlaysOnEnter => false;
 
         public Action RestartRequested;