RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-24 14:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TrackVirtualManual not respecting rate adjustments

Browse Source
This commit is contained in:
smoogipoo 2020-03-03 12:59:41 +09:00
parent 1e26df64b6
commit a1aecd4c39
1 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -229,17 +229,10 @@ namespace osu.Game.Tests.Visual
/// </summary>
public class TrackVirtualManual : Track
{
private readonly StopwatchClock stopwatchClock = new StopwatchClock();
private readonly IFrameBasedClock referenceClock;
private readonly ManualClock clock = new ManualClock();
private bool running;
/// <summary>
/// Local offset added to the reference clock to resolve correct time.
/// </summary>
private double offset;
public TrackVirtualManual(IFrameBasedClock referenceClock)
{
this.referenceClock = referenceClock;
@ -248,60 +241,32 @@ namespace osu.Game.Tests.Visual
public override bool Seek(double seek)
{
offset = Math.Clamp(seek, 0, Length);
lastReferenceTime = null;
var offset = Math.Clamp(seek, 0, Length);
stopwatchClock.Seek(offset);
return offset == seek;
}
public override void Start()
{
running = true;
}
public override void Start() => stopwatchClock.Start();
public override void Reset()
{
Seek(0);
stopwatchClock.Seek(0);
base.Reset();
}
public override void Stop()
{
if (running)
{
running = false;
// on stopping, the current value should be transferred out of the clock, as we can no longer rely on
// the referenceClock (which will still be counting time).
offset = clock.CurrentTime;
lastReferenceTime = null;
}
}
public override void Stop() => stopwatchClock.Stop();
public override bool IsRunning => running;
public override bool IsRunning => stopwatchClock.IsRunning;
private double? lastReferenceTime;
public override double CurrentTime => clock.CurrentTime;
public override double CurrentTime => stopwatchClock.CurrentTime;
protected override void UpdateState()
{
base.UpdateState();
if (running)
{
double refTime = referenceClock.CurrentTime;
if (!lastReferenceTime.HasValue)
{
// if the clock just started running, the current value should be transferred to the offset
// (to zero the progression of time).
offset -= refTime;
}
lastReferenceTime = refTime;
}
clock.CurrentTime = Math.Min((lastReferenceTime ?? 0) + offset, Length);
stopwatchClock.Rate = Rate * referenceClock.Rate;
if (CurrentTime >= Length)
{