From eaac4fe6c7b76bfef30d37bd7f15b6eb8d0cdccc Mon Sep 17 00:00:00 2001
From: Justus Franklin Tumacder <justusft@gmail.com>
Date: Sun, 25 Apr 2021 06:38:15 +0800
Subject: [PATCH] Simplify FindSnap method

---
 osu.Game.Rulesets.Mania/Utils/SnapFinder.cs | 49 ++++-----------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
index 83df0eb756..ed3bd4af05 100644
--- a/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
+++ b/osu.Game.Rulesets.Mania/Utils/SnapFinder.cs
@@ -18,51 +18,20 @@ namespace osu.Game.Rulesets.Mania.Utils
             this.beatmap = beatmap;
         }
 
+        private readonly static int[] snaps = { 1, 2, 3, 4, 6, 8, 12, 16 };
+
         public int FindSnap(HitObject hitObject)
         {
             TimingControlPoint currentTimingPoint = beatmap.ControlPointInfo.TimingPointAt(hitObject.StartTime);
-            double startTime = currentTimingPoint.Time;
-            double secondsPerFourCounts = currentTimingPoint.BeatLength * 4;
+            double snapResult = (hitObject.StartTime - currentTimingPoint.Time) % (currentTimingPoint.BeatLength * 4);
 
-            double offset = startTime % secondsPerFourCounts;
-            double snapResult = hitObject.StartTime % secondsPerFourCounts - offset;
+            foreach (var snap in snaps)
+            {
+                if (almostDivisibleBy(snapResult, currentTimingPoint.BeatLength / (double)snap))
+                    return snap;
+            }
 
-            if (almostDivisibleBy(snapResult, secondsPerFourCounts / 4.0))
-            {
-                return 1;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 8.0))
-            {
-                return 2;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 12.0))
-            {
-                return 3;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 16.0))
-            {
-                return 4;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 24.0))
-            {
-                return 6;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 32.0))
-            {
-                return 8;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 48.0))
-            {
-                return 12;
-            }
-            else if (almostDivisibleBy(snapResult, secondsPerFourCounts / 64.0))
-            {
-                return 16;
-            }
-            else
-            {
-                return 0;
-            }
+            return 0;
         }
 
         private const double leniency_ms = 1.0;