mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 00:53:22 +08:00
Give TestWorkingBeatmap a reference clock
This commit is contained in:
parent
805805020d
commit
f8033a3b35
@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
|
|||||||
Ruleset = new TaikoRuleset().RulesetInfo
|
Ruleset = new TaikoRuleset().RulesetInfo
|
||||||
},
|
},
|
||||||
ControlPointInfo = controlPointInfo
|
ControlPointInfo = controlPointInfo
|
||||||
});
|
}, Clock);
|
||||||
|
|
||||||
Add(playfieldContainer = new Container
|
Add(playfieldContainer = new Container
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
|
Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo, Clock);
|
||||||
Child = new ComposeScreen();
|
Child = new ComposeScreen();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Beatmap.Value = new TestWorkingBeatmap(testBeatmap);
|
Beatmap.Value = new TestWorkingBeatmap(testBeatmap, Clock);
|
||||||
|
|
||||||
Child = new TimingPointVisualiser(testBeatmap, 5000) { Clock = Clock };
|
Child = new TimingPointVisualiser(testBeatmap, 5000) { Clock = Clock };
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo);
|
Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo, Clock);
|
||||||
|
|
||||||
Add(new SummaryTimeline
|
Add(new SummaryTimeline
|
||||||
{
|
{
|
||||||
|
@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
Size = new Vector2(200,100)
|
Size = new Vector2(200,100)
|
||||||
};
|
};
|
||||||
|
|
||||||
Beatmap.Value = new TestWorkingBeatmap(new Beatmap());
|
Beatmap.Value = new TestWorkingBeatmap(new Beatmap(), Clock);
|
||||||
|
|
||||||
Child = playback;
|
Child = playback;
|
||||||
}
|
}
|
||||||
|
@ -1,29 +1,106 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
||||||
// See the LICENCE file in the repository root for full licence text.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
|
using System;
|
||||||
using osu.Framework.Audio.Track;
|
using osu.Framework.Audio.Track;
|
||||||
using osu.Framework.Graphics.Textures;
|
using osu.Framework.Graphics.Textures;
|
||||||
|
using osu.Framework.Timing;
|
||||||
using osu.Game.Beatmaps;
|
using osu.Game.Beatmaps;
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Beatmaps
|
namespace osu.Game.Tests.Beatmaps
|
||||||
{
|
{
|
||||||
public class TestWorkingBeatmap : WorkingBeatmap
|
public class TestWorkingBeatmap : WorkingBeatmap
|
||||||
{
|
{
|
||||||
public TestWorkingBeatmap(RulesetInfo ruleset)
|
private readonly TrackVirtualManual track;
|
||||||
: this(new TestBeatmap(ruleset))
|
private readonly IBeatmap beatmap;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Create an instance which creates a <see cref="TestBeatmap"/> for the provided ruleset when requested.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ruleset">The target ruleset.</param>
|
||||||
|
/// <param name="referenceClock">An optional clock which should be used instead of a stopwatch for virtual time progression.</param>
|
||||||
|
public TestWorkingBeatmap(RulesetInfo ruleset, IFrameBasedClock referenceClock)
|
||||||
|
: this(new TestBeatmap(ruleset), referenceClock)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public TestWorkingBeatmap(IBeatmap beatmap)
|
/// <summary>
|
||||||
|
/// Create an instance which provides the <see cref="IBeatmap"/> when requested.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="beatmap">The beatmap</param>
|
||||||
|
/// <param name="referenceClock">An optional clock which should be used instead of a stopwatch for virtual time progression.</param>
|
||||||
|
public TestWorkingBeatmap(IBeatmap beatmap, IFrameBasedClock referenceClock = null)
|
||||||
: base(beatmap.BeatmapInfo)
|
: base(beatmap.BeatmapInfo)
|
||||||
{
|
{
|
||||||
this.beatmap = beatmap;
|
this.beatmap = beatmap;
|
||||||
|
|
||||||
|
if (referenceClock != null)
|
||||||
|
track = new TrackVirtualManual(referenceClock);
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly IBeatmap beatmap;
|
|
||||||
protected override IBeatmap GetBeatmap() => beatmap;
|
protected override IBeatmap GetBeatmap() => beatmap;
|
||||||
protected override Texture GetBackground() => null;
|
protected override Texture GetBackground() => null;
|
||||||
protected override Track GetTrack() => null;
|
protected override Track GetTrack() => track;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A virtual track which tracks a reference clock.
|
||||||
|
/// </summary>
|
||||||
|
public class TrackVirtualManual : Track
|
||||||
|
{
|
||||||
|
private readonly IFrameBasedClock referenceClock;
|
||||||
|
private readonly ManualClock clock;
|
||||||
|
|
||||||
|
private bool running;
|
||||||
|
private double offset;
|
||||||
|
|
||||||
|
public TrackVirtualManual(IFrameBasedClock referenceClock)
|
||||||
|
{
|
||||||
|
this.referenceClock = referenceClock;
|
||||||
|
Length = double.PositiveInfinity;
|
||||||
|
clock = new ManualClock();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Seek(double seek)
|
||||||
|
{
|
||||||
|
offset = MathHelper.Clamp(seek, 0, Length) - referenceClock.CurrentTime;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Start()
|
||||||
|
{
|
||||||
|
running = true;
|
||||||
|
Seek(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Reset()
|
||||||
|
{
|
||||||
|
Seek(0);
|
||||||
|
base.Reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Stop()
|
||||||
|
{
|
||||||
|
running = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool IsRunning => running;
|
||||||
|
|
||||||
|
public override double CurrentTime => running ? clock.CurrentTime : 0;
|
||||||
|
|
||||||
|
protected override void UpdateState()
|
||||||
|
{
|
||||||
|
base.UpdateState();
|
||||||
|
|
||||||
|
clock.CurrentTime = Math.Min(referenceClock.CurrentTime + offset, Length);
|
||||||
|
|
||||||
|
if (CurrentTime >= Length)
|
||||||
|
{
|
||||||
|
Stop();
|
||||||
|
RaiseCompleted();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
[BackgroundDependencyLoader]
|
[BackgroundDependencyLoader]
|
||||||
private void load()
|
private void load()
|
||||||
{
|
{
|
||||||
Beatmap.Value = new TestWorkingBeatmap(ruleset.RulesetInfo);
|
Beatmap.Value = new TestWorkingBeatmap(ruleset.RulesetInfo, Clock);
|
||||||
|
|
||||||
LoadComponentAsync(new Editor(), LoadScreen);
|
LoadComponentAsync(new Editor(), LoadScreen);
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ namespace osu.Game.Tests.Visual
|
|||||||
private Player loadPlayerFor(Ruleset r)
|
private Player loadPlayerFor(Ruleset r)
|
||||||
{
|
{
|
||||||
var beatmap = CreateBeatmap(r);
|
var beatmap = CreateBeatmap(r);
|
||||||
var working = new TestWorkingBeatmap(beatmap);
|
var working = new TestWorkingBeatmap(beatmap, Clock);
|
||||||
|
|
||||||
workingWeakReferences.Add(working);
|
workingWeakReferences.Add(working);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user