RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for slider end snapping

This commit is contained in:
Dean Herbert 2020-09-24 14:34:41 +09:00
parent 44be0ab762
commit d9e8ac6842
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -15,7 +15,6 @@
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Edit.Compose.Components;
@ -123,19 +122,27 @@ private bool snapToVisibleBlueprints(Vector2 screenSpacePosition, out SnapResult
if (b.IsSelected)
continue;
var hitObject = b.HitObject;
var hitObject = (OsuHitObject)b.HitObject;
Vector2 startPos = ((IHasPosition)hitObject).Position;
Vector2? snap = checkSnap(hitObject.Position);
if (snap == null && hitObject.Position != hitObject.EndPosition)
snap = checkSnap(hitObject.EndPosition);
Vector2 objectScreenPos = playfield.GamefieldToScreenSpace(startPos);
if (Vector2.Distance(objectScreenPos, screenSpacePosition) < snapRadius)
if (snap != null)
{
// bypasses time snapping
{
snapResult = new SnapResult(objectScreenPos, null, playfield);
return true;
}
// only return distance portion, since time is not really valid
snapResult = new SnapResult(snap.Value, null, playfield);
return true;
}
Vector2? checkSnap(Vector2 checkPos)
{
Vector2 checkScreenPos = playfield.GamefieldToScreenSpace(checkPos);
if (Vector2.Distance(checkScreenPos, screenSpacePosition) < snapRadius)
return checkScreenPos;
return null;
}
}