h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 04:13:11 +08:00
Code Issues Releases Wiki Activity

Move scoped functionality into local function

Browse Source
This commit is contained in:
Dean Herbert 2021-06-22 16:40:56 +09:00
parent ffac32a848
commit 4b3165084d
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game/Skinning/Editor/SkinSelectionHandler.cs
View File

@ -281,23 +281,7 @@ namespace osu.Game.Skinning.Editor
if (parent == null) if (parent == null)
return drawable.Anchor; return drawable.Anchor;
Vector2 screenPosition; var screenPosition = getScreenPosition();
{
var quad = drawable.ScreenSpaceDrawQuad;
var origin = drawable.Origin;
screenPosition = quad.TopLeft;
if (origin.HasFlagFast(Anchor.x2))
screenPosition.X += quad.Width;
else if (origin.HasFlagFast(Anchor.x1))
screenPosition.X += quad.Width / 2f;
if (origin.HasFlagFast(Anchor.y2))
screenPosition.Y += quad.Height;
else if (origin.HasFlagFast(Anchor.y1))
screenPosition.Y += quad.Height / 2f;
}
var absolutePosition = parent.ToLocalSpace(screenPosition); var absolutePosition = parent.ToLocalSpace(screenPosition);
var factor = parent.RelativeToAbsoluteFactor; var factor = parent.RelativeToAbsoluteFactor;
@ -319,6 +303,26 @@ namespace osu.Game.Skinning.Editor
result |= getAnchorFromPosition(absolutePosition.Y / factor.Y, Anchor.y0, Anchor.y1, Anchor.y2); result |= getAnchorFromPosition(absolutePosition.Y / factor.Y, Anchor.y0, Anchor.y1, Anchor.y2);
return result; return result;
Vector2 getScreenPosition()
{
var quad = drawable.ScreenSpaceDrawQuad;
var origin = drawable.Origin;
var pos = quad.TopLeft;
if (origin.HasFlagFast(Anchor.x2))
pos.X += quad.Width;
else if (origin.HasFlagFast(Anchor.x1))
pos.X += quad.Width / 2f;
if (origin.HasFlagFast(Anchor.y2))
pos.Y += quad.Height;
else if (origin.HasFlagFast(Anchor.y1))
pos.Y += quad.Height / 2f;
return pos;
}
} }
private static void applyAnchor(Drawable drawable, Anchor anchor) private static void applyAnchor(Drawable drawable, Anchor anchor)