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

Rework seeking interactions to support smooth scrolling

Browse Source
This commit is contained in:
smoogipoo 2018-05-23 14:14:32 +09:00
parent f18677382c
commit 6b0eeb3436
1 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
View File

@ -43,20 +43,59 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
this.adjustableClock = adjustableClock; this.adjustableClock = adjustableClock;
} }
private bool handlingUserInput; /// <summary>
/// The track's time in the previous frame.
/// </summary>
private double lastTrackTime;
/// <summary>
/// Whether the user is currently dragging the timeline.
/// </summary>
private bool handlingDragInput;
/// <summary>
/// Whether the track was playing before a user drag event.
/// </summary>
private bool trackWasPlaying; private bool trackWasPlaying;
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
// We want time = 0 to be at the centre of the container when scrolled to the start // The extrema of track time should be positioned at the centre of the container when scrolled to the start or end
Content.Margin = new MarginPadding { Horizontal = DrawWidth / 2 }; Content.Margin = new MarginPadding { Horizontal = DrawWidth / 2 };
if (!handlingUserInput) if (handlingDragInput)
ScrollTo((float)(adjustableClock.CurrentTime / Beatmap.Value.Track.Length) * Content.DrawWidth, false); {
else // The user is dragging - the track should always follow the timeline
adjustableClock.Seek(Current / Content.DrawWidth * Beatmap.Value.Track.Length); adjustableClock.Seek(Current / Content.DrawWidth * Beatmap.Value.Track.Length);
}
else if (adjustableClock.IsRunning)
{
// If the user hasn't provided mouse input but the track is running, always follow the track
ScrollTo((float)(adjustableClock.CurrentTime / Beatmap.Value.Track.Length) * Content.DrawWidth, false);
}
else
{
// The track isn't playing, so we want to smooth-scroll once more, and re-enable wheel scrolling
// There are two cases we have to be wary of:
// 1) The user scrolls on this timeline: We want the track to follow us
// 2) The user changes the track time through some other means (scrolling in the editor or overview timeline): We want to follow the track time
// The simplest way to cover both cases is by checking that inter-frame track times are identical
if (adjustableClock.CurrentTime == lastTrackTime)
{
// The track hasn't been seeked externally
adjustableClock.Seek(Current / Content.DrawWidth * Beatmap.Value.Track.Length);
}
else
{
// The track has been seeked externally
ScrollTo((float)(adjustableClock.CurrentTime / Beatmap.Value.Track.Length) * Content.DrawWidth, false);
}
}
lastTrackTime = adjustableClock.CurrentTime;
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -78,14 +117,14 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
private void beginUserInput() private void beginUserInput()
{ {
handlingUserInput = true; handlingDragInput = true;
trackWasPlaying = adjustableClock.IsRunning; trackWasPlaying = adjustableClock.IsRunning;
adjustableClock.Stop(); adjustableClock.Stop();
} }
private void endUserInput() private void endUserInput()
{ {
handlingUserInput = false; handlingDragInput = false;
if (trackWasPlaying) if (trackWasPlaying)
adjustableClock.Start(); adjustableClock.Start();
} }