mirror of
https://github.com/ppy/osu.git
synced 2025-02-08 12:23:21 +08:00
Simplify code
This commit is contained in:
parent
269ade178e
commit
589035c534
@ -230,8 +230,6 @@ namespace osu.Game.Rulesets.Osu.Edit
|
|||||||
if (!snapToVisibleBlueprints(screenSpacePosition, out var snapResult))
|
if (!snapToVisibleBlueprints(screenSpacePosition, out var snapResult))
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
snapResult.Time ??= fallbackTime;
|
|
||||||
|
|
||||||
if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True || distanceSnapGrid == null)
|
if (DistanceSnapProvider.DistanceSnapToggle.Value != TernaryState.True || distanceSnapGrid == null)
|
||||||
return snapResult;
|
return snapResult;
|
||||||
|
|
||||||
@ -244,8 +242,9 @@ namespace osu.Game.Rulesets.Osu.Edit
|
|||||||
// The easiest way to ensure this is to attempt application of distance snap after a nearby object is found, and copy over
|
// The easiest way to ensure this is to attempt application of distance snap after a nearby object is found, and copy over
|
||||||
// the time value if the proposed positions are roughly the same.
|
// the time value if the proposed positions are roughly the same.
|
||||||
(Vector2 distanceSnappedPosition, double distanceSnappedTime) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(snapResult.ScreenSpacePosition));
|
(Vector2 distanceSnappedPosition, double distanceSnappedTime) = distanceSnapGrid.GetSnappedPosition(distanceSnapGrid.ToLocalSpace(snapResult.ScreenSpacePosition));
|
||||||
if (Precision.AlmostEquals(distanceSnapGrid.ToScreenSpace(distanceSnappedPosition), snapResult.ScreenSpacePosition, 1))
|
snapResult.Time = Precision.AlmostEquals(distanceSnapGrid.ToScreenSpace(distanceSnappedPosition), snapResult.ScreenSpacePosition, 1)
|
||||||
snapResult.Time = distanceSnappedTime;
|
? distanceSnappedTime
|
||||||
|
: fallbackTime;
|
||||||
|
|
||||||
return snapResult;
|
return snapResult;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user