sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Unify and simplify input handling code

Browse Source
This commit is contained in:
Dean Herbert 2022-09-09 15:28:40 +09:00
parent e6ba95ee16
commit ba951b76f7
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
osu.Game.Rulesets.Catch/UI/CatchTouchInputMapper.cs
View File

@ -2,7 +2,6 @@
// 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 System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -108,40 +107,30 @@ namespace osu.Game.Rulesets.Catch.UI
return handleDown(e.Button, e.ScreenSpaceMousePosition); return handleDown(e.Button, e.ScreenSpaceMousePosition);
} }
protected override void OnMouseUp(MouseUpEvent e) protected override bool OnTouchDown(TouchDownEvent e)
{ {
handleUp(e.Button); handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position);
base.OnMouseUp(e); return true;
} }
protected override bool OnMouseMove(MouseMoveEvent e) protected override bool OnMouseMove(MouseMoveEvent e)
{ {
Show(); // multiple mouse buttons may be pressed and handling the same action.
foreach (MouseButton button in e.PressedButtons)
TouchCatchAction touchCatchAction = getTouchCatchActionFromInput(e.ScreenSpaceMousePosition); handleMove(button, e.ScreenSpaceMousePosition);
// Loop through the buttons to avoid keeping a button pressed if both mouse buttons are pressed.
foreach (MouseButton i in e.PressedButtons)
trackedActionSources[i] = touchCatchAction;
calculateActiveKeys();
return true; return true;
} }
protected override void OnTouchMove(TouchMoveEvent e) protected override void OnTouchMove(TouchMoveEvent e)
{ {
Show(); handleMove(e.Touch.Source, e.ScreenSpaceTouch.Position);
trackedActionSources[e.Touch.Source] = getTouchCatchActionFromInput(e.ScreenSpaceTouch.Position);
calculateActiveKeys();
base.OnTouchMove(e); base.OnTouchMove(e);
} }
protected override bool OnTouchDown(TouchDownEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
handleDown(e.Touch.Source, e.ScreenSpaceTouch.Position); handleUp(e.Button);
return true; base.OnMouseUp(e);
} }
protected override void OnTouchUp(TouchUpEvent e) protected override void OnTouchUp(TouchUpEvent e)
@ -150,15 +139,23 @@ namespace osu.Game.Rulesets.Catch.UI
base.OnTouchUp(e); base.OnTouchUp(e);
} }
private bool handleDown(object inputSource, Vector2 position) private void handleMove(object inputSource, Vector2 screenSpaceInputPosition)
{ {
TouchCatchAction catchAction = getTouchCatchActionFromInput(position); Show();
if (catchAction == TouchCatchAction.None) trackedActionSources[inputSource] = getTouchCatchActionFromInput(screenSpaceInputPosition);
updatePressedActions();
}
private bool handleDown(object inputSource, Vector2 screenSpaceInputPosition)
{
TouchCatchAction action = getTouchCatchActionFromInput(screenSpaceInputPosition);
if (action == TouchCatchAction.None)
return false; return false;
trackedActionSources[inputSource] = catchAction; trackedActionSources[inputSource] = action;
calculateActiveKeys(); updatePressedActions();
return true; return true;
} }
@ -166,10 +163,10 @@ namespace osu.Game.Rulesets.Catch.UI
private void handleUp(object source) private void handleUp(object source)
{ {
if (trackedActionSources.Remove(source)) if (trackedActionSources.Remove(source))
calculateActiveKeys(); updatePressedActions();
} }
private void calculateActiveKeys() private void updatePressedActions()
{ {
if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft)) if (trackedActionSources.ContainsValue(TouchCatchAction.DashLeft) || trackedActionSources.ContainsValue(TouchCatchAction.MoveLeft))
keyBindingContainer.TriggerPressed(CatchAction.MoveLeft); keyBindingContainer.TriggerPressed(CatchAction.MoveLeft);
@ -187,15 +184,15 @@ namespace osu.Game.Rulesets.Catch.UI
keyBindingContainer.TriggerReleased(CatchAction.Dash); keyBindingContainer.TriggerReleased(CatchAction.Dash);
} }
private TouchCatchAction getTouchCatchActionFromInput(Vector2 inputPosition) private TouchCatchAction getTouchCatchActionFromInput(Vector2 screenSpaceInputPosition)
{ {
if (leftDashBox.Contains(inputPosition)) if (leftDashBox.Contains(screenSpaceInputPosition))
return TouchCatchAction.DashLeft; return TouchCatchAction.DashLeft;
if (rightDashBox.Contains(inputPosition)) if (rightDashBox.Contains(screenSpaceInputPosition))
return TouchCatchAction.DashRight; return TouchCatchAction.DashRight;
if (leftBox.Contains(inputPosition)) if (leftBox.Contains(screenSpaceInputPosition))
return TouchCatchAction.MoveLeft; return TouchCatchAction.MoveLeft;
if (rightBox.Contains(inputPosition)) if (rightBox.Contains(screenSpaceInputPosition))
return TouchCatchAction.MoveRight; return TouchCatchAction.MoveRight;
return TouchCatchAction.None; return TouchCatchAction.None;