h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 01:42:54 +08:00
Code Issues Releases Wiki Activity

Simplify logic by considering all buttons equally

Browse Source
This commit is contained in:
Dean Herbert 2020-06-22 16:19:38 +09:00
parent 88a8e13b55
commit e91c2ee5e2
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Graphics/Cursor/MenuCursor.cs
View File

@ -13,7 +13,6 @@ using JetBrains.Annotations;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osuTK.Input;
using osu.Framework.Utils; using osu.Framework.Utils;
namespace osu.Game.Graphics.Cursor namespace osu.Game.Graphics.Cursor
@ -74,23 +73,17 @@ namespace osu.Game.Graphics.Cursor
protected override bool OnMouseDown(MouseDownEvent e) protected override bool OnMouseDown(MouseDownEvent e)
{ {
// only trigger animation for main mouse buttons // only trigger animation for main mouse buttons
if (e.Button <= MouseButton.Right) activeCursor.Scale = new Vector2(1);
{ activeCursor.ScaleTo(0.90f, 800, Easing.OutQuint);
activeCursor.Scale = new Vector2(1);
activeCursor.ScaleTo(0.90f, 800, Easing.OutQuint);
activeCursor.AdditiveLayer.Alpha = 0; activeCursor.AdditiveLayer.Alpha = 0;
activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint); activeCursor.AdditiveLayer.FadeInFromZero(800, Easing.OutQuint);
}
if (shouldKeepRotating(e)) if (cursorRotate.Value && dragRotationState != DragRotationState.Rotating)
{ {
// if cursor is already rotating don't reset its rotate origin // if cursor is already rotating don't reset its rotate origin
if (dragRotationState != DragRotationState.Rotating) dragRotationState = DragRotationState.DragStarted;
{ positionMouseDown = e.MousePosition;
dragRotationState = DragRotationState.DragStarted;
positionMouseDown = e.MousePosition;
}
} }
return base.OnMouseDown(e); return base.OnMouseDown(e);
@ -98,17 +91,16 @@ namespace osu.Game.Graphics.Cursor
protected override void OnMouseUp(MouseUpEvent e) protected override void OnMouseUp(MouseUpEvent e)
{ {
if (!anyMainButtonPressed(e)) if (!e.HasAnyButtonPressed)
{ {
activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint); activeCursor.AdditiveLayer.FadeOutFromOne(500, Easing.OutQuint);
activeCursor.ScaleTo(1, 500, Easing.OutElastic); activeCursor.ScaleTo(1, 500, Easing.OutElastic);
}
if (!shouldKeepRotating(e)) if (dragRotationState != DragRotationState.NotDragging)
{ {
if (dragRotationState == DragRotationState.Rotating)
activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf); activeCursor.RotateTo(0, 600 * (1 + Math.Abs(activeCursor.Rotation / 720)), Easing.OutElasticHalf);
dragRotationState = DragRotationState.NotDragging; dragRotationState = DragRotationState.NotDragging;
}
} }
base.OnMouseUp(e); base.OnMouseUp(e);
@ -126,10 +118,6 @@ namespace osu.Game.Graphics.Cursor
activeCursor.ScaleTo(0.6f, 250, Easing.In); activeCursor.ScaleTo(0.6f, 250, Easing.In);
} }
private bool shouldKeepRotating(MouseEvent e) => cursorRotate.Value && (anyMainButtonPressed(e));
private static bool anyMainButtonPressed(MouseEvent e) => e.IsPressed(MouseButton.Left) || e.IsPressed(MouseButton.Middle) || e.IsPressed(MouseButton.Right);
public class Cursor : Container public class Cursor : Container
{ {
private Container cursorContainer; private Container cursorContainer;