RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Track time in a simpler way in TrackVirtualManual

This commit is contained in:
Dean Herbert 2020-03-06 01:28:59 +09:00
parent 583e2c3f4a
commit e3509c742c
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,10 +229,10 @@ public Track GetVirtual(double length = double.PositiveInfinity)
/// </summary>
public class TrackVirtualManual : Track
{
private readonly StopwatchClock stopwatchClock = new StopwatchClock();
private readonly IFrameBasedClock referenceClock;
private bool running;
public TrackVirtualManual(IFrameBasedClock referenceClock)
{
this.referenceClock = referenceClock;
@ -241,32 +241,55 @@ public TrackVirtualManual(IFrameBasedClock referenceClock)
public override bool Seek(double seek)
{
var offset = Math.Clamp(seek, 0, Length);
accumulated = Math.Min(seek, Length);
lastReferenceTime = null;
stopwatchClock.Seek(offset);
return offset == seek;
return accumulated == seek;
}
public override void Start() => stopwatchClock.Start();
public override void Start()
{
running = true;
}
public override void Reset()
{
stopwatchClock.Seek(0);
Seek(0);
base.Reset();
}
public override void Stop() => stopwatchClock.Stop();
public override void Stop()
{
if (running)
{
running = false;
lastReferenceTime = null;
}
}
public override bool IsRunning => stopwatchClock.IsRunning;
public override bool IsRunning => running;
public override double CurrentTime => stopwatchClock.CurrentTime;
private double? lastReferenceTime;
private double accumulated;
public override double CurrentTime => Math.Min(accumulated, Length);
protected override void UpdateState()
{
base.UpdateState();
stopwatchClock.Rate = Rate * referenceClock.Rate;
if (running)
{
double refTime = referenceClock.CurrentTime;
if (lastReferenceTime.HasValue)
accumulated += (refTime - lastReferenceTime.Value) * Rate;
lastReferenceTime = refTime;
}
Console.WriteLine($"t={CurrentTime}");
if (CurrentTime >= Length)
{