Use FrameStabilityClock to denote current position on song progress

This commit is contained in:
Dean Herbert
2019-05-09 18:06:11 +09:00
parent 5942072128
commit 9248e6290c
4 changed files with 35 additions and 13 deletions

View File

@ -20,7 +20,8 @@ namespace osu.Game.Rulesets.UI
public FrameStabilityContainer()
{
RelativeSizeAxes = Axes.Both;
gameplayClock = new GameplayClock(framedClock = new FramedClock(manualClock = new ManualClock()));
GameplayClock = new GameplayClock(framedClock = new FramedClock(manualClock = new ManualClock()));
}
private readonly ManualClock manualClock;
@ -28,7 +29,7 @@ namespace osu.Game.Rulesets.UI
private readonly FramedClock framedClock;
[Cached]
private GameplayClock gameplayClock;
public GameplayClock GameplayClock { get; }
private IFrameBasedClock parentGameplayClock;
@ -38,7 +39,7 @@ namespace osu.Game.Rulesets.UI
if (clock != null)
{
parentGameplayClock = clock;
gameplayClock.IsPaused.BindTo(clock.IsPaused);
GameplayClock.IsPaused.BindTo(clock.IsPaused);
}
}
@ -73,7 +74,7 @@ namespace osu.Game.Rulesets.UI
public override bool UpdateSubTree()
{
requireMoreUpdateLoops = true;
validState = !gameplayClock.IsPaused.Value;
validState = !GameplayClock.IsPaused.Value;
int loops = 0;
@ -160,7 +161,7 @@ namespace osu.Game.Rulesets.UI
if (parentGameplayClock == null)
parentGameplayClock = Clock;
Clock = gameplayClock;
Clock = GameplayClock;
ProcessCustomClock = false;
}