h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-27 02:33:21 +08:00
Code Issues Releases Wiki Activity

Move clock logic back to inside updateClock method

Browse Source
This commit is contained in:
Dean Herbert 2020-10-30 20:20:34 +09:00
parent 79aecc9a98
commit 1bd461f229
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Rulesets/UI/FrameStabilityContainer.cs
View File

@ -85,15 +85,10 @@ namespace osu.Game.Rulesets.UI
public override bool UpdateSubTree() public override bool UpdateSubTree()
{ {
if (parentGameplayClock == null)
setClock(); // LoadComplete may not be run yet, but we still want the clock.
double aimTime = parentGameplayClock.CurrentTime;
if (frameStableClock.WaitingOnFrames.Value) if (frameStableClock.WaitingOnFrames.Value)
{ {
// waiting on frames is a special case where we want to avoid doing any update propagation, unless new frame data has arrived. // waiting on frames is a special case where we want to avoid doing any update propagation, unless new frame data has arrived.
state = ReplayInputHandler.SetFrameFromTime(aimTime) != null ? PlaybackState.Valid : PlaybackState.NotValid; state = PlaybackState.Valid;
} }
else if (!frameStableClock.IsPaused.Value) else if (!frameStableClock.IsPaused.Value)
{ {
@ -103,10 +98,8 @@ namespace osu.Game.Rulesets.UI
{ {
// time should not advance while paused, nor should anything run. // time should not advance while paused, nor should anything run.
state = PlaybackState.NotValid; state = PlaybackState.NotValid;
}
if (state == PlaybackState.NotValid)
return true; return true;
}
int loops = MaxCatchUpFrames; int loops = MaxCatchUpFrames;
@ -114,7 +107,7 @@ namespace osu.Game.Rulesets.UI
{ {
// update clock is always trying to approach the aim time. // update clock is always trying to approach the aim time.
// it should be provided as the original value each loop. // it should be provided as the original value each loop.
updateClock(aimTime); updateClock();
if (state == PlaybackState.NotValid) if (state == PlaybackState.NotValid)
break; break;
@ -126,8 +119,13 @@ namespace osu.Game.Rulesets.UI
return true; return true;
} }
private void updateClock(double proposedTime) private void updateClock()
{ {
if (parentGameplayClock == null)
setClock(); // LoadComplete may not be run yet, but we still want the clock.
double proposedTime = parentGameplayClock.CurrentTime;
// each update start with considering things in valid state. // each update start with considering things in valid state.
state = PlaybackState.Valid; state = PlaybackState.Valid;