fix(SurfaceMesh): wrong polygon_adjacent_edge when polygon is degenerated

Author: BotellaA

src/geode/mesh/core/surface_mesh.cpp

@@ -274,10 +274,10 @@ namespace geode
     public:
         Impl( SurfaceMesh& surface )
             : polygon_around_vertex_(
-                surface.vertex_attribute_manager()
-                    .template find_or_create_attribute< VariableAttribute,
-                        PolygonVertex >(
-                        "polygon_around_vertex", PolygonVertex{} ) ),
+                  surface.vertex_attribute_manager()
+                      .template find_or_create_attribute< VariableAttribute,
+                          PolygonVertex >(
+                          "polygon_around_vertex", PolygonVertex{} ) ),
               polygons_around_vertex_(
                   surface.vertex_attribute_manager()
                       .template find_or_create_attribute< VariableAttribute,
@@ -675,26 +675,23 @@ namespace geode
         const auto v1 = polygon_edge_vertex( polygon_edge, 1 );
         const auto adj_vertices = polygon_vertices( polygon_adj_id );
         const auto nb_edges = adj_vertices.size();
+        std::vector< PolygonEdge > failed_edges;
         for( const auto e : LRange{ nb_edges } )
         {
+            const PolygonEdge polygon_adj_edge{ polygon_adj_id, e };
             if( v0 == adj_vertices[e] )
             {
                 const auto enext = e == nb_edges - 1
                                        ? 0u
                                        : static_cast< local_index_t >( e + 1 );
                 if( v1 == adj_vertices[enext] )
                 {
-                    OPENGEODE_EXCEPTION(
-                        polygon_adjacent( { polygon_adj_id, e } )
-                            == polygon_edge.polygon_id,
-                        absl::StrCat( "[SurfaceMesh::polygon_adjacent_"
-                                      "edge] Wrong adjacency with polygons "
-                                      "(bijectivity): ",
-                            polygon_edge.polygon_id, " and ", polygon_adj_id,
-                            " (v0 = ", this->point( v0 ).string(),
-                            ", v1 = ", this->point( v1 ).string(), ")" ) );
-                    return std::optional< PolygonEdge >{ std::in_place,
-                        polygon_adj_id, e };
+                    if( polygon_adjacent( polygon_adj_edge )
+                        == polygon_edge.polygon_id )
+                    {
+                        return polygon_adj_edge;
+                    }
+                    failed_edges.emplace_back( polygon_adj_edge );
                 }
             }
             else if( v1 == adj_vertices[e] )
@@ -704,28 +701,34 @@ namespace geode
                                        : static_cast< local_index_t >( e + 1 );
                 if( v0 == adj_vertices[enext] )
                 {
-                    OPENGEODE_EXCEPTION(
-                        polygon_adjacent( { polygon_adj_id, e } )
-                            == polygon_edge.polygon_id,
-                        absl::StrCat( "[SurfaceMesh::polygon_adjacent_"
-                                      "edge] Wrong adjacency with polygons "
-                                      "(bijectivity): ",
-                            polygon_edge.polygon_id, " and ", polygon_adj_id,
-                            " (v0 = ", this->point( v0 ).string(),
-                            ", v1 = ", this->point( v1 ).string(), ")" ) );
-                    return std::optional< PolygonEdge >{ std::in_place,
-                        polygon_adj_id, e };
+                    if( polygon_adjacent( polygon_adj_edge )
+                        == polygon_edge.polygon_id )
+                    {
+                        return polygon_adj_edge;
+                    }
+                    failed_edges.emplace_back( polygon_adj_edge );
                 }
             }
         }
-        throw OpenGeodeException{
-            "[SurfaceMesh::polygon_adjacent_edge] Wrong "
-            "adjacency with polygons (different vertices): ",
-            polygon_edge.polygon_id, " and ", polygon_adj_id,
-            " (v0 = ", this->point( v0 ).string(),
-            ", v1 = ", this->point( v1 ).string(), ")"
-        };
-        return std::nullopt;
+        if( failed_edges.empty() )
+        {
+            throw OpenGeodeException{
+                "[SurfaceMesh::polygon_adjacent_edge] Wrong "
+                "adjacency with polygons (different vertices): ",
+                polygon_edge.string(), " and ", polygon_adj_id,
+                " (v0 = ", this->point( v0 ).string(),
+                ", v1 = ", this->point( v1 ).string(), ")"
+            };
+        }
+        auto message = absl::StrCat( "[SurfaceMesh::polygon_adjacent_"
+                                     "edge] Wrong adjacency with polygons "
+                                     "(bijectivity): ",
+            polygon_edge.string() );
+        for( const auto& edge : failed_edges )
+        {
+            absl::StrAppend( &message, " and ", edge.string() );
+        }
+        throw OpenGeodeException{ message };
     }
 
     template < index_t dimension >

src/geode/mesh/helpers/detail/curve_merger.cpp

@@ -188,9 +188,7 @@ namespace geode
         }
 
         template < index_t dimension >
-        EdgedCurveMerger< dimension >::~EdgedCurveMerger()
-        {
-        }
+        EdgedCurveMerger< dimension >::~EdgedCurveMerger() = default;
 
         template < index_t dimension >
         std::unique_ptr< EdgedCurve< dimension > >
@@ -207,8 +205,8 @@ namespace geode
         }
 
         template < index_t dimension >
-        auto EdgedCurveMerger< dimension >::edge_origins( index_t edge ) const
-            -> const EdgeOrigins&
+        auto EdgedCurveMerger< dimension >::edge_origins(
+            index_t edge ) const -> const EdgeOrigins&
         {
             return impl_->edge_origins( edge );
         }

src/geode/mesh/helpers/detail/solid_merger.cpp

@@ -275,9 +275,7 @@ namespace geode
         }
 
         template < index_t dimension >
-        SolidMeshMerger< dimension >::~SolidMeshMerger()
-        {
-        }
+        SolidMeshMerger< dimension >::~SolidMeshMerger() = default;
 
         template < index_t dimension >
         std::unique_ptr< SolidMesh< dimension > >

src/geode/mesh/helpers/detail/surface_merger.cpp

@@ -301,9 +301,7 @@ namespace geode
         }
 
         template < index_t dimension >
-        SurfaceMeshMerger< dimension >::~SurfaceMeshMerger()
-        {
-        }
+        SurfaceMeshMerger< dimension >::~SurfaceMeshMerger() = default;
 
         template < index_t dimension >
         std::unique_ptr< SurfaceMesh< dimension > >

src/geode/mesh/helpers/detail/vertex_merger.cpp

@@ -168,9 +168,7 @@ namespace geode
         }
 
         template < typename Mesh >
-        VertexMerger< Mesh >::~VertexMerger()
-        {
-        }
+        VertexMerger< Mesh >::~VertexMerger() = default;
 
         template < typename Mesh >
         index_t VertexMerger< Mesh >::vertex_in_merged(
@@ -180,8 +178,8 @@ namespace geode
         }
 
         template < typename Mesh >
-        auto VertexMerger< Mesh >::vertex_origins( index_t vertex ) const
-            -> const VertexOrigins&
+        auto VertexMerger< Mesh >::vertex_origins(
+            index_t vertex ) const -> const VertexOrigins&
         {
             return impl_->vertex_origins( vertex );
         }