sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Avoid sourcing parent clock when in a paused state

Browse Source
This commit is contained in:
Dean Herbert
2020-10-29 14:42:16 +09:00
parent d91456dc29
commit db2b00068f
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,23 +85,31 @@ namespace osu.Game.Rulesets.UI
public override bool UpdateSubTree() public override bool UpdateSubTree()
{ {
state = frameStableClock.IsPaused.Value ? PlaybackState.NotValid : PlaybackState.Valid; double proposedTime = manualClock.CurrentTime;
if (frameStableClock.WaitingOnFrames.Value) if (frameStableClock.WaitingOnFrames.Value)
{ {
// for now, force one update loop to check if frames have arrived // when waiting on frames, the update loop still needs to be run (at least once) to check for newly arrived frames.
// this may have to change in the future where we want stable user pausing during replay playback. // time should not be sourced from the parent clock in this case.
state = PlaybackState.Valid; state = PlaybackState.Valid;
} }
else if (!frameStableClock.IsPaused.Value)
{
state = PlaybackState.Valid;
proposedTime = parentGameplayClock.CurrentTime;
}
else
{
// time should not advance while paused, not should anything run.
state = PlaybackState.NotValid;
return true;
}
int loops = MaxCatchUpFrames; int loops = MaxCatchUpFrames;
if (state == PlaybackState.NotValid)
return true;
while (loops-- > 0) while (loops-- > 0)
{ {
updateClock(); updateClock(ref proposedTime);
if (state == PlaybackState.NotValid) if (state == PlaybackState.NotValid)
break; break;
@ -113,7 +121,7 @@ namespace osu.Game.Rulesets.UI
return true; return true;
} }
private void updateClock() private void updateClock(ref double proposedTime)
{ {
if (parentGameplayClock == null) if (parentGameplayClock == null)
setClock(); // LoadComplete may not be run yet, but we still want the clock. setClock(); // LoadComplete may not be run yet, but we still want the clock.
@ -121,9 +129,6 @@ namespace osu.Game.Rulesets.UI
// each update start with considering things in valid state. // each update start with considering things in valid state.
state = PlaybackState.Valid; state = PlaybackState.Valid;
// our goal is to catch up to the time provided by the parent clock.
var proposedTime = parentGameplayClock.CurrentTime;
if (FrameStablePlayback) if (FrameStablePlayback)
// if we require frame stability, the proposed time will be adjusted to move at most one known // if we require frame stability, the proposed time will be adjusted to move at most one known
// frame interval in the current direction. // frame interval in the current direction.