RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant parameter in `DrumSegment` constructor

This commit is contained in:
Dean Herbert 2023-02-03 16:37:02 +09:00
parent ffbaf453f8
commit bc02fb0e32
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Taiko/UI/DrumTouchInputArea.cs
View File

@ -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;