Make IScrollingInfo and store direction as bindable

osu.Game.Rulesets.Mania.Tests/ScrollingTestContainer.cs

@@ -2,28 +2,36 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Tests
 {
     /// <summary>
-    /// A container which provides a <see cref="ScrollingInfo"/> to children.
+    /// A container which provides a <see cref="IScrollingInfo"/> to children.
     /// </summary>
     public class ScrollingTestContainer : Container
     {
-        private readonly ScrollingInfo scrollingInfo;
+        private readonly ScrollingDirection direction;
 
-        public ScrollingTestContainer(ScrollingInfo scrollingInfo)
+        public ScrollingTestContainer(ScrollingDirection direction)
         {
-            this.scrollingInfo = scrollingInfo;
+            this.direction = direction;
         }
 
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
-            dependencies.Cache(scrollingInfo);
+            dependencies.CacheAs<IScrollingInfo>(new ScrollingInfo { Direction = { Value = direction }});
             return dependencies;
         }
+
+        private class ScrollingInfo : IScrollingInfo
+        {
+            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
+        }
     }
 }

osu.Game.Rulesets.Mania.Tests/TestCaseColumn.cs

@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Mania.Tests
 
             columns.Add(column);
 
-            return new ScrollingTestContainer(new ScrollingInfo(direction))
+            return new ScrollingTestContainer(direction)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

osu.Game.Rulesets.Mania.Tests/TestCaseNotes.cs

@@ -15,7 +15,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI.Scrolling;
@@ -59,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             var note = new Note { StartTime = 999999999 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            return new ScrollingTestContainer(new ScrollingInfo(direction))
+            return new ScrollingTestContainer(direction)
             {
                 AutoSizeAxes = Axes.Both,
                 Child = new NoteContainer(direction, $"note, scrolling {direction.ToString().ToLower()}")
@@ -74,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             var note = new HoldNote { StartTime = 999999999, Duration = 1000 };
             note.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
 
-            return new ScrollingTestContainer(new ScrollingInfo(direction))
+            return new ScrollingTestContainer(direction)
             {
                 AutoSizeAxes = Axes.Both,
                 Child = new NoteContainer(direction, $"hold note, scrolling {direction.ToString().ToLower()}")

osu.Game.Rulesets.Mania.Tests/TestCaseStage.cs

@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         {
             var specialAction = ManiaAction.Special1;
 
-            return new ScrollingTestContainer(new ScrollingInfo(direction))
+            return new ScrollingTestContainer(direction)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
@@ -10,7 +9,6 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 
@@ -38,8 +36,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         /// </summary>
         private bool hasBroken;
 
-        private ScrollingInfo scrollingInfo;
-
         private readonly Container<DrawableHoldNoteTick> tickContainer;
 
         public DrawableHoldNote(HoldNote hitObject, ManiaAction action)
@@ -80,12 +76,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             AddNested(tail);
         }
 
-        [BackgroundDependencyLoader]
+        protected override void OnDirectionChanged(ScrollingDirection direction)
-        private void load(ScrollingInfo scrollingInfo)
         {
-            this.scrollingInfo = scrollingInfo;
+            base.OnDirectionChanged(direction);
 
-            bodyPiece.Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            bodyPiece.Anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
             bodyPiece.Origin = bodyPiece.Anchor;
         }
 
@@ -114,7 +109,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             base.Update();
 
             // Make the body piece not lie under the head note
-            bodyPiece.Y = (scrollingInfo.Direction == ScrollingDirection.Up ? 1 : -1) * head.Height / 2;
+            bodyPiece.Y = (Direction.Value == ScrollingDirection.Up ? 1 : -1) * head.Height / 2;
             bodyPiece.Height = DrawHeight - head.Height / 2 + tail.Height / 2;
         }
 

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -19,6 +20,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
 
         public new TObject HitObject;
 
+        protected readonly IBindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+
         protected DrawableManiaHitObject(TObject hitObject, ManiaAction? action = null)
             : base(hitObject)
         {
@@ -29,9 +32,15 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         }
 
         [BackgroundDependencyLoader]
-        private void load(ScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo)
         {
-            Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            Direction.BindTo(scrollingInfo.Direction);
+            Direction.BindValueChanged(OnDirectionChanged, true);
+        }
+
+        protected virtual void OnDirectionChanged(ScrollingDirection direction)
+        {
+            Anchor = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
             Origin = Anchor;
         }
 

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
@@ -9,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
-using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI.Scrolling;
 
@@ -34,10 +32,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             InternalChild = headPiece = new NotePiece();
         }
 
-        [BackgroundDependencyLoader]
+        protected override void OnDirectionChanged(ScrollingDirection direction)
-        private void load(ScrollingInfo scrollingInfo)
         {
-            headPiece.Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            base.OnDirectionChanged(direction);
+
+            headPiece.Anchor = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
             headPiece.Origin = headPiece.Anchor;
         }
 

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -21,6 +22,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
         public const float NOTE_HEIGHT = 10;
         private const float head_colour_height = 6;
 
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
         private readonly Box colouredBox;
 
         public NotePiece()
@@ -36,8 +39,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                 },
                 colouredBox = new Box
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.X,
                     Height = head_colour_height,
                     Alpha = 0.2f
@@ -46,10 +47,14 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
         }
 
         [BackgroundDependencyLoader]
-        private void load(ScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo)
         {
-            colouredBox.Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+            direction.BindTo(scrollingInfo.Direction);
-            colouredBox.Origin = colouredBox.Anchor;
+            direction.BindValueChanged(direction =>
+            {
+                colouredBox.Anchor = direction == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre;
+                colouredBox.Origin = colouredBox.Anchor;
+            }, true);
         }
 
         private Color4 accentColour;

osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -21,13 +22,11 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         private Box background;
         private Box backgroundOverlay;
 
-        private ScrollingInfo scrollingInfo;
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         [BackgroundDependencyLoader]
-        private void load(ScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo)
         {
-            this.scrollingInfo = scrollingInfo;
-
             InternalChildren = new[]
             {
                 background = new Box
@@ -41,12 +40,18 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     Name = "Background Gradient Overlay",
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.5f,
-                    Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
-                    Origin = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
                     Blending = BlendingMode.Additive,
                     Alpha = 0
                 }
             };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                backgroundOverlay.Anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                backgroundOverlay.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                updateColours();
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -81,8 +86,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             var dimPoint = AccentColour.Opacity(0);
 
             backgroundOverlay.Colour = ColourInfo.GradientVertical(
-                scrollingInfo.Direction == ScrollingDirection.Up ? brightPoint : dimPoint,
+                direction.Value == ScrollingDirection.Up ? brightPoint : dimPoint,
-                scrollingInfo.Direction == ScrollingDirection.Up ? dimPoint : brightPoint);
+                direction.Value == ScrollingDirection.Up ? dimPoint : brightPoint);
         }
 
         public bool OnPressed(ManiaAction action)

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,25 +21,25 @@ namespace osu.Game.Rulesets.Mania.UI.Components
         private Container<Drawable> content;
         protected override Container<Drawable> Content => content;
 
-        private Container hitTargetBar;
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
+        private Container hitTargetLine;
 
         [BackgroundDependencyLoader]
-        private void load(ScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo)
         {
-            InternalChildren = new Drawable[]
+            Drawable hitTargetBar;
+
+            InternalChildren = new[]
             {
-                new Box
+                hitTargetBar = new Box
                 {
-                    Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
-                    Origin = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
                     Height = hit_target_height,
                     Colour = Color4.Black
                 },
-                hitTargetBar = new Container
+                hitTargetLine = new Container
                 {
-                    Anchor = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
-                    Origin = scrollingInfo.Direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
                     RelativeSizeAxes = Axes.X,
                     Height = hit_target_bar_height,
                     Masking = true,
@@ -50,6 +51,15 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     RelativeSizeAxes = Axes.Both,
                 },
             };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                hitTargetBar.Anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                hitTargetBar.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                hitTargetLine.Anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+                hitTargetLine.Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft;
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -78,7 +88,7 @@ namespace osu.Game.Rulesets.Mania.UI.Components
             if (!IsLoaded)
                 return;
 
-            hitTargetBar.EdgeEffect = new EdgeEffectParameters
+            hitTargetLine.EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Radius = 5,

osu.Game.Rulesets.Mania/UI/Components/ColumnKeyArea.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -22,20 +23,21 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         public ManiaAction Action;
 
+        private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
+
         private Container keyIcon;
 
         [BackgroundDependencyLoader]
-        private void load(ScrollingInfo scrollingInfo)
+        private void load(IScrollingInfo scrollingInfo)
         {
-            InternalChildren = new Drawable[]
+            Drawable gradient;
+
+            InternalChildren = new[]
             {
-                new Box
+                gradient = new Box
                 {
                     Name = "Key gradient",
                     RelativeSizeAxes = Axes.Both,
-                    Colour = ColourInfo.GradientVertical(
-                        scrollingInfo.Direction == ScrollingDirection.Up ? Color4.Black : Color4.Black.Opacity(0),
-                        scrollingInfo.Direction == ScrollingDirection.Up ? Color4.Black.Opacity(0) : Color4.Black),
                     Alpha = 0.5f
                 },
                 keyIcon = new Container
@@ -59,6 +61,14 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     }
                 }
             };
+
+            direction.BindTo(scrollingInfo.Direction);
+            direction.BindValueChanged(direction =>
+            {
+                gradient.Colour = ColourInfo.GradientVertical(
+                    direction == ScrollingDirection.Up ? Color4.Black : Color4.Black.Opacity(0),
+                    direction == ScrollingDirection.Up ? Color4.Black.Opacity(0) : Color4.Black);
+            }, true);
         }
 
         protected override void LoadComplete()

osu.Game.Rulesets.Mania/UI/IScrollinginfo.cs

@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Configuration;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public interface IScrollingInfo
+    {
+        /// <summary>
+        /// The direction <see cref="HitObject"/>s should scroll in.
+        /// </summary>
+        IBindable<ScrollingDirection> Direction { get; }
+    }
+}

osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
@@ -81,8 +82,9 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
 
-            scrollingInfo = new ScrollingInfo(ScrollingDirection.Up);
+            scrollingInfo = new ScrollingInfo { Direction = { Value = ScrollingDirection.Up } };
-            dependencies.Cache(scrollingInfo);
+
+            dependencies.CacheAs<IScrollingInfo>(scrollingInfo);
 
             return dependencies;
         }
@@ -119,5 +121,11 @@ namespace osu.Game.Rulesets.Mania.UI
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
 
         protected override IRulesetConfigManager CreateConfig(Ruleset ruleset, SettingsStore settings) => new ManiaConfigManager(settings, Ruleset.RulesetInfo, Variant);
+
+        private class ScrollingInfo : IScrollingInfo
+        {
+            public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
+            IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
+        }
     }
 }

osu.Game.Rulesets.Mania/UI/ScrollingInfo.cs

@@ -1,17 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.UI.Scrolling;
-
-namespace osu.Game.Rulesets.Mania.UI
-{
-    public class ScrollingInfo
-    {
-        public readonly ScrollingDirection Direction;
-
-        public ScrollingInfo(ScrollingDirection direction)
-        {
-            Direction = direction;
-        }
-    }
-}