sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix clamping logic to always clamp to the last displayed tick

Browse Source
This commit is contained in:
Dean Herbert
2022-05-06 17:09:38 +09:00
parent 684fef7f8c
commit 37cbc79283
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
// This grid implementation factors in the user's distance spacing specification, // This grid implementation factors in the user's distance spacing specification,
// which is usually not considered by an `IDistanceSnapProvider`. // which is usually not considered by an `IDistanceSnapProvider`.
float distanceSpacing = (float)DistanceSpacingMultiplier.Value; float distanceSpacingMultiplier = (float)DistanceSpacingMultiplier.Value;
Vector2 travelVector = (position - StartPosition); Vector2 travelVector = (position - StartPosition);
@ -84,17 +84,19 @@ namespace osu.Game.Screens.Edit.Compose.Components
// When interacting with the resolved snap provider, the distance spacing multiplier should first be removed // When interacting with the resolved snap provider, the distance spacing multiplier should first be removed
// to allow for snapping at a non-multiplied ratio. // to allow for snapping at a non-multiplied ratio.
float snappedDistance = SnapProvider.FindSnappedDistance(ReferenceObject, travelLength / distanceSpacing); float snappedDistance = SnapProvider.FindSnappedDistance(ReferenceObject, travelLength / distanceSpacingMultiplier);
double snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance); double snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance);
if (snappedTime > LatestEndTime) if (snappedTime > LatestEndTime)
{ {
snappedDistance = SnapProvider.DurationToDistance(ReferenceObject, LatestEndTime.Value - ReferenceObject.GetEndTime()); double tickLength = Beatmap.GetBeatLengthAtTime(StartTime);
snappedDistance = SnapProvider.DurationToDistance(ReferenceObject, MaxIntervals * tickLength);
snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance); snappedTime = StartTime + SnapProvider.DistanceToDuration(ReferenceObject, snappedDistance);
} }
// The multiplier can then be reapplied to the final position. // The multiplier can then be reapplied to the final position.
Vector2 snappedPosition = StartPosition + travelVector.Normalized() * snappedDistance * distanceSpacing; Vector2 snappedPosition = StartPosition + travelVector.Normalized() * snappedDistance * distanceSpacingMultiplier;
return (snappedPosition, snappedTime); return (snappedPosition, snappedTime);
} }