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

Merge branch 'master' into skin-blueprint-aspect-lock

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-05-13 17:53:00 +02:00
commit 6a64a705b8
1 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
osu.Game/Skinning/Editor/SkinBlueprint.cs
View File

@ -22,6 +22,8 @@ namespace osu.Game.Skinning.Editor
private Container outlineBox; private Container outlineBox;
private AnchorOriginVisualiser anchorOriginVisualiser;
private Drawable drawable => (Drawable)Item; private Drawable drawable => (Drawable)Item;
protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent; protected override bool ShouldBeAlive => drawable.IsAlive && Item.IsPresent;
@ -65,9 +67,13 @@ namespace osu.Game.Skinning.Editor
Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold), Font = OsuFont.Default.With(size: 10, weight: FontWeight.Bold),
Anchor = Anchor.BottomRight, Anchor = Anchor.BottomRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
} },
}, },
}, },
anchorOriginVisualiser = new AnchorOriginVisualiser(drawable)
{
Alpha = 0,
}
}; };
} }
@ -76,7 +82,7 @@ namespace osu.Game.Skinning.Editor
base.LoadComplete(); base.LoadComplete();
updateSelectedState(); updateSelectedState();
box.FadeInFromZero(200, Easing.OutQuint); this.FadeInFromZero(200, Easing.OutQuint);
} }
protected override void OnSelected() protected override void OnSelected()
@ -95,6 +101,8 @@ namespace osu.Game.Skinning.Editor
{ {
outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint); outlineBox.FadeColour(colours.Pink.Opacity(IsSelected ? 1 : 0.5f), 200, Easing.OutQuint);
outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint); outlineBox.Child.FadeTo(IsSelected ? 0.2f : 0, 200, Easing.OutQuint);
anchorOriginVisualiser.FadeTo(IsSelected ? 1 : 0, 200, Easing.OutQuint);
} }
private Quad drawableQuad; private Quad drawableQuad;
@ -120,4 +128,58 @@ namespace osu.Game.Skinning.Editor
public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad; public override Quad SelectionQuad => drawable.ScreenSpaceDrawQuad;
} }
internal class AnchorOriginVisualiser : CompositeDrawable
{
private readonly Drawable drawable;
private readonly Box originBox;
private readonly Box anchorBox;
private readonly Box anchorLine;
public AnchorOriginVisualiser(Drawable drawable)
{
this.drawable = drawable;
InternalChildren = new Drawable[]
{
anchorLine = new Box
{
Colour = Color4.Yellow,
Height = 2,
},
originBox = new Box
{
Colour = Color4.Red,
Origin = Anchor.Centre,
Size = new Vector2(5),
},
anchorBox = new Box
{
Colour = Color4.Red,
Origin = Anchor.Centre,
Size = new Vector2(5),
},
};
}
protected override void Update()
{
base.Update();
if (drawable.Parent == null)
return;
originBox.Position = drawable.ToSpaceOfOtherDrawable(drawable.OriginPosition, this);
anchorBox.Position = drawable.Parent.ToSpaceOfOtherDrawable(drawable.AnchorPosition, this);
var point1 = ToLocalSpace(anchorBox.ScreenSpaceDrawQuad.Centre);
var point2 = ToLocalSpace(originBox.ScreenSpaceDrawQuad.Centre);
anchorLine.Position = point1;
anchorLine.Width = (point2 - point1).Length;
anchorLine.Rotation = MathHelper.RadiansToDegrees(MathF.Atan2(point2.Y - point1.Y, point2.X - point1.X));
}
}
} }