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

Make TestCaseTaikoPlayfield work again.

Browse Source
This commit is contained in:
smoogipooo 2017-08-09 16:19:20 +09:00
parent d83c218e08
commit 88cefa77bd
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
osu.Desktop.Tests/Visual/TestCaseTaikoPlayfield.cs
View File

@ -14,6 +14,9 @@ using osu.Game.Rulesets.Taiko.UI;
using OpenTK; using OpenTK;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Desktop.Tests.Beatmaps;
using System.Collections.Generic;
using osu.Game.Rulesets.Objects;
namespace osu.Desktop.Tests.Visual namespace osu.Desktop.Tests.Visual
{ {
@ -27,7 +30,7 @@ namespace osu.Desktop.Tests.Visual
protected override double TimePerAction => default_duration * 2; protected override double TimePerAction => default_duration * 2;
private readonly Random rng = new Random(1337); private readonly Random rng = new Random(1337);
private readonly TaikoPlayfield playfield; private readonly TaikoRulesetContainer rulesetContainer;
private readonly Container playfieldContainer; private readonly Container playfieldContainer;
public TestCaseTaikoPlayfield() public TestCaseTaikoPlayfield()
@ -51,7 +54,29 @@ namespace osu.Desktop.Tests.Visual
AddStep("Height test 5", () => changePlayfieldSize(5)); AddStep("Height test 5", () => changePlayfieldSize(5));
AddStep("Reset height", () => changePlayfieldSize(6)); AddStep("Reset height", () => changePlayfieldSize(6));
var rateAdjustClock = new StopwatchClock(true) { Rate = 1 }; var controlPointInfo = new ControlPointInfo();
controlPointInfo.TimingPoints.Add(new TimingControlPoint
{
BeatLength = 200
});
WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap
{
HitObjects = new List<HitObject> { new CentreHit() },
BeatmapInfo = new BeatmapInfo
{
Difficulty = new BeatmapDifficulty(),
Metadata = new BeatmapMetadata
{
Artist = @"Unknown",
Title = @"Sample Beatmap",
Author = @"peppy",
},
},
ControlPointInfo = controlPointInfo
});
var rateAdjustClock = new StopwatchClock(true) { Rate = 0.1 };
Add(playfieldContainer = new Container Add(playfieldContainer = new Container
{ {
@ -60,10 +85,7 @@ namespace osu.Desktop.Tests.Visual
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = TaikoPlayfield.DEFAULT_HEIGHT, Height = TaikoPlayfield.DEFAULT_HEIGHT,
Clock = new FramedClock(rateAdjustClock), Clock = new FramedClock(rateAdjustClock),
Children = new[] Children = new[] { rulesetContainer = new TaikoRulesetContainer(null, beatmap, true) }
{
playfield = new TaikoPlayfield()
}
}); });
} }
@ -128,18 +150,18 @@ namespace osu.Desktop.Tests.Visual
} }
}; };
playfield.OnJudgement(h); rulesetContainer.Playfield.OnJudgement(h);
if (RNG.Next(10) == 0) if (RNG.Next(10) == 0)
{ {
h.Judgement.SecondHit = true; h.Judgement.SecondHit = true;
playfield.OnJudgement(h); rulesetContainer.Playfield.OnJudgement(h);
} }
} }
private void addMissJudgement() private void addMissJudgement()
{ {
playfield.OnJudgement(new DrawableTestHit(new Hit()) rulesetContainer.Playfield.OnJudgement(new DrawableTestHit(new Hit())
{ {
Judgement = new TaikoJudgement Judgement = new TaikoJudgement
{ {
@ -151,16 +173,16 @@ namespace osu.Desktop.Tests.Visual
private void addBarLine(bool major, double delay = scroll_time) private void addBarLine(bool major, double delay = scroll_time)
{ {
BarLine bl = new BarLine { StartTime = playfield.Time.Current + delay }; BarLine bl = new BarLine { StartTime = rulesetContainer.Playfield.Time.Current + delay };
playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl)); rulesetContainer.Playfield.Add(major ? new DrawableBarLineMajor(bl) : new DrawableBarLine(bl));
} }
private void addSwell(double duration = default_duration) private void addSwell(double duration = default_duration)
{ {
playfield.Add(new DrawableSwell(new Swell rulesetContainer.Playfield.Add(new DrawableSwell(new Swell
{ {
StartTime = playfield.Time.Current + scroll_time, StartTime = rulesetContainer.Playfield.Time.Current + scroll_time,
Duration = duration, Duration = duration,
})); }));
} }
@ -172,40 +194,40 @@ namespace osu.Desktop.Tests.Visual
var d = new DrumRoll var d = new DrumRoll
{ {
StartTime = playfield.Time.Current + scroll_time, StartTime = rulesetContainer.Playfield.Time.Current + scroll_time,
IsStrong = strong, IsStrong = strong,
Duration = duration, Duration = duration,
}; };
playfield.Add(new DrawableDrumRoll(d)); rulesetContainer.Playfield.Add(new DrawableDrumRoll(d));
} }
private void addCentreHit(bool strong) private void addCentreHit(bool strong)
{ {
Hit h = new Hit Hit h = new Hit
{ {
StartTime = playfield.Time.Current + scroll_time, StartTime = rulesetContainer.Playfield.Time.Current + scroll_time,
IsStrong = strong IsStrong = strong
}; };
if (strong) if (strong)
playfield.Add(new DrawableCentreHitStrong(h)); rulesetContainer.Playfield.Add(new DrawableCentreHitStrong(h));
else else
playfield.Add(new DrawableCentreHit(h)); rulesetContainer.Playfield.Add(new DrawableCentreHit(h));
} }
private void addRimHit(bool strong) private void addRimHit(bool strong)
{ {
Hit h = new Hit Hit h = new Hit
{ {
StartTime = playfield.Time.Current + scroll_time, StartTime = rulesetContainer.Playfield.Time.Current + scroll_time,
IsStrong = strong IsStrong = strong
}; };
if (strong) if (strong)
playfield.Add(new DrawableRimHitStrong(h)); rulesetContainer.Playfield.Add(new DrawableRimHitStrong(h));
else else
playfield.Add(new DrawableRimHit(h)); rulesetContainer.Playfield.Add(new DrawableRimHit(h));
} }
private class DrawableTestHit : DrawableHitObject<TaikoHitObject, TaikoJudgement> private class DrawableTestHit : DrawableHitObject<TaikoHitObject, TaikoJudgement>