sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move ScrollAlgorithm inside IScrollingInfo

Browse Source
This commit is contained in:
smoogipoo
2018-11-07 16:51:28 +09:00
parent 54668a0dec
commit e7969ecec7
5 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Rulesets/UI/Scrolling/ScrollingRulesetContainer.cs
View File

@ -35,30 +35,29 @@ namespace osu.Game.Rulesets.UI.Scrolling
/// <returns></returns>
private readonly SortedList<MultiplierControlPoint> controlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
[Cached(Type = typeof(IScrollingInfo))]
protected readonly IScrollingInfo ScrollingInfo;
protected IScrollingInfo ScrollingInfo => scrollingInfo;
[Cached(Type = typeof(IScrollAlgorithm))]
private readonly IScrollAlgorithm algorithm;
[Cached(Type = typeof(IScrollingInfo))]
private readonly LocalScrollingInfo scrollingInfo;
protected ScrollingRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
: base(ruleset, beatmap)
{
scrollingInfo = new LocalScrollingInfo();
scrollingInfo.Direction.BindTo(Direction);
switch (ScrollAlgorithm)
{
case ScrollAlgorithm.Sequential:
algorithm = new SequentialScrollAlgorithm(controlPoints);
scrollingInfo.Algorithm = new SequentialScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Overlapping:
algorithm = new OverlappingScrollAlgorithm(controlPoints);
scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Constant:
algorithm = new ConstantScrollAlgorithm();
scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
break;
}
ScrollingInfo = CreateScrollingInfo();
ScrollingInfo.Direction.BindTo(Direction);
}
[BackgroundDependencyLoader]
@ -109,11 +108,11 @@ namespace osu.Game.Rulesets.UI.Scrolling
controlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier });
}
protected virtual IScrollingInfo CreateScrollingInfo() => new LocalScrollingInfo();
private class LocalScrollingInfo : IScrollingInfo
{
public IBindable<ScrollingDirection> Direction { get; } = new Bindable<ScrollingDirection>();
public IScrollAlgorithm Algorithm { get; set; }
}
}
}