Move GameplayCursor to osu! ruleset and make work with OsuActions

osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs

@@ -1,22 +1,22 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.OpenGL.Buffers;
+using osu.Framework.Graphics.OpenGL.Vertices;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
-using OpenTK;
-using System;
-using osu.Framework.Graphics.OpenGL.Buffers;
-using OpenTK.Graphics.ES30;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Timing;
-using System.Diagnostics;
+using OpenTK;
-using osu.Framework.Graphics.OpenGL.Vertices;
+using OpenTK.Graphics.ES30;
 
-namespace osu.Game.Graphics.Cursor
+namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
     internal class CursorTrail : Drawable
     {

osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using OpenTK;
-using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions.Color4Extensions;
@@ -13,8 +11,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using OpenTK;
+using OpenTK.Graphics;
 
-namespace osu.Game.Graphics.Cursor
+namespace osu.Game.Rulesets.Osu.UI.Cursor
 {
     public class GameplayCursor : CursorContainer
     {
@@ -25,18 +25,40 @@ namespace osu.Game.Graphics.Cursor
             Add(new CursorTrail { Depth = 1 });
         }
 
-        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        private int downCount;
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
-            ActiveCursor.Scale = new Vector2(1);
+            if (state.Data is OsuAction)
-            ActiveCursor.ScaleTo(1.2f, 100, Easing.OutQuad);
+            {
-            return base.OnMouseDown(state, args);
+                switch ((OsuAction)state.Data)
+                {
+                    case OsuAction.LeftButton:
+                    case OsuAction.RightButton:
+                        downCount++;
+                        ActiveCursor.ScaleTo(1).ScaleTo(1.2f, 100, Easing.OutQuad);
+                        break;
+                }
             }
 
-        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+            return false;
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
         {
-            if (!state.Mouse.HasMainButtonPressed)
+            if (state.Data is OsuAction)
+            {
+                switch ((OsuAction)state.Data)
+                {
+                    case OsuAction.LeftButton:
+                    case OsuAction.RightButton:
+                        if (--downCount == 0)
                             ActiveCursor.ScaleTo(1, 200, Easing.OutQuad);
-            return base.OnMouseUp(state, args);
+                        break;
+                }
+            }
+
+            return false;
         }
 
         public class OsuCursor : Container

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -10,8 +10,8 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
 using osu.Game.Rulesets.UI;
 using System.Linq;
-using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Game.Rulesets.Osu.UI.Cursor;
 
 namespace osu.Game.Rulesets.Osu.UI
 {

osu.Game.Rulesets.Osu/osu.Game.Rulesets.Osu.csproj

@@ -78,6 +78,8 @@
     <Compile Include="OsuDifficulty\Skills\Speed.cs" />
     <Compile Include="OsuDifficulty\Utils\History.cs" />
     <Compile Include="OsuInputManager.cs" />
+    <Compile Include="UI\Cursor\CursorTrail.cs" />
+    <Compile Include="UI\Cursor\GameplayCursor.cs" />
     <Compile Include="UI\OsuSettings.cs" />
     <Compile Include="Scoring\OsuScoreProcessor.cs" />
     <Compile Include="UI\OsuRulesetContainer.cs" />

osu.Game/osu.Game.csproj

@@ -145,8 +145,6 @@
     <Compile Include="Rulesets\RulesetInfo.cs" />
     <Compile Include="Rulesets\Scoring\ScoreStore.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
-    <Compile Include="Graphics\Cursor\CursorTrail.cs" />
-    <Compile Include="Graphics\Cursor\GameplayCursor.cs" />
     <Compile Include="Graphics\IHasAccentColour.cs" />
     <Compile Include="Graphics\Sprites\OsuSpriteText.cs" />
     <Compile Include="Graphics\UserInterface\BackButton.cs" />