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

Don't skip beats when scrolling in the direction of the closest beat

Browse Source
This commit is contained in:
smoogipoo 2018-03-13 14:02:37 +09:00
parent 8acba47a2b
commit 6c148930b5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -148,10 +148,16 @@ namespace osu.Game.Rulesets.Edit
double beatLength = timingPoint.BeatLength / beat_snap_divisor;
int direction = state.Mouse.WheelDelta > 0 ? 1 : -1;
double unsnappedTime = adjustableClock.CurrentTime + beatLength * direction;
// The direction is added to prevent rounding issues by enforcing that abs(unsnappedTime - currentTime) > beatLength
double unsnappedTime = adjustableClock.CurrentTime + beatLength * direction + direction;
// Unsnapped time may be between two beats, so we need to snap it to the closest beat
int closestBeat = (int)Math.Round(unsnappedTime / beatLength);
int closestBeat;
if (direction > 0)
closestBeat = (int)Math.Floor(unsnappedTime / beatLength);
else
closestBeat = (int)Math.Ceiling(unsnappedTime / beatLength);
double snappedTime = closestBeat * beatLength;
adjustableClock.Seek(snappedTime);