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

Jump to bottom

Add breathing room to seek back between control points in editor #30328

Merged
merged 9 commits into from
Oct 22, 2024
Merged

Add breathing room to seek back between control points in editor #30328

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fe0791
fix seeking back on control points
TaterToes Oct 17, 2024
45dd9b1
Forgot subtraction
TaterToes Oct 17, 2024
e102935
adjust margin time and apply rate adjust
TaterToes Oct 17, 2024
c8b0220
fix comment
TaterToes Oct 17, 2024
0a8ba4b
cleanup
TaterToes Oct 17, 2024
b35b16d
Merge branch 'ppy:master' into seekingControlPointFix
TaterToes Oct 18, 2024
1cc6309
attempt to fix formatting
TaterToes Oct 18, 2024
5fe074a
Merge branch 'master' into seekingControlPointFix
TaterToes Oct 18, 2024
16bc188
Refactor code to read better (and adjust lenience to match stable)
peppy Oct 22, 2024
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
8 changes: 6 additions & 2 deletions osu.Game/Screens/Edit/Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,12 @@ private void updateSampleDisabledState()

private void seekControlPoint(int direction)
{
var found = direction < 1
? editorBeatmap.ControlPointInfo.AllControlPoints.LastOrDefault(p => p.Time < clock.CurrentTime)
// In the case of a backwards seek while playing, it can be hard to jump before a timing point.
// Adding some lenience here makes it more user-friendly.
double seekLenience = clock.IsRunning ? 1000 * ((IAdjustableClock)clock).Rate : 0;

ControlPoint found = direction < 1
? editorBeatmap.ControlPointInfo.AllControlPoints.LastOrDefault(p => p.Time < clock.CurrentTime - seekLenience)
: editorBeatmap.ControlPointInfo.AllControlPoints.FirstOrDefault(p => p.Time > clock.CurrentTime);

if (found != null)
Expand Down
Loading