Merge pull request #373 from Jorolf/MoreOptions

Enable Parallax Option

osu.Game/Configuration/OsuConfigManager.cs

@@ -31,6 +31,7 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.SnakingInSliders, true);
             Set(OsuConfig.SnakingOutSliders, false);
 
+            Set(OsuConfig.MenuParallax, true);
             //todo: implement all settings below this line (remove the Disabled set when doing so).
 
             Set(OsuConfig.MouseSpeed, 1.0).Disabled = true;
@@ -143,7 +144,6 @@ protected override void InitialiseDefaults()
             Set(OsuConfig.DetectPerformanceIssues, true).Disabled = true;
             Set(OsuConfig.MenuMusic, true).Disabled = true;
             Set(OsuConfig.MenuVoice, true).Disabled = true;
-            Set(OsuConfig.MenuParallax, true).Disabled = true;
             Set(OsuConfig.RawInput, false).Disabled = true;
             Set(OsuConfig.AbsoluteToOsuWindow, Get<bool>(OsuConfig.RawInput)).Disabled = true;
             Set(OsuConfig.ShowMenuTips, true).Disabled = true;

osu.Game/Graphics/Containers/ParallaxContainer.cs

@@ -8,6 +8,8 @@
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Transformations;
+using osu.Game.Configuration;
+using osu.Framework.Configuration;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -15,6 +17,8 @@ class ParallaxContainer : Container
     {
         public float ParallaxAmount = 0.02f;
 
+        private Bindable<bool> parallaxEnabled;
+
         public override bool Contains(Vector2 screenSpacePos) => true;
 
         public ParallaxContainer()
@@ -34,9 +38,18 @@ public ParallaxContainer()
         protected override Container<Drawable> Content => content;
 
         [BackgroundDependencyLoader]
-        private void load(UserInputManager input)
+        private void load(UserInputManager input, OsuConfigManager config)
         {
             this.input = input;
+            parallaxEnabled = config.GetBindable<bool>(OsuConfig.MenuParallax);
+            parallaxEnabled.ValueChanged += delegate
+            {
+                if (!parallaxEnabled)
+                {
+                    content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
+                    content.Scale = new Vector2(1 + ParallaxAmount);
+                }
+            };
         }
 
         bool firstUpdate = true;
@@ -45,9 +58,12 @@ protected override void Update()
         {
             base.Update();
 
+            if (parallaxEnabled) 
+            { 
                 Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2;
                 content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
                 content.Scale = new Vector2(1 + ParallaxAmount);
+            }
 
             firstUpdate = false;
         }

osu.Game/Screens/Menu/MainMenu.cs

@@ -59,7 +59,6 @@ private void load(OsuGame game)
             background.Preload(game);
 
             buttons.OnSettings = game.ToggleOptions;
-
         }
 
         protected override void OnEntering(Screen last)