h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 12:35:34 +08:00
Code Issues Releases Wiki Activity

Fix spinner not handling left/right action bindings

Browse Source
This commit is contained in:
Shane Woolcock 2017-08-15 16:42:26 +09:30
parent 384b8c0600
commit 9e5deb63d1
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -5,13 +5,14 @@ using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
public class SpinnerDisc : CircularContainer, IHasAccentColour
public class SpinnerDisc : CircularContainer, IHasAccentColour, IKeyBindingHandler<OsuAction>
{
private readonly Spinner spinner;
@ -66,26 +67,53 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
}
}
private void updateTracking()
{
Tracking = mouseHasMainButtonPressed || actionLeftButtonPressed || actionRightButtonPressed;
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
Tracking |= state.Mouse.HasMainButtonPressed;
mouseHasMainButtonPressed |= state.Mouse.HasMainButtonPressed;
updateTracking();
return base.OnMouseDown(state, args);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
Tracking &= state.Mouse.HasMainButtonPressed;
mouseHasMainButtonPressed &= state.Mouse.HasMainButtonPressed;
updateTracking();
return base.OnMouseUp(state, args);
}
protected override bool OnMouseMove(InputState state)
{
Tracking |= state.Mouse.HasMainButtonPressed;
mouseHasMainButtonPressed |= state.Mouse.HasMainButtonPressed;
mousePosition = Parent.ToLocalSpace(state.Mouse.NativeState.Position);
updateTracking();
return base.OnMouseMove(state);
}
public bool OnPressed(OsuAction action)
{
actionLeftButtonPressed |= action == OsuAction.LeftButton;
actionRightButtonPressed |= action == OsuAction.RightButton;
updateTracking();
return false;
}
public bool OnReleased(OsuAction action)
{
actionLeftButtonPressed &= action == OsuAction.LeftButton;
actionRightButtonPressed &= action == OsuAction.RightButton;
updateTracking();
return false;
}
private Vector2 mousePosition;
private bool mouseHasMainButtonPressed;
private bool actionLeftButtonPressed;
private bool actionRightButtonPressed;
private float lastAngle;
private float currentRotation;