mv refineTriangles into .hpp file

artem-ogre · Oct 16, 2023 · 5921326 · 5921326
1 parent b7cf674
commit 5921326
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 87 deletions.
diff --git a/CDT/include/Triangulation.h b/CDT/include/Triangulation.h
@@ -827,93 +827,6 @@ void Triangulation<T, TNearPointLocator>::conformToEdges(
     }
     eraseDummies();
 }
-
-template <typename T, typename TNearPointLocator>
-void Triangulation<T, TNearPointLocator>::refineTriangles(
-    RefineTriangles::Enum refinementConstrain,
-    T threshold)
-{
-    if(isFinalized())
-    {
-        throw std::runtime_error("Triangulation was finalized with 'erase...' "
-                                 "method. Refinement is not possible");
-    }
-    tryInitNearestPointLocator();
-    resolveEncroachedEdges(detectEncroachedEdges());
-
-    std::queue<TriInd> badTriangles;
-    for(TriInd iT(0), n = triangles.size(); iT < n; ++iT)
-    {
-        const Triangle& t = triangles[iT];
-        if(t.vertices[0] < 3 || t.vertices[1] < 3 || t.vertices[2] < 3)
-            continue;
-
-        if(isBadTriangle(t, refinementConstrain, threshold))
-        {
-            const V2d<T> vert = circumcenter(t);
-            if(locatePointTriangle(
-                   vert, vertices[0], vertices[1], vertices[2]) !=
-               PtTriLocation::Outside)
-            {
-                badTriangles.push(iT);
-            }
-        }
-    }
-
-    while(!badTriangles.empty())
-    {
-        TriInd iT = badTriangles.front();
-        const Triangle& t = triangles[iT];
-        badTriangles.pop();
-        if(!isBadTriangle(t, refinementConstrain, threshold) ||
-           numOfSteinerPoints >= maxSteinerPoints)
-        {
-            continue;
-        }
-        const V2d<T> vert = circumcenter(t);
-        if(locatePointTriangle(vert, vertices[0], vertices[1], vertices[2]) ==
-           PtTriLocation::Outside)
-        {
-            continue;
-        }
-        TriIndVec badTris = resolveEncroachedEdges(
-                                detectEncroachedEdges(vert),
-                                vert,
-                                true,
-                                true,
-                                refinementConstrain,
-                                threshold)
-                                .first;
-
-        for(IndexSizeType i(0); i < TriInd(badTris.size()); ++i)
-        {
-            badTriangles.push(badTris[i]);
-        }
-
-        if(badTris.empty() && numOfSteinerPoints < maxSteinerPoints)
-        {
-            const VertInd iVert = static_cast<VertInd>(vertices.size());
-            addNewVertex(vert, noNeighbor, true);
-            insertVertex(iVert);
-            TriInd start = m_vertTris[iVert];
-            TriInd currTri = start;
-            do
-            {
-                const Triangle& t = triangles[currTri];
-                if(isBadTriangle(t, refinementConstrain, threshold))
-                {
-                    badTriangles.push(currTri);
-                }
-                currTri = t.next(iVert).first;
-            } while(currTri != start);
-        }
-        else
-        {
-            badTriangles.push(iT);
-        }
-    }
-}
-
 } // namespace CDT
 
 #ifndef CDT_USE_AS_COMPILED_LIBRARY

diff --git a/CDT/include/Triangulation.hpp b/CDT/include/Triangulation.hpp
@@ -2306,4 +2306,89 @@ void Triangulation<T, TNearPointLocator>::tryInitNearestPointLocator()
     }
 }
 
+template <typename T, typename TNearPointLocator>
+void Triangulation<T, TNearPointLocator>::refineTriangles(
+    RefineTriangles::Enum refinementConstrain,
+    T threshold)
+{
+    if(isFinalized())
+    {
+        throw std::runtime_error("Triangulation was finalized with 'erase...' "
+                                 "method. Refinement is not possible");
+    }
+    tryInitNearestPointLocator();
+    resolveEncroachedEdges(detectEncroachedEdges());
+
+    std::queue<TriInd> badTriangles;
+    for(TriInd iT(0), n = triangles.size(); iT < n; ++iT)
+    {
+        const Triangle& t = triangles[iT];
+        if(t.vertices[0] < 3 || t.vertices[1] < 3 || t.vertices[2] < 3)
+            continue;
+
+        if(isBadTriangle(t, refinementConstrain, threshold))
+        {
+            const V2d<T> vert = circumcenter(t);
+            if(locatePointTriangle(
+                   vert, vertices[0], vertices[1], vertices[2]) !=
+               PtTriLocation::Outside)
+            {
+                badTriangles.push(iT);
+            }
+        }
+    }
+
+    while(!badTriangles.empty())
+    {
+        TriInd iT = badTriangles.front();
+        const Triangle& t = triangles[iT];
+        badTriangles.pop();
+        if(!isBadTriangle(t, refinementConstrain, threshold) ||
+           numOfSteinerPoints >= maxSteinerPoints)
+        {
+            continue;
+        }
+        const V2d<T> vert = circumcenter(t);
+        if(locatePointTriangle(vert, vertices[0], vertices[1], vertices[2]) ==
+           PtTriLocation::Outside)
+        {
+            continue;
+        }
+        TriIndVec badTris = resolveEncroachedEdges(
+                                detectEncroachedEdges(vert),
+                                vert,
+                                true,
+                                true,
+                                refinementConstrain,
+                                threshold)
+                                .first;
+
+        for(IndexSizeType i(0); i < TriInd(badTris.size()); ++i)
+        {
+            badTriangles.push(badTris[i]);
+        }
+
+        if(badTris.empty() && numOfSteinerPoints < maxSteinerPoints)
+        {
+            const VertInd iVert = static_cast<VertInd>(vertices.size());
+            addNewVertex(vert, noNeighbor, true);
+            insertVertex(iVert);
+            TriInd start = m_vertTris[iVert];
+            TriInd currTri = start;
+            do
+            {
+                const Triangle& t = triangles[currTri];
+                if(isBadTriangle(t, refinementConstrain, threshold))
+                {
+                    badTriangles.push(currTri);
+                }
+                currTri = t.next(iVert).first;
+            } while(currTri != start);
+        }
+        else
+        {
+            badTriangles.push(iT);
+        }
+    }
+}
 } // namespace CDT