refactor: refinement internal methods

This refactor is part of a series of changes preparing for the introduction of a dynamic point insertion utility.
andywiecko · Oct 13, 2024 · 8212ccf · 8212ccf
1 parent 57bad49
commit 8212ccf
Showing 1 changed file with 30 additions and 39 deletions.
diff --git a/Runtime/Triangulator.cs b/Runtime/Triangulator.cs
@@ -2876,32 +2876,23 @@ private void RecalculateBadTriangles(T2 p)
             {
                 while (trianglesQueue.TryDequeue(out var tId))
                 {
-                    VisitEdge(p, 3 * tId + 0);
-                    VisitEdge(p, 3 * tId + 1);
-                    VisitEdge(p, 3 * tId + 2);
-                }
-            }
-
-            private void VisitEdge(T2 p, int t0)
-            {
-                var he = halfedges[t0];
-                if (he == -1 || constrainedHalfedges[he])
-                {
-                    return;
-                }
-
-                var otherId = he / 3;
-                if (visitedTriangles[otherId])
-                {
-                    return;
-                }
+                    for (int i = 0; i < 3; i++)
+                    {
+                        var he = halfedges[3 * tId + i];
+                        var otherId = he / 3;
+                        if (he == -1 || constrainedHalfedges[he] || visitedTriangles[otherId])
+                        {
+                            continue;
+                        }
 
-                var circle = circles[otherId];
-                if (utils.le(utils.Cast(utils.distancesq(circle.Center, p)), circle.RadiusSq))
-                {
-                    badTriangles.Add(otherId);
-                    trianglesQueue.Enqueue(otherId);
-                    visitedTriangles[otherId] = true;
+                        var circle = circles[otherId];
+                        if (utils.le(utils.Cast(utils.distancesq(circle.Center, p)), circle.RadiusSq))
+                        {
+                            badTriangles.Add(otherId);
+                            trianglesQueue.Enqueue(otherId);
+                            visitedTriangles[otherId] = true;
+                        }
+                    }
                 }
             }
 
@@ -2979,6 +2970,17 @@ private void BuildStarPolygon()
 
             private void ProcessBadTriangles(NativeList<int> heQueue, NativeList<int> tQueue)
             {
+                static void RemoveHalfedge(NativeList<int> halfedges, int he, int offset)
+                {
+                    var ohe = halfedges[he];
+                    var o = ohe > he ? ohe - offset : ohe;
+                    if (o > -1)
+                    {
+                        halfedges[o] = -1;
+                    }
+                    halfedges.RemoveAt(he);
+                }
+
                 // Remove bad triangles and recalculate polygon path halfedges.
                 badTriangles.Sort();
                 for (int t = badTriangles.Length - 1; t >= 0; t--)
@@ -2988,9 +2990,9 @@ private void ProcessBadTriangles(NativeList<int> heQueue, NativeList<int> tQueue
                     triangles.RemoveAt(3 * tId + 1);
                     triangles.RemoveAt(3 * tId + 0);
                     circles.RemoveAt(tId);
-                    RemoveHalfedge(3 * tId + 2, 0);
-                    RemoveHalfedge(3 * tId + 1, 1);
-                    RemoveHalfedge(3 * tId + 0, 2);
+                    RemoveHalfedge(halfedges, 3 * tId + 2, 0);
+                    RemoveHalfedge(halfedges, 3 * tId + 1, 1);
+                    RemoveHalfedge(halfedges, 3 * tId + 0, 2);
                     constrainedHalfedges.RemoveAt(3 * tId + 2);
                     constrainedHalfedges.RemoveAt(3 * tId + 1);
                     constrainedHalfedges.RemoveAt(3 * tId + 0);
@@ -3053,17 +3055,6 @@ private void ProcessBadTriangles(NativeList<int> heQueue, NativeList<int> tQueue
                 }
             }
 
-            private void RemoveHalfedge(int he, int offset)
-            {
-                var ohe = halfedges[he];
-                var o = ohe > he ? ohe - offset : ohe;
-                if (o > -1)
-                {
-                    halfedges[o] = -1;
-                }
-                halfedges.RemoveAt(he);
-            }
-
             private void BuildNewTrianglesForStar(int pId, NativeList<int> heQueue, NativeList<int> tQueue)
             {
                 // Build triangles/circles for inserted point pId.