Simplify direction parameter in GenerateCircularSlide

LumpBloom7 · Jul 23, 2020 · 7fb071b · 7fb071b
1 parent d29af06
commit 7fb071b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneCircleSlide.cs b/osu.Game.Rulesets.Sentakki.Tests/Objects/Slides/TestSceneCircleSlide.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Sentakki.Objects;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Sentakki.Tests.Objects.Slides
 {
@@ -15,6 +16,6 @@ public TestSceneCircleSlide()
                 RefreshSlide();
             });
         }
-        protected override SentakkiSlidePath CreatePattern() => SlidePaths.GenerateCirclePattern(EndPath, clockwise ? 1 : -1);
+        protected override SentakkiSlidePath CreatePattern() => SlidePaths.GenerateCirclePattern(EndPath, clockwise ? RotationDirection.Clockwise : RotationDirection.CounterClockwise);
     }
 }
diff --git a/osu.Game.Rulesets.Sentakki/Objects/SlideData.cs b/osu.Game.Rulesets.Sentakki/Objects/SlideData.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using osuTK;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Sentakki.UI;
@@ -18,14 +19,14 @@ public static class SlidePaths
             GenerateCirclePattern(5),
             GenerateCirclePattern(6),
             GenerateCirclePattern(7),
-            GenerateCirclePattern(0,-1),
-            GenerateCirclePattern(1,-1),
-            GenerateCirclePattern(2,-1),
-            GenerateCirclePattern(3,-1),
-            GenerateCirclePattern(4,-1),
-            GenerateCirclePattern(5,-1),
-            GenerateCirclePattern(6,-1),
-            GenerateCirclePattern(7,-1),
+            GenerateCirclePattern(0, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(1, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(2, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(3, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(4, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(5, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(6, RotationDirection.CounterClockwise),
+            GenerateCirclePattern(7, RotationDirection.CounterClockwise),
             GenerateLPattern(2),
             GenerateLPattern(3),
             GenerateLPattern(4),
@@ -119,9 +120,9 @@ public static SentakkiSlidePath GenerateLPattern(int end)
         }
 
         // DX Circle Pattern
-        public static SentakkiSlidePath GenerateCirclePattern(int end, int rotation = +1)
+        public static SentakkiSlidePath GenerateCirclePattern(int end, RotationDirection direction = RotationDirection.Clockwise)
         {
-            float centre = (0.GetRotationForLane() + end.GetRotationForLane()) / 2 + (rotation < 0 ? 180 : 0);
+            float centre = (0.GetRotationForLane() + end.GetRotationForLane()) / 2 + (direction == RotationDirection.CounterClockwise ? 180 : 0);
             Vector2 centreNode = SentakkiExtensions.GetCircularPosition(SentakkiPlayfield.INTERSECTDISTANCE, centre == 0.GetRotationForLane() ? centre + 180 : centre);
 
             List<PathControlPoint> SlidePath = new List<PathControlPoint> {