h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Code Issues Releases Wiki Activity

Use a decoupled clock for accurate clock times

Browse Source
This commit is contained in:
smoogipoo 2018-03-15 15:53:39 +09:00
parent 50f9d810dd
commit 9e0aeec574
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -31,7 +31,9 @@ namespace osu.Game.Rulesets.Edit
private readonly List<Container> layerContainers = new List<Container>(); private readonly List<Container> layerContainers = new List<Container>();
private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>(); private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
private IAdjustableClock adjustableClock;
private IAdjustableClock sourceClock;
private DecoupleableInterpolatingFramedClock adjustableClock;
protected HitObjectComposer(Ruleset ruleset) protected HitObjectComposer(Ruleset ruleset)
{ {
@ -49,8 +51,12 @@ namespace osu.Game.Rulesets.Edit
rulesetContainer = CreateRulesetContainer(ruleset, beatmap.Value); rulesetContainer = CreateRulesetContainer(ruleset, beatmap.Value);
// TODO: should probably be done at a RulesetContainer level to share logic with Player. // TODO: should probably be done at a RulesetContainer level to share logic with Player.
adjustableClock = (IAdjustableClock)beatmap.Value.Track ?? new StopwatchClock(); sourceClock = (IAdjustableClock)beatmap.Value.Track ?? new StopwatchClock();
rulesetContainer.Clock = new InterpolatingFramedClock(adjustableClock); adjustableClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
adjustableClock.ChangeSource(sourceClock);
rulesetContainer.Clock = adjustableClock;
} }
catch (Exception e) catch (Exception e)
{ {
@ -229,14 +235,11 @@ namespace osu.Game.Rulesets.Edit
seekTime = timingPoint.Time + closestBeat * seekAmount; seekTime = timingPoint.Time + closestBeat * seekAmount;
// Due to the rounding above, we may end up on the same beat. This will effectively cause 0 seeking to happen // Due to the rounding above, we may end up on the current beat. This will effectively cause 0 seeking to happen, but we don't want this.
// so we can just seek to the next beat in the direction if this is the case // Instead, we'll go to the next beat in the direction when this is the case
if (Math.Abs(adjustableClock.CurrentTime - seekTime) == 0) if (Precision.AlmostEquals(adjustableClock.CurrentTime, seekTime))
{ {
if (direction > 0) closestBeat += direction > 0 ? 1 : -1;
closestBeat++;
else
closestBeat--;
seekTime = timingPoint.Time + closestBeat * seekAmount; seekTime = timingPoint.Time + closestBeat * seekAmount;
} }
@ -244,7 +247,7 @@ namespace osu.Game.Rulesets.Edit
seekTime = timingPoint.Time; seekTime = timingPoint.Time;
var nextTimingPoint = cpi.TimingPoints.FirstOrDefault(t => t.Time > timingPoint.Time); var nextTimingPoint = cpi.TimingPoints.FirstOrDefault(t => t.Time > timingPoint.Time);
if (seekTime >= nextTimingPoint?.Time) if (seekTime > nextTimingPoint?.Time)
seekTime = nextTimingPoint.Time; seekTime = nextTimingPoint.Time;
adjustableClock.Seek(seekTime); adjustableClock.Seek(seekTime);