From 044e4d0acddffaffc1055f9042eaacea365e4b0b Mon Sep 17 00:00:00 2001
From: ColdVolcano <mineflamecraft@hotmail.com>
Date: Mon, 25 Dec 2017 19:11:49 -0600
Subject: [PATCH] Add blur to background in Player

---
 osu.Game/Configuration/OsuConfigManager.cs    |  2 ++
 .../Sections/Gameplay/GeneralSettings.cs      |  6 ++++++
 osu.Game/Screens/Play/Player.cs               | 20 ++++++++++++-------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index f4c7bdb586..d359a0a2d6 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Configuration
 
             // Gameplay
             Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01);
+            Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
 
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.KeyOverlay, false);
@@ -90,6 +91,7 @@ namespace osu.Game.Configuration
         GameplayCursorSize,
         AutoCursorSize,
         DimLevel,
+        BlurLevel,
         ShowStoryboard,
         KeyOverlay,
         FloatingComments,
diff --git a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
index 8ec6af5cd0..95d127a55f 100644
--- a/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
@@ -22,6 +22,12 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                     Bindable = config.GetBindable<double>(OsuSetting.DimLevel),
                     KeyboardStep = 0.1f
                 },
+                new SettingsSlider<double>
+                {
+                    LabelText = "Background blur",
+                    Bindable = config.GetBindable<double>(OsuSetting.BlurLevel),
+                    KeyboardStep = 0.1f
+                }, 
                 new SettingsCheckbox
                 {
                     LabelText = "Show score overlay",
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 340fc39d52..8430acbc73 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -65,6 +65,7 @@ namespace osu.Game.Screens.Play
         #region User Settings
 
         private Bindable<double> dimLevel;
+        private Bindable<double> blurLevel;
         private Bindable<bool> showStoryboard;
         private Bindable<bool> mouseWheelDisabled;
         private Bindable<double> userAudioOffset;
@@ -74,7 +75,7 @@ namespace osu.Game.Screens.Play
         #endregion
 
         private BreakOverlay breakOverlay;
-        private Container storyboardContainer;
+        private BufferedContainer storyboardContainer;
         private DrawableStoryboard storyboard;
 
         private HUDOverlay hudOverlay;
@@ -88,6 +89,7 @@ namespace osu.Game.Screens.Play
             this.api = api;
 
             dimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
+            blurLevel = config.GetBindable<double>(OsuSetting.BlurLevel);
             showStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
 
             mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
@@ -147,7 +149,7 @@ namespace osu.Game.Screens.Play
 
             Children = new Drawable[]
             {
-                storyboardContainer = new Container
+                storyboardContainer = new BufferedContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Clock = offsetClock,
@@ -309,9 +311,9 @@ namespace osu.Game.Screens.Play
             if (!loadedSuccessfully)
                 return;
 
-            (Background as BackgroundScreenBeatmap)?.BlurTo(Vector2.Zero, 1000, Easing.OutQuint);
+            dimLevel.ValueChanged += backgroundLevel_ValueChanged;
+            blurLevel.ValueChanged += backgroundLevel_ValueChanged;
 
-            dimLevel.ValueChanged += dimLevel_ValueChanged;
             showStoryboard.ValueChanged += showStoryboard_ValueChanged;
             updateBackgroundElements();
 
@@ -368,7 +370,7 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        private void dimLevel_ValueChanged(double newValue)
+        private void backgroundLevel_ValueChanged(double newValue)
             => updateBackgroundElements();
 
         private void showStoryboard_ValueChanged(bool newValue)
@@ -377,6 +379,7 @@ namespace osu.Game.Screens.Play
         private void updateBackgroundElements()
         {
             var opacity = 1 - (float)dimLevel;
+            var blur = new Vector2((float)blurLevel.Value * 25);
 
             if (showStoryboard && storyboard == null)
                 initializeStoryboard(true);
@@ -385,14 +388,17 @@ namespace osu.Game.Screens.Play
             var storyboardVisible = showStoryboard && beatmap.Storyboard.HasDrawable;
 
             storyboardContainer.FadeColour(new Color4(opacity, opacity, opacity, 1), 800);
-            storyboardContainer.FadeTo(storyboardVisible && opacity > 0 ? 1 : 0);
+            storyboardContainer.FadeTo(storyboardVisible && opacity > 0 ? 1 : 0, 800, Easing.OutQuint);
+            storyboardContainer.BlurTo(blur, 800, Easing.OutQuint);
 
             Background?.FadeTo(!storyboardVisible || beatmap.Background == null ? opacity : 0, 800, Easing.OutQuint);
+            (Background as BackgroundScreenBeatmap)?.BlurTo(blur, 800, Easing.OutQuint);
         }
 
         private void fadeOut()
         {
-            dimLevel.ValueChanged -= dimLevel_ValueChanged;
+            dimLevel.ValueChanged -= backgroundLevel_ValueChanged;
+            blurLevel.ValueChanged -= backgroundLevel_ValueChanged;
             showStoryboard.ValueChanged -= showStoryboard_ValueChanged;
 
             const float fade_out_duration = 250;