sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Taiko touch control scheme is now read from settings

Browse Source
This commit is contained in:
OpenSauce
2023-01-10 10:59:57 +00:00
parent ee80cc988e
commit 3785dd0136
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/Configuration/TaikoRulesetConfigManager.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Configuration.Tracking;
using System;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Rulesets.Configuration; using osu.Game.Rulesets.Configuration;

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

@ -8,6 +8,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
@ -27,6 +28,7 @@ namespace osu.Game.Rulesets.Taiko.UI
/// </summary> /// </summary>
public partial class DrumTouchInputArea : VisibilityContainer public partial class DrumTouchInputArea : VisibilityContainer
{ {
// visibility state affects our child. we always want to handle input. // visibility state affects our child. we always want to handle input.
public override bool PropagatePositionalInputSubTree => true; public override bool PropagatePositionalInputSubTree => true;
public override bool PropagateNonPositionalInputSubTree => true; public override bool PropagateNonPositionalInputSubTree => true;
@ -43,6 +45,8 @@ namespace osu.Game.Rulesets.Taiko.UI
private QuarterCircle leftRim = null!; private QuarterCircle leftRim = null!;
private QuarterCircle rightRim = null!; private QuarterCircle rightRim = null!;
private Bindable<TaikoTouchControlScheme> touchControlScheme = new Bindable<TaikoTouchControlScheme>();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager config, OsuColour colours) private void load(TaikoInputManager taikoInputManager, TaikoRulesetConfigManager config, OsuColour colours)
{ {
@ -54,7 +58,7 @@ namespace osu.Game.Rulesets.Taiko.UI
const float centre_region = 0.80f; const float centre_region = 0.80f;
var touchControlScheme = config.GetBindable<TaikoTouchControlScheme>(TaikoRulesetSetting.TouchControlScheme).Value; config.BindWith(TaikoRulesetSetting.TouchControlScheme, touchControlScheme);
Children = new Drawable[] Children = new Drawable[]
{ {
new Container new Container
@ -73,27 +77,27 @@ namespace osu.Game.Rulesets.Taiko.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
leftRim = new QuarterCircle(getTaikoActionFromInput(TaikoInput.LeftRim), touchControlScheme, colours) leftRim = new QuarterCircle(getTaikoActionFromInput(TaikoInput.LeftRim), touchControlScheme.Value, colours)
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
X = -2, X = -2,
}, },
rightRim = new QuarterCircle(getTaikoActionFromInput(TaikoInput.RightRim), touchControlScheme, colours) rightRim = new QuarterCircle(getTaikoActionFromInput(TaikoInput.RightRim), touchControlScheme.Value, colours)
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
X = 2, X = 2,
Rotation = 90, Rotation = 90,
}, },
leftCentre = new QuarterCircle(getTaikoActionFromInput(TaikoInput.LeftCentre), touchControlScheme, colours) leftCentre = new QuarterCircle(getTaikoActionFromInput(TaikoInput.LeftCentre), touchControlScheme.Value, colours)
{ {
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),
}, },
rightCentre = new QuarterCircle(getTaikoActionFromInput(TaikoInput.RightCentre), touchControlScheme, colours) rightCentre = new QuarterCircle(getTaikoActionFromInput(TaikoInput.RightCentre), touchControlScheme.Value, colours)
{ {
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
@ -153,10 +157,10 @@ namespace osu.Game.Rulesets.Taiko.UI
#pragma warning disable format #pragma warning disable format
private TaikoAction getTaikoActionFromInput(TaikoInput input) private TaikoAction getTaikoActionFromInput(TaikoInput input)
{ {
switch (TaikoTouchControlScheme.DDKK) switch (touchControlScheme.Value)
{ {
case TaikoTouchControlScheme.KDDK: case TaikoTouchControlScheme.KDDK:
#pragma warning disable CS0162 // Unreachable code detected
switch (input) switch (input)
{ {
case TaikoInput.LeftRim: return TaikoAction.LeftRim; case TaikoInput.LeftRim: return TaikoAction.LeftRim;
@ -164,7 +168,6 @@ namespace osu.Game.Rulesets.Taiko.UI
case TaikoInput.RightCentre: return TaikoAction.RightCentre; case TaikoInput.RightCentre: return TaikoAction.RightCentre;
case TaikoInput.RightRim: return TaikoAction.RightRim; case TaikoInput.RightRim: return TaikoAction.RightRim;
} }
#pragma warning restore CS0162 // Unreachable code detected
break; break;
case TaikoTouchControlScheme.DDKK: case TaikoTouchControlScheme.DDKK:
@ -178,7 +181,6 @@ namespace osu.Game.Rulesets.Taiko.UI
break; break;
case TaikoTouchControlScheme.KKDD: case TaikoTouchControlScheme.KKDD:
#pragma warning disable CS0162 // Unreachable code detected
switch (input) switch (input)
{ {
case TaikoInput.LeftRim: return TaikoAction.LeftRim; case TaikoInput.LeftRim: return TaikoAction.LeftRim;
@ -186,7 +188,6 @@ namespace osu.Game.Rulesets.Taiko.UI
case TaikoInput.RightCentre: return TaikoAction.LeftCentre; case TaikoInput.RightCentre: return TaikoAction.LeftCentre;
case TaikoInput.RightRim: return TaikoAction.RightCentre; case TaikoInput.RightRim: return TaikoAction.RightCentre;
} }
#pragma warning restore CS0162 // Unreachable code detected
break; break;
} }
return TaikoAction.LeftCentre; return TaikoAction.LeftCentre;