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

Merge pull request #4534 from peppy/gameplay-paused-no-update 

Don't update gameplay loop while paused
This commit is contained in:
Dan Balasescu 2019-03-29 11:00:59 +09:00 committed by GitHub
parent 71c4fefe69 7ab24e35f9
commit bf61f35870
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,10 @@ public FrameStabilityContainer()
private void load(GameplayClock clock)
{
if (clock != null)
{
parentGameplayClock = clock;
gameplayClock.IsPaused.BindTo(clock.IsPaused);
}
}
protected override void LoadComplete()
@ -68,7 +71,7 @@ protected override void LoadComplete()
public override bool UpdateSubTree()
{
requireMoreUpdateLoops = true;
validState = true;
validState = !gameplayClock.IsPaused.Value;
int loops = 0;

3
osu.Game/Screens/Play/GameplayClock.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
using osu.Framework.Timing;
namespace osu.Game.Screens.Play
@ -17,6 +18,8 @@ public class GameplayClock : IFrameBasedClock
{
private readonly IFrameBasedClock underlyingClock;
public readonly BindableBool IsPaused = new BindableBool();
public GameplayClock(IFrameBasedClock underlyingClock)
{
this.underlyingClock = underlyingClock;

2
osu.Game/Screens/Play/GameplayClockContainer.cs
View File

@ -79,6 +79,8 @@ public GameplayClockContainer(WorkingBeatmap beatmap, bool allowLeadIn, double g
// the clock to be exposed via DI to children.
GameplayClock = new GameplayClock(offsetClock);
GameplayClock.IsPaused.BindTo(IsPaused);
}
[BackgroundDependencyLoader]