h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:02:59 +08:00
Code Issues Releases Wiki Activity

ScrollAlgorithm -> ScrollVisualisationMethod

Browse Source
This commit is contained in:
smoogipoo 2018-11-12 17:26:37 +09:00
parent 33056b8098
commit aee7a80e71
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.UI
protected override bool UserScrollSpeedAdjustment => false; protected override bool UserScrollSpeedAdjustment => false;
protected override ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Constant; protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation) public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation)
{ {

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Taiko.UI
protected override bool UserScrollSpeedAdjustment => false; protected override bool UserScrollSpeedAdjustment => false;
protected override ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Overlapping; protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
private readonly Container<HitExplosion> hitExplosionContainer; private readonly Container<HitExplosion> hitExplosionContainer;
private readonly Container<KiaiHitExplosion> kiaiExplosionContainer; private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;

2
osu.Game/Configuration/ScrollAlgorithm.cs → osu.Game/Configuration/ScrollVisualisationMethod.cs
View File

@ -5,7 +5,7 @@ using System.ComponentModel;
namespace osu.Game.Configuration namespace osu.Game.Configuration
{ {
public enum ScrollAlgorithm public enum ScrollVisualisationMethod
{ {
[Description("Sequential")] [Description("Sequential")]
Sequential, Sequential,

10
osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
View File

@ -35,22 +35,22 @@ namespace osu.Game.Rulesets.UI.Scrolling
private Cached initialStateCache = new Cached(); private Cached initialStateCache = new Cached();
public ScrollingHitObjectContainer(ScrollAlgorithm scrollAlgorithm) public ScrollingHitObjectContainer(ScrollVisualisationMethod visualisationMethod)
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
TimeRange.ValueChanged += _ => initialStateCache.Invalidate(); TimeRange.ValueChanged += _ => initialStateCache.Invalidate();
Direction.ValueChanged += _ => initialStateCache.Invalidate(); Direction.ValueChanged += _ => initialStateCache.Invalidate();
switch (scrollAlgorithm) switch (visualisationMethod)
{ {
case ScrollAlgorithm.Sequential: case ScrollVisualisationMethod.Sequential:
algorithm = new SequentialScrollAlgorithm(ControlPoints); algorithm = new SequentialScrollAlgorithm(ControlPoints);
break; break;
case ScrollAlgorithm.Overlapping: case ScrollVisualisationMethod.Overlapping:
algorithm = new OverlappingScrollAlgorithm(ControlPoints); algorithm = new OverlappingScrollAlgorithm(ControlPoints);
break; break;
case ScrollAlgorithm.Constant: case ScrollVisualisationMethod.Constant:
algorithm = new ConstantScrollAlgorithm(); algorithm = new ConstantScrollAlgorithm();
break; break;
} }

4
osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
View File

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
/// </summary> /// </summary>
protected readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>(); protected readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
protected virtual ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Sequential; protected virtual ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Sequential;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
protected sealed override HitObjectContainer CreateHitObjectContainer() protected sealed override HitObjectContainer CreateHitObjectContainer()
{ {
var container = new ScrollingHitObjectContainer(ScrollAlgorithm); var container = new ScrollingHitObjectContainer(VisualisationMethod);
container.Direction.BindTo(Direction); container.Direction.BindTo(Direction);
return container; return container;
} }