h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Snap editor selection rotation when holding shift

Browse Source
This commit is contained in:
Micha Lehmann 2023-04-08 00:50:31 +02:00
parent 628c23afae
commit f1de560d57
1 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
osu.Game/Screens/Edit/Compose/Components/SelectionBoxRotationHandle.cs
View File

@ -16,6 +16,8 @@ using osu.Framework.Localisation;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using Key = osuTK.Input.Key;
namespace osu.Game.Screens.Edit.Compose.Components namespace osu.Game.Screens.Edit.Compose.Components
{ {
public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip public partial class SelectionBoxRotationHandle : SelectionBoxDragHandle, IHasTooltip
@ -26,6 +28,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
private SpriteIcon icon; private SpriteIcon icon;
private const float snapStep = 15;
private float rawCumulativeRotation = 0;
private readonly Bindable<float?> cumulativeRotation = new Bindable<float?>(); private readonly Bindable<float?> cumulativeRotation = new Bindable<float?>();
[Resolved] [Resolved]
@ -74,21 +78,38 @@ namespace osu.Game.Screens.Edit.Compose.Components
{ {
base.OnDrag(e); base.OnDrag(e);
float instantaneousAngle = convertDragEventToAngleOfRotation(e); rawCumulativeRotation += convertDragEventToAngleOfRotation(e);
cumulativeRotation.Value += instantaneousAngle;
if (cumulativeRotation.Value < -180) applyRotation(shouldSnap: e.ShiftPressed);
cumulativeRotation.Value += 360; }
else if (cumulativeRotation.Value > 180)
cumulativeRotation.Value -= 360;
HandleRotate?.Invoke(instantaneousAngle); protected override bool OnKeyDown(KeyDownEvent e)
{
base.OnKeyDown(e);
if (cumulativeRotation.Value != null && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
{
applyRotation(shouldSnap: true);
}
return true;
}
protected override void OnKeyUp(KeyUpEvent e)
{
base.OnKeyUp(e);
if (cumulativeRotation.Value != null && (e.Key == Key.ShiftLeft || e.Key == Key.ShiftRight))
{
applyRotation(shouldSnap: false);
}
} }
protected override void OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
base.OnDragEnd(e); base.OnDragEnd(e);
cumulativeRotation.Value = null; cumulativeRotation.Value = null;
rawCumulativeRotation = 0;
} }
private float convertDragEventToAngleOfRotation(DragEvent e) private float convertDragEventToAngleOfRotation(DragEvent e)
@ -100,6 +121,33 @@ namespace osu.Game.Screens.Edit.Compose.Components
return (endAngle - startAngle) * 180 / MathF.PI; return (endAngle - startAngle) * 180 / MathF.PI;
} }
private void applyRotation(bool shouldSnap)
{
float oldRotation = cumulativeRotation.Value ?? 0;
if (shouldSnap)
{
cumulativeRotation.Value = snap(rawCumulativeRotation, snapStep);
}
else
{
cumulativeRotation.Value = rawCumulativeRotation;
}
if (cumulativeRotation.Value < -180)
cumulativeRotation.Value += 360;
else if (cumulativeRotation.Value > 180)
cumulativeRotation.Value -= 360;
HandleRotate?.Invoke((float)cumulativeRotation.Value - oldRotation);
}
private float snap(float value, float step)
{
float floor = MathF.Floor(value / step) * step;
return value - floor < step / 2f ? floor : floor + step;
}
private void updateTooltipText() private void updateTooltipText()
{ {
TooltipText = cumulativeRotation.Value?.ToLocalisableString("0.0°") ?? default; TooltipText = cumulativeRotation.Value?.ToLocalisableString("0.0°") ?? default;