From fe175e72a9eb5d8e98f03a1a18ff4385c340fe90 Mon Sep 17 00:00:00 2001 From: itsMapleLeaf <19603573+itsMapleLeaf@users.noreply.github.com> Date: Tue, 31 Jan 2023 19:52:58 -0600 Subject: [PATCH] make upscroll make sense --- .../Skinning/Argon/ArgonHoldNoteTailPiece.cs | 23 +++++++++++++------ .../Skinning/Argon/ArgonNotePiece.cs | 2 ++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs index 326f25f3bd..c07322262f 100644 --- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs +++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonHoldNoteTailPiece.cs @@ -30,6 +30,9 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon { container = new Container { + Anchor = Anchor.BottomCentre, + Origin = Anchor.BottomCentre, + RelativeSizeAxes = Axes.Both, Height = 0.5f, @@ -44,14 +47,23 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon Colour = Colour4.Black, Alpha = 0.4f, }, - new Circle + new Container { + CornerRadius = ArgonNotePiece.CORNER_RADIUS, + Masking = true, RelativeSizeAxes = Axes.Both, Height = 1 - ArgonNotePiece.NOTE_ACCENT_RATIO, Anchor = Anchor.TopCentre, Origin = Anchor.TopCentre, - Colour = Colour4.Black, - Alpha = 0.3f, + Children = new Drawable[] + { + new Box + { + RelativeSizeAxes = Axes.Both, + Colour = Colour4.Black, + Alpha = 0.3f, + } + } }, }, } @@ -67,10 +79,7 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon private void onDirectionChanged(ValueChangedEvent direction) { - container.Anchor = container.Origin = - direction.NewValue == ScrollingDirection.Down - ? Anchor.BottomCentre - : Anchor.TopCentre; + Scale = new osuTK.Vector2(1, direction.NewValue == ScrollingDirection.Up ? -1 : 1); } } } diff --git a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs index f680483634..2a5bce255c 100644 --- a/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs +++ b/osu.Game.Rulesets.Mania/Skinning/Argon/ArgonNotePiece.cs @@ -95,6 +95,8 @@ namespace osu.Game.Rulesets.Mania.Skinning.Argon colouredBox.Anchor = colouredBox.Origin = direction.NewValue == ScrollingDirection.Up ? Anchor.TopCentre : Anchor.BottomCentre; + + Scale = new Vector2(1, direction.NewValue == ScrollingDirection.Up ? -1 : 1); } private void onAccentChanged(ValueChangedEvent accent)