diff --git a/osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs b/osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs index 07f59fe876..cc12c3ca61 100644 --- a/osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs +++ b/osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs @@ -46,12 +46,7 @@ namespace osu.Desktop.Tests.Visual BeatmapInfo = new BeatmapInfo { Difficulty = new BeatmapDifficulty(), - Metadata = new BeatmapMetadata - { - Artist = @"Unknown", - Title = @"Sample Beatmap", - Author = @"peppy", - } + Metadata = new BeatmapMetadata() } }; @@ -60,7 +55,7 @@ namespace osu.Desktop.Tests.Visual Add(new TestHitRenderer(beatmap, true)); } - private class TestHitRenderer : SpeedAdjustedHitRenderer + private class TestHitRenderer : ScrollingHitRenderer { public TestHitRenderer(WorkingBeatmap beatmap, bool isForCurrentRuleset) : base(beatmap, isForCurrentRuleset) diff --git a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs index a34765448c..65be8a4e88 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs @@ -30,7 +30,7 @@ using osu.Game.Rulesets.UI; namespace osu.Game.Rulesets.Mania.UI { - public class ManiaHitRenderer : SpeedAdjustedHitRenderer + public class ManiaHitRenderer : ScrollingHitRenderer { /// /// Preferred column count. This will only have an effect during the initialization of the play field. diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableScrollingHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableScrollingHitObject.cs index ec206928b2..6861f15c40 100644 --- a/osu.Game/Rulesets/Objects/Drawables/DrawableScrollingHitObject.cs +++ b/osu.Game/Rulesets/Objects/Drawables/DrawableScrollingHitObject.cs @@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Objects.Drawables { /// /// A basic class that overrides and implements . + /// This object does not need to have its set to be able to scroll, as this will + /// will be set by the scrolling container that contains it. /// public abstract class DrawableScrollingHitObject : DrawableHitObject, IScrollingHitObject where TObject : HitObject diff --git a/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs b/osu.Game/Rulesets/UI/ScrollingHitRenderer.cs similarity index 93% rename from osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs rename to osu.Game/Rulesets/UI/ScrollingHitRenderer.cs index 5f8bebc213..ee549f5223 100644 --- a/osu.Game/Rulesets/UI/SpeedAdjustedHitRenderer.cs +++ b/osu.Game/Rulesets/UI/ScrollingHitRenderer.cs @@ -20,14 +20,14 @@ namespace osu.Game.Rulesets.UI /// A type of that exposes s to be used /// in s. /// - public abstract class SpeedAdjustedHitRenderer : HitRenderer + public abstract class ScrollingHitRenderer : HitRenderer where TObject : HitObject where TJudgement : Judgement where TPlayfield : ScrollingPlayfield { protected readonly SortedList DefaultControlPoints = new SortedList(Comparer.Default); - protected SpeedAdjustedHitRenderer(WorkingBeatmap beatmap, bool isForCurrentRuleset) + protected ScrollingHitRenderer(WorkingBeatmap beatmap, bool isForCurrentRuleset) : base(beatmap, isForCurrentRuleset) { } diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 342a02ba60..b200d55ade 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -339,7 +339,7 @@ - +