#31 Fix incomplete handling of custom super-geometry

artem-ogre · Mar 11, 2021 · 01f40d5 · 01f40d5
1 parent a98f17f
commit 01f40d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/CDT/include/CDT.h b/CDT/include/CDT.h
@@ -55,11 +55,10 @@ struct CDT_EXPORT SuperGeometryType
     enum Enum
     {
         SuperTriangle, ///< conventional super-triangle
-        Custom, ///< user-specified custom geometry (e.g., grid)
+        Custom,        ///< user-specified custom geometry (e.g., grid)
     };
 };
 
-
 /// Constant representing no valid neighbor for a triangle
 const static TriInd noNeighbor(std::numeric_limits<std::size_t>::max());
 /// Constant representing no valid vertex for a triangle
@@ -131,7 +130,11 @@ class CDT_EXPORT Triangulation
         TGetEdgeVertexEnd getEnd);
     /// Insert constraints (fixed edges) into triangulation
     void insertEdges(const std::vector<Edge>& edges);
-    /// Erase triangles adjacent to super triangle
+    /**
+     * Erase triangles adjacent to super triangle
+     *
+     * @note does nothing if custom geometry is used
+     */
     void eraseSuperTriangle();
     /// Erase triangles outside of constrained boundary using growing
     void eraseOuterTriangles();
@@ -201,7 +204,7 @@ class CDT_EXPORT Triangulation
     TriInd addTriangle(); // note: invalidates triangle iterators!
     void makeDummy(const TriInd iT);
     void eraseDummies();
-    void eraseSuperTriangleVertices();
+    void eraseSuperTriangleVertices(); // no effect if custom geometry is used
     template <typename TriIndexIter>
     void eraseTrianglesAtIndices(TriIndexIter first, TriIndexIter last);
     TriIndUSet growToBoundary(std::stack<TriInd> seeds) const;

diff --git a/CDT/include/CDT.hpp b/CDT/include/CDT.hpp
@@ -91,6 +91,8 @@ void Triangulation<T>::eraseDummies()
 template <typename T>
 void Triangulation<T>::eraseSuperTriangleVertices()
 {
+    if(m_superGeomType != SuperGeometryType::SuperTriangle)
+        return;
     for(TriangleVec::iterator t = triangles.begin(); t != triangles.end(); ++t)
         for(Index i(0); i < Index(3); ++i)
             t->vertices[i] -= 3;
@@ -110,6 +112,8 @@ void Triangulation<T>::eraseSuperTriangleVertices()
 template <typename T>
 void Triangulation<T>::eraseSuperTriangle()
 {
+    if(m_superGeomType != SuperGeometryType::SuperTriangle)
+        return;
     // make dummy triangles adjacent to super-triangle's vertices
     for(TriInd iT(0); iT < TriInd(triangles.size()); ++iT)
     {
@@ -171,6 +175,7 @@ void Triangulation<T>::initializedWithCustomSuperGeometry()
     }
 #endif
     m_nTargetVerts = vertices.size();
+    m_superGeomType = SuperGeometryType::Custom;
 }
 
 template <typename T>