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

accumulating negative scaling

Browse Source
This commit is contained in:
Wleter 2023-08-21 19:36:11 +02:00
parent d2798c7a1c
commit 9f4f81c150
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Overlays.SkinEditor
UpdatePosition = updateDrawablePosition UpdatePosition = updateDrawablePosition
}; };
private float accumulatedNegativeScaling;
public override bool HandleScale(Vector2 scale, Anchor anchor) public override bool HandleScale(Vector2 scale, Anchor anchor)
{ {
// convert scale to screen space // convert scale to screen space
@ -71,8 +73,25 @@ namespace osu.Game.Overlays.SkinEditor
scale.Y = scale.X / selectionRect.Width * selectionRect.Height; scale.Y = scale.X / selectionRect.Width * selectionRect.Height;
} }
// If scaling reverses the selection, don't scale. // If scaling reverses the selection, don't scale and accumulate the amount of scaling.
if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0) return true; if (adjustedRect.Width + scale.X < 0 || adjustedRect.Height + scale.Y < 0)
{
accumulatedNegativeScaling += scale.Length; // - new Vector2(selectionRect.Width, selectionRect.Height).Length;
return true;
}
// Compensate for accumulated negative scaling.
if (Precision.AlmostBigger(accumulatedNegativeScaling, 0) && !Precision.AlmostEquals(accumulatedNegativeScaling, 0))
{
float length = scale.Length;
accumulatedNegativeScaling -= length;
// If the accumulated negative scaling is still positive, don't scale.
if (Precision.AlmostBigger(accumulatedNegativeScaling, 0)) return true;
scale *= Math.Abs(accumulatedNegativeScaling) / length;
accumulatedNegativeScaling = 0;
}
if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X; if (anchor.HasFlagFast(Anchor.x0)) adjustedRect.X -= scale.X;
if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y; if (anchor.HasFlagFast(Anchor.y0)) adjustedRect.Y -= scale.Y;
@ -150,6 +169,12 @@ namespace osu.Game.Overlays.SkinEditor
public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable)); public static void ApplyClosestAnchor(Drawable drawable) => applyAnchor(drawable, getClosestAnchor(drawable));
protected override void OnOperationEnded()
{
base.OnOperationEnded();
accumulatedNegativeScaling = 0;
}
protected override void OnSelectionChanged() protected override void OnSelectionChanged()
{ {
base.OnSelectionChanged(); base.OnSelectionChanged();