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

Revert "getTaikoActionFromDrumSegment and getColorFromTaikoAction are now run from within QuarterCircle constructor" 

This reverts commit 985b126cba.
I really don't think this is going to work cleanly
This commit is contained in:
OpenSauce 2023-01-12 17:20:07 +00:00
parent 985b126cba
commit 767c3cb523
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ public partial class DrumTouchInputArea : VisibilityContainer
private QuarterCircle leftRim = null!; private QuarterCircle leftRim = null!;
private QuarterCircle rightRim = null!; private QuarterCircle rightRim = null!;
private static readonly Bindable<TaikoTouchControlScheme> configTouchControlScheme = new Bindable<TaikoTouchControlScheme>(); private readonly Bindable<TaikoTouchControlScheme> configTouchControlScheme = new Bindable<TaikoTouchControlScheme>();
[Resolved] [Resolved]
private OsuColour colours { get; set; } = null!; private OsuColour colours { get; set; } = null!;
@ -79,27 +79,27 @@ private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
leftRim = new QuarterCircle(0, colours) leftRim = new QuarterCircle(getTaikoActionFromDrumSegment(0), getColourFromTaikoAction(getTaikoActionFromDrumSegment(0)))
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
X = -2, X = -2,
}, },
leftCentre = new QuarterCircle(1, colours) leftCentre = new QuarterCircle(getTaikoActionFromDrumSegment(1), getColourFromTaikoAction(getTaikoActionFromDrumSegment(1)))
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
X = -2, X = -2,
Scale = new Vector2(centre_region), Scale = new Vector2(centre_region),
}, },
rightRim = new QuarterCircle(3, colours) rightRim = new QuarterCircle(getTaikoActionFromDrumSegment(3), getColourFromTaikoAction(getTaikoActionFromDrumSegment(3)))
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
X = 2, X = 2,
Rotation = 90, Rotation = 90,
}, },
rightCentre = new QuarterCircle(2, colours) rightCentre = new QuarterCircle(getTaikoActionFromDrumSegment(2), getColourFromTaikoAction(getTaikoActionFromDrumSegment(2)))
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
@ -114,7 +114,7 @@ private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager
}; };
} }
private static readonly TaikoAction[,] mappedTaikoAction = private readonly TaikoAction[,] mappedTaikoAction =
{ {
{ {
// KDDK // KDDK
@ -139,7 +139,7 @@ private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager
} }
}; };
private static TaikoAction getTaikoActionFromDrumSegment(int drumSegment) private TaikoAction getTaikoActionFromDrumSegment(int drumSegment)
{ {
return mappedTaikoAction[(int)configTouchControlScheme.Value, drumSegment]; return mappedTaikoAction[(int)configTouchControlScheme.Value, drumSegment];
} }
@ -210,35 +210,36 @@ protected override void PopOut()
mainContent.FadeOut(300); mainContent.FadeOut(300);
} }
private Color4 getColourFromTaikoAction(TaikoAction handledAction)
{
switch (handledAction)
{
case TaikoAction.LeftRim:
case TaikoAction.RightRim:
return colours.Blue;
case TaikoAction.LeftCentre:
case TaikoAction.RightCentre:
return colours.Red;
}
throw new ArgumentOutOfRangeException();
}
private partial class QuarterCircle : CompositeDrawable, IKeyBindingHandler<TaikoAction> private partial class QuarterCircle : CompositeDrawable, IKeyBindingHandler<TaikoAction>
{ {
private readonly Circle overlay; private readonly Circle overlay;
private readonly int drumSegment; private readonly TaikoAction handledAction;
private readonly TaikoAction taikoAction;
private readonly OsuColour colours;
private readonly Color4 colour;
private readonly Circle circle; private readonly Circle circle;
public override bool Contains(Vector2 screenSpacePos) => circle.Contains(screenSpacePos); public override bool Contains(Vector2 screenSpacePos) => circle.Contains(screenSpacePos);
public QuarterCircle(int drumSegment, OsuColour colours) public QuarterCircle(TaikoAction handledAction, Color4 colour)
{ {
this.drumSegment = drumSegment; this.handledAction = handledAction;
this.colours = colours;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
FillMode = FillMode.Fit; FillMode = FillMode.Fit;
taikoAction = getTaikoActionFromDrumSegment(drumSegment);
colour = getColorFromTaikoAction(taikoAction);
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Container new Container
@ -267,30 +268,16 @@ public QuarterCircle(int drumSegment, OsuColour colours)
}; };
} }
private Color4 getColorFromTaikoAction(TaikoAction handledAction)
{
switch (handledAction)
{
case TaikoAction.LeftRim:
case TaikoAction.RightRim:
return colours.Blue;
case TaikoAction.LeftCentre:
case TaikoAction.RightCentre:
return colours.Red;
}
throw new ArgumentOutOfRangeException();
}
public bool OnPressed(KeyBindingPressEvent<TaikoAction> e) public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
{ {
if (e.Action == taikoAction) if (e.Action == handledAction)
overlay.FadeTo(1f, 80, Easing.OutQuint); overlay.FadeTo(1f, 80, Easing.OutQuint);
return false; return false;
} }
public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e) public void OnReleased(KeyBindingReleaseEvent<TaikoAction> e)
{ {
if (e.Action == taikoAction) if (e.Action == handledAction)
overlay.FadeOut(1000, Easing.OutQuint); overlay.FadeOut(1000, Easing.OutQuint);
} }
} }