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

Localise offset clock usage out of Player as much as possible

This commit is contained in:
Dean Herbert 2018-02-28 22:01:52 +09:00
parent 01fcf9c813
commit f9faf8e3d8
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +56,6 @@ public class Player : OsuScreen, IProvideCursor
private IAdjustableClock sourceClock;
/// <summary>
/// The final usable gameplay clock with user-set offsets applied.
/// </summary>
private FramedOffsetClock offsetClock;
/// <summary>
/// The decoupled clock used for gameplay. Should be used for seeks and clock control.
/// </summary>
@ -156,7 +151,8 @@ private void load(AudioManager audio, OsuConfigManager config, APIAccess api)
adjustableClock.ProcessFrame();
offsetClock = new FramedOffsetClock(adjustableClock);
// the final usable gameplay clock with user-set offsets applied.
var offsetClock = new FramedOffsetClock(adjustableClock);
userAudioOffset = config.GetBindable<double>(OsuSetting.AudioOffset);
userAudioOffset.ValueChanged += v => offsetClock.Offset = v;
@ -179,28 +175,23 @@ private void load(AudioManager audio, OsuConfigManager config, APIAccess api)
OnResume = () => hudOverlay.KeyCounter.IsCounting = true,
Children = new Drawable[]
{
new Container
storyboardContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Clock = offsetClock,
ProcessCustomClock = false,
Children = new[]
{
storyboardContainer = new Container
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
},
RulesetContainer,
}
Alpha = 0,
},
RulesetContainer,
new SkipButton(firstObjectTime)
{
Clock = Clock, // skip button doesn't want to use the audio clock directly
ProcessCustomClock = false,
AdjustableClock = adjustableClock,
FramedClock = offsetClock,
},
hudOverlay = new HUDOverlay(scoreProcessor, RulesetContainer, working, offsetClock, adjustableClock)
{
Clock = Clock, // hud overlay doesn't want to use the audio clock directly
ProcessCustomClock = false,
Anchor = Anchor.Centre,
Origin = Anchor.Centre
},
@ -208,7 +199,6 @@ private void load(AudioManager audio, OsuConfigManager config, APIAccess api)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Clock = offsetClock,
ProcessCustomClock = false,
Breaks = beatmap.Breaks
}