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

Use non-screen-space coordinates and add time-based drag ramping for better control

Browse Source
This commit is contained in:
Dean Herbert 2024-07-23 18:59:22 +09:00
parent 38fc6f70f6
commit cc4ed0ff3f
No known key found for this signature in database
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
View File

@ -3,6 +3,7 @@
#nullable disable #nullable disable
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -100,10 +101,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
return base.OnDragStart(e); return base.OnDragStart(e);
} }
private float dragTimeAccumulated;
protected override void Update() protected override void Update()
{ {
if (IsDragged || hitObjectDragged) if (IsDragged || hitObjectDragged)
handleScrollViaDrag(); handleScrollViaDrag();
else
dragTimeAccumulated = 0;
if (Composer != null && timeline != null) if (Composer != null && timeline != null)
{ {
@ -193,25 +198,42 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private void handleScrollViaDrag() private void handleScrollViaDrag()
{ {
// The amount of time dragging before we reach maximum drag speed.
const float time_ramp_multiplier = 5000;
// A maximum drag speed to ensure things don't get out of hand.
const float max_velocity = 10;
if (timeline == null) return; if (timeline == null) return;
var timelineQuad = timeline.ScreenSpaceDrawQuad; var mousePos = timeline.ToLocalSpace(InputManager.CurrentState.Mouse.Position);
float mouseX = InputManager.CurrentState.Mouse.Position.X;
// for better UX do not require the user to drag all the way to the edge and beyond to initiate a drag-scroll. // for better UX do not require the user to drag all the way to the edge and beyond to initiate a drag-scroll.
// this is especially important in scenarios like fullscreen, where mouse confine will usually be on // this is especially important in scenarios like fullscreen, where mouse confine will usually be on
// and the user physically *won't be able to* drag beyond the edge of the timeline // and the user physically *won't be able to* drag beyond the edge of the timeline
// (since its left edge is co-incident with the window edge). // (since its left edge is co-incident with the window edge).
const float scroll_tolerance = 20; const float scroll_tolerance = 40;
float leftBound = timelineQuad.TopLeft.X + scroll_tolerance; float leftBound = timeline.BoundingBox.TopLeft.X + scroll_tolerance;
float rightBound = timelineQuad.TopRight.X - scroll_tolerance; float rightBound = timeline.BoundingBox.TopRight.X - scroll_tolerance;
// scroll if in a drag and dragging outside visible extents float amount = 0;
if (mouseX > rightBound)
timeline.ScrollBy((float)((mouseX - rightBound) / 10 * Clock.ElapsedFrameTime)); if (mousePos.X > rightBound)
else if (mouseX < leftBound) amount = mousePos.X - rightBound;
timeline.ScrollBy((float)((mouseX - leftBound) / 10 * Clock.ElapsedFrameTime)); else if (mousePos.X < leftBound)
amount = mousePos.X - leftBound;
if (amount == 0)
{
dragTimeAccumulated = 0;
return;
}
amount = Math.Sign(amount) * Math.Min(max_velocity, Math.Abs(MathF.Pow(amount, 2) / (MathF.Pow(scroll_tolerance, 2))));
dragTimeAccumulated += (float)Clock.ElapsedFrameTime;
timeline.ScrollBy(amount * (float)Clock.ElapsedFrameTime * Math.Min(1, dragTimeAccumulated / time_ramp_multiplier));
} }
private partial class SelectableAreaBackground : CompositeDrawable private partial class SelectableAreaBackground : CompositeDrawable