h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Code Issues Releases Wiki Activity

working negative scaling

Browse Source
This commit is contained in:
Wleter 2023-08-28 16:41:55 +02:00
parent 9f4f81c150
commit 07e126241d
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,8 +31,6 @@ 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
@ -73,32 +71,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 and accumulate the amount of scaling.
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;
adjustedRect.Width += scale.X; adjustedRect.Width += scale.X;
adjustedRect.Height += scale.Y; adjustedRect.Height += scale.Y;
if (adjustedRect.Width < 0)
{
SelectionBox.ScaleHandlesFlip(Direction.Horizontal);
HandleFlip(Direction.Horizontal, false);
}
if (adjustedRect.Height < 0)
{
SelectionBox.ScaleHandlesFlip(Direction.Vertical);
HandleFlip(Direction.Vertical, false);
}
if (adjustedRect.Width < 0 || adjustedRect.Height < 0)
return true;
// scale adjust applied to each individual item should match that of the quad itself. // scale adjust applied to each individual item should match that of the quad itself.
var scaledDelta = new Vector2( var scaledDelta = new Vector2(
adjustedRect.Width / selectionRect.Width, adjustedRect.Width / selectionRect.Width,
@ -169,12 +160,6 @@ 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();

2
osu.Game/Screens/Edit/Compose/Components/SelectionBox.cs
View File

@ -307,6 +307,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
return button; return button;
} }
public void ScaleHandlesFlip(Direction direction) => dragHandles.ScaleHandlesFlip(direction);
private void addScaleHandle(Anchor anchor) private void addScaleHandle(Anchor anchor)
{ {
var handle = new SelectionBoxScaleHandle var handle = new SelectionBoxScaleHandle

12
osu.Game/Screens/Edit/Compose/Components/SelectionBoxDragHandleContainer.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.EnumExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -69,6 +70,17 @@ namespace osu.Game.Screens.Edit.Compose.Components
allDragHandles.Add(handle); allDragHandles.Add(handle);
} }
public void ScaleHandlesFlip(Direction direction)
{
foreach (var handle in scaleHandles)
{
if (direction == Direction.Horizontal && !handle.Anchor.HasFlagFast(Anchor.x1))
handle.Anchor ^= Anchor.x0 | Anchor.x2;
if (direction == Direction.Vertical && !handle.Anchor.HasFlagFast(Anchor.y1))
handle.Anchor ^= Anchor.y0 | Anchor.y2;
}
}
private SelectionBoxRotationHandle displayedRotationHandle; private SelectionBoxRotationHandle displayedRotationHandle;
private SelectionBoxDragHandle activeHandle; private SelectionBoxDragHandle activeHandle;