sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix MasterGameplayClockContainer having incorrect rate-based offsets immediately after LoadComplete

Browse Source 
I've attempted to explain why this is required using inline comments.
There's also further conversation at
https://github.com/ppy/osu/pull/17302#issuecomment-1091850927.
This commit is contained in:
Dean Herbert
2022-04-11 14:11:23 +09:00
parent 808f0ecb74
commit cb6e557212
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Screens/Play/MasterGameplayClockContainer.cs
View File

@ -130,7 +130,9 @@ namespace osu.Game.Screens.Play
protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused) protected override void OnIsPausedChanged(ValueChangedEvent<bool> isPaused)
{ {
// The source is stopped by a frequency fade first. if (IsLoaded)
{
// During normal operation, the source is stopped after performing a frequency ramp.
if (isPaused.NewValue) if (isPaused.NewValue)
{ {
this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ => this.TransformBindableTo(pauseFreqAdjust, 0, 200, Easing.Out).OnComplete(_ =>
@ -142,6 +144,19 @@ namespace osu.Game.Screens.Play
else else
this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In); this.TransformBindableTo(pauseFreqAdjust, 1, 200, Easing.In);
} }
else
{
if (isPaused.NewValue)
AdjustableSource.Stop();
// If not yet loaded, we still want to ensure relevant state is correct, as it is used for offset calculations.
pauseFreqAdjust.Value = isPaused.NewValue ? 0 : 1;
// We must also process underlying gameplay clocks to update rate-adjusted offsets with the new frequency adjustment.
// Without doing this, an initial seek may be performed with the wrong offset.
GameplayClock.UnderlyingClock.ProcessFrame();
}
}
public override void Start() public override void Start()
{ {