From bc02fb0e3280fd2035e26e61168457e5f3c25d9f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 3 Feb 2023 16:37:02 +0900 Subject: [PATCH] Remove redundant parameter in `DrumSegment` constructor --- .../UI/DrumTouchInputArea.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs b/osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs index cf697cf061..29ccd96675 100644 --- a/osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs +++ b/osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs @@ -71,27 +71,27 @@ private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager RelativeSizeAxes = Axes.Both, Children = new Drawable[] { - leftRim = new DrumSegment(TaikoAction.LeftRim) + leftRim = new DrumSegment { Anchor = Anchor.BottomCentre, Origin = Anchor.BottomRight, X = -2, }, - rightRim = new DrumSegment(TaikoAction.RightCentre) + rightRim = new DrumSegment { Anchor = Anchor.BottomCentre, Origin = Anchor.BottomRight, X = 2, Rotation = 90, }, - leftCentre = new DrumSegment(TaikoAction.LeftCentre) + leftCentre = new DrumSegment { Anchor = Anchor.BottomCentre, Origin = Anchor.BottomRight, X = -2, Scale = new Vector2(centre_region), }, - rightCentre = new DrumSegment(TaikoAction.RightRim) + rightCentre = new DrumSegment { Anchor = Anchor.BottomCentre, Origin = Anchor.BottomRight, @@ -192,9 +192,6 @@ private void handleUp(object source) trackedActions.Remove(source); } - private bool validMouse(MouseButtonEvent e) => - leftRim.Contains(e.ScreenSpaceMouseDownPosition) || rightRim.Contains(e.ScreenSpaceMouseDownPosition); - private TaikoAction getTaikoActionFromPosition(Vector2 inputPosition) { bool centreHit = leftCentre.Contains(inputPosition) || rightCentre.Contains(inputPosition); @@ -242,10 +239,8 @@ public TaikoAction Action public override bool Contains(Vector2 screenSpacePos) => circle.Contains(screenSpacePos); - public DrumSegment(TaikoAction action) + public DrumSegment() { - Action = action; - RelativeSizeAxes = Axes.Both; FillMode = FillMode.Fit; @@ -305,7 +300,7 @@ private void updateColoursFromAction() if (!IsLoaded) return; - var colour = getColourFromTaikoAction(action); + var colour = getColourFromTaikoAction(Action); circle.Colour = colour.Multiply(1.4f).Darken(2.8f); overlay.Colour = colour;