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

Combine touch and mouse handling into single path

Browse Source
This commit is contained in:
Dean Herbert
2022-07-22 17:02:58 +09:00
parent b604eb6262
commit bd6ff40b43
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs
View File

@ -8,18 +8,18 @@ using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.Taiko.Replays;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Input.Handlers; using osu.Game.Input.Handlers;
using osu.Game.Replays; using osu.Game.Replays;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Taiko.Objects;
using osu.Game.Rulesets.Taiko.Replays;
using osu.Game.Rulesets.Timing; using osu.Game.Rulesets.Timing;
using osu.Game.Rulesets.UI;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Skinning; using osu.Game.Skinning;

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

@ -7,13 +7,11 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Rulesets.Taiko.UI namespace osu.Game.Rulesets.Taiko.UI
{ {
@ -26,8 +24,7 @@ namespace osu.Game.Rulesets.Taiko.UI
private KeyBindingContainer<TaikoAction> keyBindingContainer = null!; private KeyBindingContainer<TaikoAction> keyBindingContainer = null!;
private readonly Dictionary<TouchSource, TaikoAction> trackedTouches = new Dictionary<TouchSource, TaikoAction>(); private readonly Dictionary<object, TaikoAction> trackedActions = new Dictionary<object, TaikoAction>();
private readonly Dictionary<MouseButton, TaikoAction> trackedMouseButtons = new Dictionary<MouseButton, TaikoAction>();
private readonly Container mainContent; private readonly Container mainContent;
@ -87,46 +84,51 @@ namespace osu.Game.Rulesets.Taiko.UI
outerCircle.Colour = colours.Gray0; outerCircle.Colour = colours.Gray0;
} }
protected override bool OnKeyDown(KeyDownEvent e)
{
// Hide whenever the keyboard is used.
mainContent.Hide();
return false;
}
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)
{ {
mainContent.Show(); handleDown(e.Button, e.ScreenSpaceMousePosition);
TaikoAction taikoAction = getTaikoActionFromInput(e.ScreenSpaceMouseDownPosition);
trackedMouseButtons.Add(e.Button, taikoAction);
keyBindingContainer.TriggerPressed(taikoAction);
return true; return true;
} }
protected override void OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
keyBindingContainer.TriggerReleased(trackedMouseButtons[e.Button]); handleUp(e.Button);
trackedMouseButtons.Remove(e.Button);
base.OnMouseUp(e); base.OnMouseUp(e);
} }
protected override bool OnTouchDown(TouchDownEvent e) protected override bool OnTouchDown(TouchDownEvent e)
{ {
mainContent.Show(); handleDown(e.Touch.Source, e.ScreenSpaceTouchDownPosition);
TaikoAction taikoAction = getTaikoActionFromInput(e.ScreenSpaceTouchDownPosition);
trackedTouches.Add(e.Touch.Source, taikoAction);
keyBindingContainer.TriggerPressed(taikoAction);
return true; return true;
} }
protected override void OnTouchUp(TouchUpEvent e) protected override void OnTouchUp(TouchUpEvent e)
{ {
keyBindingContainer.TriggerReleased(trackedTouches[e.Touch.Source]); handleUp(e.Touch.Source);
trackedTouches.Remove(e.Touch.Source);
base.OnTouchUp(e); base.OnTouchUp(e);
} }
protected override bool OnKeyDown(KeyDownEvent e) private void handleDown(object source, Vector2 position)
{ {
mainContent.Hide(); mainContent.Show();
return false;
TaikoAction taikoAction = getTaikoActionFromInput(position);
trackedActions.Add(source, taikoAction);
keyBindingContainer.TriggerPressed(taikoAction);
}
private void handleUp(object source)
{
keyBindingContainer.TriggerReleased(trackedActions[source]);
trackedActions.Remove(source);
} }
private TaikoAction getTaikoActionFromInput(Vector2 inputPosition) private TaikoAction getTaikoActionFromInput(Vector2 inputPosition)