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

Fix post-rebase issues

Browse Source
This commit is contained in:
smoogipoo 2018-11-12 17:36:19 +09:00
parent 10543cf1b6
commit d8e7ad8241
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.UI
{
public class CatchRulesetContainer : ScrollingRulesetContainer<CatchPlayfield, CatchHitObject>
{
protected override ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Constant;
protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Constant;
protected override bool UserScrollSpeedAdjustment => false;

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

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Taiko.UI
{
public class TaikoRulesetContainer : ScrollingRulesetContainer<TaikoPlayfield, TaikoHitObject>
{
protected override ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Overlapping;
protected override ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Overlapping;
protected override bool UserScrollSpeedAdjustment => false;

8
osu.Game.Tests/Visual/TestCaseScrollingHitObjects.cs
View File

@ -62,9 +62,9 @@ namespace osu.Game.Tests.Visual
}
});
AddStep("Constant scroll", () => setScrollAlgorithm(ScrollAlgorithm.Constant));
AddStep("Overlapping scroll", () => setScrollAlgorithm(ScrollAlgorithm.Overlapping));
AddStep("Sequential scroll", () => setScrollAlgorithm(ScrollAlgorithm.Sequential));
AddStep("Constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
AddStep("Overlapping scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Overlapping));
AddStep("Sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
AddSliderStep("Time range", 100, 10000, 5000, v => scrollContainers.ForEach(c => c.TimeRange = v));
AddStep("Add control point", () => addControlPoint(Time.Current + 5000));
@ -136,7 +136,7 @@ namespace osu.Game.Tests.Visual
}
}
private void setScrollAlgorithm(ScrollAlgorithm algorithm) => scrollContainers.ForEach(c => c.ScrollAlgorithm = algorithm);
private void setScrollAlgorithm(ScrollVisualisationMethod algorithm) => scrollContainers.ForEach(c => c.ScrollAlgorithm = algorithm);
private class TestPlayfield : ScrollingPlayfield
{

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

@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
MaxValue = time_span_max
};
protected virtual ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Sequential;
protected virtual ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Sequential;
/// <summary>
/// Whether the player can change <see cref="VisibleTimeRange"/>.
@ -87,15 +87,15 @@ namespace osu.Game.Rulesets.UI.Scrolling
scrollingInfo.Direction.BindTo(Direction);
scrollingInfo.TimeRange.BindTo(TimeRange);
switch (ScrollAlgorithm)
switch (VisualisationMethod)
{
case ScrollAlgorithm.Sequential:
case ScrollVisualisationMethod.Sequential:
scrollingInfo.Algorithm = new SequentialScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Overlapping:
case ScrollVisualisationMethod.Overlapping:
scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Constant:
case ScrollVisualisationMethod.Constant:
scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
break;
}

12
osu.Game/Tests/Visual/ScrollingTestContainer.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual
{
public SortedList<MultiplierControlPoint> ControlPoints => scrollingInfo.Algorithm.ControlPoints;
public ScrollAlgorithm ScrollAlgorithm { set => scrollingInfo.Algorithm.Algorithm = value; }
public ScrollVisualisationMethod ScrollAlgorithm { set => scrollingInfo.Algorithm.Algorithm = value; }
public double TimeRange { set => scrollingInfo.TimeRange.Value = value; }
@ -54,22 +54,22 @@ namespace osu.Game.Tests.Visual
public TestScrollAlgorithm()
{
Algorithm = ScrollAlgorithm.Constant;
Algorithm = ScrollVisualisationMethod.Constant;
}
public ScrollAlgorithm Algorithm
public ScrollVisualisationMethod Algorithm
{
set
{
switch (value)
{
case ScrollAlgorithm.Constant:
case ScrollVisualisationMethod.Constant:
implementation = new ConstantScrollAlgorithm();
break;
case ScrollAlgorithm.Overlapping:
case ScrollVisualisationMethod.Overlapping:
implementation = new OverlappingScrollAlgorithm(ControlPoints);
break;
case ScrollAlgorithm.Sequential:
case ScrollVisualisationMethod.Sequential:
implementation = new SequentialScrollAlgorithm(ControlPoints);
break;
}