h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-23 00:13:01 +08:00
Code Issues Releases Wiki Activity

Use FramedBeatmapClock in EditorClock

Browse Source
This commit is contained in:
Dean Herbert 2022-08-18 14:11:42 +09:00
parent 9050f54681
commit 31e459364b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Screens/Edit/EditorClock.cs
View File

@ -4,10 +4,12 @@
#nullable disable #nullable disable
using System; using System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Audio.Track; using osu.Framework.Audio.Track;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transforms; using osu.Framework.Graphics.Transforms;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Framework.Utils; using osu.Framework.Utils;
@ -19,7 +21,7 @@ namespace osu.Game.Screens.Edit
/// <summary> /// <summary>
/// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor. /// A decoupled clock which adds editor-specific functionality, such as snapping to a user-defined beat divisor.
/// </summary> /// </summary>
public class EditorClock : Component, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock public class EditorClock : CompositeComponent, IFrameBasedClock, IAdjustableClock, ISourceChangeableClock
{ {
public IBindable<Track> Track => track; public IBindable<Track> Track => track;
@ -33,7 +35,7 @@ namespace osu.Game.Screens.Edit
private readonly BindableBeatDivisor beatDivisor; private readonly BindableBeatDivisor beatDivisor;
private readonly DecoupleableInterpolatingFramedClock underlyingClock; private readonly FramedBeatmapClock underlyingClock;
private bool playbackFinished; private bool playbackFinished;
@ -52,7 +54,8 @@ namespace osu.Game.Screens.Edit
this.beatDivisor = beatDivisor ?? new BindableBeatDivisor(); this.beatDivisor = beatDivisor ?? new BindableBeatDivisor();
underlyingClock = new DecoupleableInterpolatingFramedClock(); underlyingClock = new FramedBeatmapClock(applyOffsets: true);
AddInternal(underlyingClock);
} }
/// <summary> /// <summary>
@ -219,6 +222,9 @@ namespace osu.Game.Screens.Edit
public void ProcessFrame() public void ProcessFrame()
{ {
// EditorClock wasn't being added in many places. This gives us more certainty that it is.
Debug.Assert(underlyingClock.LoadState > LoadState.NotLoaded);
underlyingClock.ProcessFrame(); underlyingClock.ProcessFrame();
playbackFinished = CurrentTime >= TrackLength; playbackFinished = CurrentTime >= TrackLength;