Merge pull request ppy#12780 from peppy/skin-blueprint-aspect-lock

Add aspect ratio locking and flip support to skin editor
OliBomby · May 13, 2021 · 10f008a · 10f008a
2 parents 879ef46 + 6a64a70
commit 10f008a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/osu.Game/Skinning/Editor/SkinBlueprint.cs b/osu.Game/Skinning/Editor/SkinBlueprint.cs
@@ -116,9 +116,10 @@ protected override void Update()
             drawableQuad = drawable.ScreenSpaceDrawQuad;
             var quad = ToLocalSpace(drawable.ScreenSpaceDrawQuad);
 
-            box.Position = quad.TopLeft;
+            box.Position = drawable.ToSpaceOfOtherDrawable(Vector2.Zero, this);
             box.Size = quad.Size;
             box.Rotation = drawable.Rotation;
+            box.Scale = new Vector2(MathF.Sign(drawable.Scale.X), MathF.Sign(drawable.Scale.Y));
         }
 
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => drawable.ReceivePositionalInputAt(screenSpacePos);

diff --git a/osu.Game/Skinning/Editor/SkinSelectionHandler.cs b/osu.Game/Skinning/Editor/SkinSelectionHandler.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Extensions;
@@ -36,6 +37,20 @@ public override bool HandleScale(Vector2 scale, Anchor anchor)
             return true;
         }
 
+        public override bool HandleFlip(Direction direction)
+        {
+            // TODO: this is temporary as well.
+            foreach (var c in SelectedBlueprints)
+            {
+                ((Drawable)c.Item).Scale *= new Vector2(
+                    direction == Direction.Horizontal ? -1 : 1,
+                    direction == Direction.Vertical ? -1 : 1
+                );
+            }
+
+            return true;
+        }
+
         public override bool HandleMovement(MoveSelectionEvent<ISkinnableDrawable> moveEvent)
         {
             foreach (var c in SelectedBlueprints)
@@ -139,6 +154,13 @@ private static void adjustScaleFromAnchor(ref Vector2 scale, Anchor reference)
             // reverse the scale direction if dragging from top or left.
             if ((reference & Anchor.x0) > 0) scale.X = -scale.X;
             if ((reference & Anchor.y0) > 0) scale.Y = -scale.Y;
+
+            // for now aspect lock scale adjustments that occur at corners.
+            if (!reference.HasFlagFast(Anchor.x1) && !reference.HasFlagFast(Anchor.y1))
+            {
+                // TODO: temporary implementation - only dragging the corner handles across the X axis changes size.
+                scale.Y = scale.X;
+            }
         }
 
         public class AnchorMenuItem : TernaryStateMenuItem