Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix beat synced components not applying offsets #19973

Merged
merged 5 commits into from
Aug 29, 2022
Merged

Fix beat synced components not applying offsets #19973

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fec744a
Add global `FramedBeatmapClock` for `BeatSyncProvider` components
peppy Aug 26, 2022
35d262f
Merge branch 'master' into no-gameplay-clock-beat-synced-container
smoogipoo Aug 26, 2022
c50695e
Merge branch 'master' into no-gameplay-clock-beat-synced-container
peppy Aug 29, 2022
be5c623
Encapsulate `Track` inside a `FramedClock` to avoid mutating operations
peppy Aug 29, 2022
2e3c622
Merge branch 'master' into no-gameplay-clock-beat-synced-container
peppy Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion osu.Game/OsuGameBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@ public virtual string Version

private RealmAccess realm;

/// <summary>
/// For now, this is used as a source specifically for beat synced components.
/// Going forward, it could potentially be used as the single source-of-truth for beatmap timing.
/// </summary>
private readonly FramedBeatmapClock beatmapClock = new FramedBeatmapClock(true);

protected override Container<Drawable> Content => content;

private Container content;
Expand Down Expand Up @@ -368,10 +374,24 @@ private void load(ReadableKeyCombinationProvider keyCombinationProvider)
AddInternal(MusicController = new MusicController());
dependencies.CacheAs(MusicController);

MusicController.TrackChanged += onTrackChanged;
AddInternal(beatmapClock);

Ruleset.BindValueChanged(onRulesetChanged);
Beatmap.BindValueChanged(onBeatmapChanged);
}

private void onTrackChanged(WorkingBeatmap beatmap, TrackChangeDirection direction)
{
// FramedBeatmapClock uses a decoupled clock internally which will mutate the source if it is an `IAdjustableClock`.
// We don't want this for now, as the intention of beatmapClock is to be a read-only source for beat sync components.
//
// Encapsulating in a FramedClock will avoid any mutations.
var framedClock = new FramedClock(beatmap.Track);

beatmapClock.ChangeSource(framedClock);
}

protected virtual void InitialiseFonts()
{
AddFont(Resources, @"Fonts/osuFont");
Expand Down Expand Up @@ -587,7 +607,7 @@ protected override void Dispose(bool isDisposing)
}

ControlPointInfo IBeatSyncProvider.ControlPoints => Beatmap.Value.BeatmapLoaded ? Beatmap.Value.Beatmap.ControlPointInfo : null;
IClock IBeatSyncProvider.Clock => Beatmap.Value.TrackLoaded ? Beatmap.Value.Track : (IClock)null;
IClock IBeatSyncProvider.Clock => beatmapClock;
ChannelAmplitudes IHasAmplitudes.CurrentAmplitudes => Beatmap.Value.TrackLoaded ? Beatmap.Value.Track.CurrentAmplitudes : ChannelAmplitudes.Empty;
}
}