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

Rename sourceClock

This commit is contained in:
Dean Herbert 2018-02-27 16:05:21 +09:00
parent fee258f2f2
commit 3d52ead213
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,13 @@ public class Player : OsuScreen, IProvideCursor
public CursorContainer Cursor => RulesetContainer.Cursor;
public bool ProvidingUserCursor => RulesetContainer?.Cursor != null && !RulesetContainer.HasReplayLoaded.Value;
private IAdjustableClock adjustableSourceClock;
private IAdjustableClock sourceClock;
/// <summary>
/// The final usable gameplay clock with user-set offsets applied.
/// </summary>
private FramedOffsetClock offsetClock;
private DecoupleableInterpolatingFramedClock decoupledClock;
private PauseContainer pauseContainer;
@ -138,7 +143,7 @@ private void load(AudioManager audio, OsuConfigManager config, APIAccess api)
return;
}
adjustableSourceClock = (IAdjustableClock)working.Track ?? new StopwatchClock();
sourceClock = (IAdjustableClock)working.Track ?? new StopwatchClock();
decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = false };
var firstObjectTime = RulesetContainer.Objects.First().StartTime;
@ -236,11 +241,11 @@ private void load(AudioManager audio, OsuConfigManager config, APIAccess api)
private void applyRateFromMods()
{
if (adjustableSourceClock == null) return;
if (sourceClock == null) return;
adjustableSourceClock.Rate = 1;
sourceClock.Rate = 1;
foreach (var mod in Beatmap.Value.Mods.Value.OfType<IApplicableToClock>())
mod.ApplyToClock(adjustableSourceClock);
mod.ApplyToClock(sourceClock);
}
private void initializeStoryboard(bool asyncLoad)
@ -328,11 +333,11 @@ protected override void OnEntering(Screen last)
Task.Run(() =>
{
adjustableSourceClock.Reset();
sourceClock.Reset();
Schedule(() =>
{
decoupledClock.ChangeSource(adjustableSourceClock);
decoupledClock.ChangeSource(sourceClock);
applyRateFromMods();
this.Delay(750).Schedule(() =>