Update framework and add rudimentary fading to song select screen.

This commit is contained in:
Thomas Müller
2016-11-20 12:16:54 +01:00
parent 0fdd505807
commit 57e7c7097d
7 changed files with 35 additions and 38 deletions

View File

@ -32,10 +32,7 @@ namespace osu.Game.Screens.Play
public BeatmapInfo BeatmapInfo;
public PlayMode PreferredPlayMode;
protected override IFrameBasedClock Clock => playerClock;
private InterpolatingFramedClock playerClock;
private IAdjustableClock sourceClock;
private Ruleset ruleset;
@ -64,7 +61,7 @@ namespace osu.Game.Screens.Play
}
sourceClock = (IAdjustableClock)track ?? new StopwatchClock();
playerClock = new InterpolatingFramedClock(sourceClock);
Clock = new InterpolatingFramedClock(sourceClock);
Schedule(() =>
{
@ -118,7 +115,7 @@ namespace osu.Game.Screens.Play
protected override void Update()
{
base.Update();
playerClock.ProcessFrame();
Clock.ProcessFrame();
}
class PlayerInputManager : UserInputManager