Merge pull request #1144 from Geode-solutions/fix/modeler-clean

MelchiorSchuh · web-flow · commit 784077ae0229 · 2025-05-21T17:31:52.000+02:00
fix(Mesh): add helper functions to correct vertex duplications in meshes
diff --git a/include/geode/geometry/nn_search.hpp b/include/geode/geometry/nn_search.hpp
@@ -68,6 +68,17 @@ namespace geode
                 return mapping;
             }
 
+            [[nodiscard]] geode::GenericMapping< geode::index_t >
+                vertices_mapping() const
+            {
+                geode::GenericMapping< geode::index_t > mapping;
+                for( const auto& p : geode::Indices{ colocated_input_points } )
+                {
+                    mapping.map( p, colocated_input_points[p] );
+                }
+                return mapping;
+            }
+
             std::vector< Point< dimension > > unique_points;
             /*!
              * This list has the size of the number of points in the tree.
diff --git a/include/geode/mesh/builder/solid_mesh_builder.hpp b/include/geode/mesh/builder/solid_mesh_builder.hpp
@@ -27,6 +27,8 @@
 
 #include <absl/container/inlined_vector.h>
 
+#include <geode/basic/mapping.hpp>
+
 #include <geode/mesh/builder/coordinate_reference_system_managers_builder.hpp>
 #include <geode/mesh/builder/vertex_set_builder.hpp>
 #include <geode/mesh/common.hpp>
@@ -93,16 +95,26 @@ namespace geode
             const PolyhedronVertex& polyhedron_vertex, index_t vertex_id );
 
         /*!
-         * Replace old polygon vertices from a given vertex to another.
+         * Replace old polyhedron vertices from a given vertex to another.
          * @param[in] old_vertex_id Index of the initial mesh vertex to modify
          * @param[in] new_vertex_id Index of the target mesh vertex to set as
          * polyhedron vertex
+         * @warning This function supposes that the mesh is manifold
+         * around old vertex
          */
         void replace_vertex( index_t old_vertex_id, index_t new_vertex_id );
 
+        /*!
+         * Replace old polyhedron vertices from given vertices to another ones.
+         * @warning This function does not suppose that the mesh is manifold
+         * around old vertices
+         */
+        void replace_vertices(
+            const GenericMapping< index_t >& vertices_mapping );
+
         /*!
          * Set a polyhedron adgjacent through a facet.
-         * @param[in] polygon_facet The index of the polygon facet
+         * @param[in] polyhedron_facet The index of the polyhedron facet
          * @param[in] adjacent_id Index of the adjacent polyhedron
          */
         void set_polyhedron_adjacent(
@@ -111,7 +123,7 @@ namespace geode
         /*!
          * Unset a polyhedron adjacency through a facet.
 
-         * @param[in] polygon_facet The index of the polygon facet
+         * @param[in] polyhedron_facet The index of the polyhedron facet
          */
         void unset_polyhedron_adjacent(
             const PolyhedronFacet& polyhedron_facet );
diff --git a/include/geode/mesh/builder/surface_mesh_builder.hpp b/include/geode/mesh/builder/surface_mesh_builder.hpp
@@ -27,6 +27,8 @@
 
 #include <absl/types/span.h>
 
+#include <geode/basic/mapping.hpp>
+
 #include <geode/mesh/builder/coordinate_reference_system_managers_builder.hpp>
 #include <geode/mesh/builder/vertex_set_builder.hpp>
 #include <geode/mesh/common.hpp>
@@ -96,9 +98,19 @@ namespace geode
          * @param[in] old_vertex_id Index of the initial mesh vertex to modify
          * @param[in] new_vertex_id Index of the target mesh vertex to set as
          * polygon vertex
+         * @warning This function supposes that the mesh is manifold around old
+         * vertex
          */
         void replace_vertex( index_t old_vertex_id, index_t new_vertex_id );
 
+        /*!
+         * Replace old polygon vertices from given vertices to another ones.
+         * @warning This function does not suppose that the mesh is manifold
+         * around old vertices
+         */
+        void replace_vertices(
+            const GenericMapping< index_t >& vertices_mapping );
+
         /*!
          * Set a polygon adjacent through an edge.
          * @param[in] polygon_edge The index of the polygon edge
diff --git a/include/geode/mesh/helpers/detail/split_along_solid_facets.hpp b/include/geode/mesh/helpers/detail/split_along_solid_facets.hpp
@@ -29,12 +29,11 @@
 
 #include <geode/mesh/common.hpp>
 #include <geode/mesh/core/meshes_mapping.hpp>
+#include <geode/mesh/core/solid_mesh.hpp>
 
 namespace geode
 {
-    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
     FORWARD_DECLARATION_DIMENSION_CLASS( SolidMeshBuilder );
-    ALIAS_3D( SolidMesh );
     ALIAS_3D( SolidMeshBuilder );
 } // namespace geode
 
diff --git a/include/geode/mesh/helpers/remove_vertex_duplication.hpp b/include/geode/mesh/helpers/remove_vertex_duplication.hpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019 - 2025 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#pragma once
+
+#include <geode/mesh/common.hpp>
+
+namespace geode
+{
+    FORWARD_DECLARATION_DIMENSION_CLASS( PointSet );
+    FORWARD_DECLARATION_DIMENSION_CLASS( EdgedCurve );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMesh );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
+    FORWARD_DECLARATION_DIMENSION_CLASS( PointSetBuilder );
+    FORWARD_DECLARATION_DIMENSION_CLASS( EdgedCurveBuilder );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMeshBuilder );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMeshBuilder );
+    ALIAS_3D( SolidMesh );
+    ALIAS_3D( SolidMeshBuilder );
+} // namespace geode
+
+namespace geode
+{
+    template < index_t dimension >
+    void remove_vertex_duplication( const PointSet< dimension >& mesh,
+        PointSetBuilder< dimension >& builder );
+
+    template < index_t dimension >
+    void remove_vertex_duplication( const EdgedCurve< dimension >& mesh,
+        EdgedCurveBuilder< dimension >& builder );
+
+    template < index_t dimension >
+    void remove_vertex_duplication( const SurfaceMesh< dimension >& mesh,
+        SurfaceMeshBuilder< dimension >& builder );
+
+    void opengeode_mesh_api remove_vertex_duplication(
+        const SolidMesh3D& mesh, SolidMeshBuilder3D& builder );
+} // namespace geode
diff --git a/src/geode/mesh/CMakeLists.txt b/src/geode/mesh/CMakeLists.txt
@@ -114,6 +114,7 @@ add_geode_library(
         "helpers/grid_point_function.cpp"
         "helpers/grid_scalar_function.cpp"
         "helpers/repair_polygon_orientations.cpp"
+        "helpers/remove_vertex_duplication.cpp"
         "helpers/tetrahedral_solid_point_function.cpp"
         "helpers/tetrahedral_solid_scalar_function.cpp"
         "helpers/triangulated_surface_point_function.cpp"
@@ -253,6 +254,7 @@ add_geode_library(
         "helpers/grid_point_function.hpp"
         "helpers/grid_scalar_function.hpp"
         "helpers/repair_polygon_orientations.hpp"
+        "helpers/remove_vertex_duplication.hpp"
         "helpers/tetrahedral_solid_point_function.hpp"
         "helpers/tetrahedral_solid_scalar_function.hpp"
         "helpers/triangulated_surface_point_function.hpp"
diff --git a/src/geode/mesh/builder/solid_mesh_builder.cpp b/src/geode/mesh/builder/solid_mesh_builder.cpp
@@ -405,6 +405,44 @@ namespace geode
         reset_polyhedra_around_vertex( old_vertex_id );
     }
 
+    template < index_t dimension >
+    void SolidMeshBuilder< dimension >::replace_vertices(
+        const GenericMapping< index_t >& vertices_mapping )
+    {
+        for( const auto p : Range{ solid_mesh_.nb_polyhedra() } )
+        {
+            for( const auto v :
+                LRange{ solid_mesh_.nb_polyhedron_vertices( p ) } )
+            {
+                const PolyhedronVertex polyhedron_vertex{ p, v };
+                const auto old_vertex_id =
+                    solid_mesh_.polyhedron_vertex( polyhedron_vertex );
+                if( !vertices_mapping.has_mapping_input( old_vertex_id ) )
+                {
+                    continue;
+                }
+                const auto old2news = vertices_mapping.in2out( old_vertex_id );
+                OPENGEODE_ASSERT( old2news.size() == 1,
+                    "[SolidMeshBuilder::replace_vertices] "
+                    "Invalid mapping" );
+                const auto new_vertex_id = old2news[0];
+                if( old_vertex_id == new_vertex_id )
+                {
+                    continue;
+                }
+                disassociate_polyhedron_vertex_to_vertex( old_vertex_id );
+                reset_polyhedra_around_vertex( old_vertex_id );
+                if( solid_mesh_.are_edges_enabled()
+                    || solid_mesh_.are_facets_enabled() )
+                {
+                    update_edge_and_facet(
+                        solid_mesh_, *this, polyhedron_vertex, new_vertex_id );
+                }
+                update_polyhedron_vertex( polyhedron_vertex, new_vertex_id );
+            }
+        }
+    }
+
     template < index_t dimension >
     void SolidMeshBuilder< dimension >::set_polyhedron_vertex(
         const PolyhedronVertex& polyhedron_vertex, index_t new_vertex_id )
diff --git a/src/geode/mesh/builder/surface_mesh_builder.cpp b/src/geode/mesh/builder/surface_mesh_builder.cpp
@@ -417,6 +417,43 @@ namespace geode
         reset_polygons_around_vertex( old_vertex_id );
     }
 
+    template < index_t dimension >
+    void SurfaceMeshBuilder< dimension >::replace_vertices(
+        const GenericMapping< index_t >& vertices_mapping )
+    {
+        for( const auto p : Range{ surface_mesh_.nb_polygons() } )
+        {
+            for( const auto v :
+                LRange{ surface_mesh_.nb_polygon_vertices( p ) } )
+            {
+                const PolygonVertex polygon_vertex{ p, v };
+                const auto old_vertex_id =
+                    surface_mesh_.polygon_vertex( polygon_vertex );
+                if( !vertices_mapping.has_mapping_input( old_vertex_id ) )
+                {
+                    continue;
+                }
+                const auto old2news = vertices_mapping.in2out( old_vertex_id );
+                OPENGEODE_ASSERT( old2news.size() == 1,
+                    "[SurfaceMeshBuilder::replace_vertices] "
+                    "Invalid mapping" );
+                const auto new_vertex_id = old2news[0];
+                if( old_vertex_id == new_vertex_id )
+                {
+                    continue;
+                }
+                disassociate_polygon_vertex_to_vertex( old_vertex_id );
+                reset_polygons_around_vertex( old_vertex_id );
+                if( surface_mesh_.are_edges_enabled() )
+                {
+                    update_edge( surface_mesh_, *this, polygon_vertex,
+                        old_vertex_id, new_vertex_id );
+                }
+                update_polygon_vertex( polygon_vertex, new_vertex_id );
+            }
+        }
+    }
+
     template < index_t dimension >
     void SurfaceMeshBuilder< dimension >::set_polygon_vertex(
         const PolygonVertex& polygon_vertex, index_t new_vertex_id )
diff --git a/src/geode/mesh/helpers/remove_vertex_duplication.cpp b/src/geode/mesh/helpers/remove_vertex_duplication.cpp
diff --git a/tests/mesh/CMakeLists.txt b/tests/mesh/CMakeLists.txt
diff --git a/tests/mesh/test-remove-vertex-duplication.cpp b/tests/mesh/test-remove-vertex-duplication.cpp
