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

Add sane pausing logic

Browse Source
This commit is contained in:
Dean Herbert 2020-10-27 18:13:45 +09:00
parent 9e6b0a42ec
commit 851d45d2eb
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,13 @@ namespace osu.Game.Rulesets.UI
int loops = 0; int loops = 0;
if (frameStableClock.WaitingOnFrames.Value)
{
// for now, force one update loop to check if frames have arrived
// this may have to change in the future where we want stable user pausing during replay playback.
validState = true;
}
while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames) while (validState && requireMoreUpdateLoops && loops++ < MaxCatchUpFrames)
{ {
updateClock(); updateClock();
@ -203,6 +210,7 @@ namespace osu.Game.Rulesets.UI
requireMoreUpdateLoops |= timeBehind != 0; requireMoreUpdateLoops |= timeBehind != 0;
frameStableClock.IsCatchingUp.Value = timeBehind > 200; frameStableClock.IsCatchingUp.Value = timeBehind > 200;
frameStableClock.WaitingOnFrames.Value = !validState;
// The manual clock time has changed in the above code. The framed clock now needs to be updated // The manual clock time has changed in the above code. The framed clock now needs to be updated
// to ensure that the its time is valid for our children before input is processed // to ensure that the its time is valid for our children before input is processed
@ -231,6 +239,8 @@ namespace osu.Game.Rulesets.UI
public readonly Bindable<bool> IsCatchingUp = new Bindable<bool>(); public readonly Bindable<bool> IsCatchingUp = new Bindable<bool>();
public readonly Bindable<bool> WaitingOnFrames = new Bindable<bool>();
public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>(); public override IEnumerable<Bindable<double>> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty<Bindable<double>>();
public FrameStabilityClock(FramedClock underlyingClock) public FrameStabilityClock(FramedClock underlyingClock)
@ -239,6 +249,8 @@ namespace osu.Game.Rulesets.UI
} }
IBindable<bool> IFrameStableClock.IsCatchingUp => IsCatchingUp; IBindable<bool> IFrameStableClock.IsCatchingUp => IsCatchingUp;
IBindable<bool> IFrameStableClock.WaitingOnFrames => WaitingOnFrames;
} }
} }
} }

2
osu.Game/Rulesets/UI/IFrameStableClock.cs
View File

@ -9,5 +9,7 @@ namespace osu.Game.Rulesets.UI
public interface IFrameStableClock : IFrameBasedClock public interface IFrameStableClock : IFrameBasedClock
{ {
IBindable<bool> IsCatchingUp { get; } IBindable<bool> IsCatchingUp { get; }
IBindable<bool> WaitingOnFrames { get; }
} }
} }

8
osu.Game/Screens/Play/Player.cs
View File

@ -238,6 +238,14 @@ namespace osu.Game.Screens.Play
skipOverlay.Hide(); skipOverlay.Hide();
} }
DrawableRuleset.FrameStableClock.WaitingOnFrames.BindValueChanged(waiting =>
{
if (waiting.NewValue)
GameplayClockContainer.Stop();
else
GameplayClockContainer.Start();
});
DrawableRuleset.IsPaused.BindValueChanged(paused => DrawableRuleset.IsPaused.BindValueChanged(paused =>
{ {
updateGameplayState(); updateGameplayState();