From b11fd7972aafea70905a1f0f73addffe82442d91 Mon Sep 17 00:00:00 2001
From: Naxess <30292137+Naxesss@users.noreply.github.com>
Date: Mon, 22 Mar 2021 19:41:48 +0100
Subject: [PATCH] Separate condition logic from math logic

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 27 ++++++++++---------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 23511be5e4..ae08660404 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -199,23 +199,19 @@ namespace osu.Game.Rulesets.Objects
 
         private void updatePathTypes()
         {
-            // Updates each segment of the slider once
-            foreach (PathControlPoint controlPoint in ControlPoints.Where(p => p.Type.Value != null))
-                updatePathType(controlPoint);
+            foreach (PathControlPoint segmentStartPoint in ControlPoints.Where(p => p.Type.Value != null))
+            {
+                if (segmentStartPoint.Type.Value != PathType.PerfectCurve)
+                    continue;
+
+                Vector2[] points = PointsInSegment(segmentStartPoint).Select(p => p.Position.Value).ToArray();
+                if (points.Length == 3 && !validCircularArcSegment(points))
+                    segmentStartPoint.Type.Value = PathType.Bezier;
+            }
         }
 
-        private void updatePathType(PathControlPoint controlPoint)
+        private bool validCircularArcSegment(IReadOnlyList<Vector2> points)
         {
-            List<PathControlPoint> pointsInSegment = PointsInSegment(controlPoint);
-            PathType? pathType = pointsInSegment[0].Type.Value;
-
-            // An almost linear arrangement of points results in radius approaching infinity,
-            // we should prevent that to avoid memory exhaustion when drawing / approximating
-            if (pathType != PathType.PerfectCurve || pointsInSegment.Count != 3)
-                return;
-
-            Vector2[] points = pointsInSegment.Select(point => point.Position.Value).ToArray();
-
             Vector2 a = points[0];
             Vector2 b = points[1];
             Vector2 c = points[2];
@@ -238,8 +234,7 @@ namespace osu.Game.Rulesets.Objects
             bool exterior = abSq > acSq || bcSq > acSq;
             float threshold = exterior ? 0.05f : 0.001f;
 
-            if (Math.Abs(det) < threshold)
-                pointsInSegment[0].Type.Value = PathType.Bezier;
+            return Math.Abs(det) < threshold;
         }
 
         private void invalidate()