Geode-solutions
diff --git a/‎include/geode/mesh/helpers/detail/solid_mesh_validity_fix.hpp
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions b/‎include/geode/mesh/helpers/detail/solid_mesh_validity_fix.hpp
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions
diff --git a/‎include/geode/mesh/helpers/detail/surface_mesh_validity_fix.hpp
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions b/‎include/geode/mesh/helpers/detail/surface_mesh_validity_fix.hpp
Copy file name to clipboard
+45Lines changed: 45 additions & 0 deletions
diff --git a/‎include/geode/model/helpers/detail/solid_mesh_validity_fix.hpp
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions b/‎include/geode/model/helpers/detail/solid_mesh_validity_fix.hpp
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions
diff --git a/‎include/geode/model/helpers/detail/surface_mesh_validity_fix.hpp
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions b/‎include/geode/model/helpers/detail/surface_mesh_validity_fix.hpp
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎src/geode/mesh/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎src/geode/mesh/CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/geode/mesh/builder/solid_mesh_builder.cpp
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion b/‎src/geode/mesh/builder/solid_mesh_builder.cpp
Copy file name to clipboard
+10-1Lines changed: 10 additions & 1 deletion
diff --git a/‎src/geode/mesh/helpers/detail/solid_mesh_validity_fix.cpp
Copy file name to clipboard
+95Lines changed: 95 additions & 0 deletions b/‎src/geode/mesh/helpers/detail/solid_mesh_validity_fix.cpp
Copy file name to clipboard
+95Lines changed: 95 additions & 0 deletions
@@ -0,0 +1,45 @@
+/*
+ * 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/basic/mapping.hpp>
+
+#include <geode/mesh/common.hpp>
+
+namespace geode
+{
+    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SolidMeshBuilder );
+} // namespace geode
+
+namespace geode
+{
+    namespace detail
+    {
+        template < index_t dimension >
+        GenericMapping< index_t > repair_non_manifold_vertices(
+            const SolidMesh< dimension >& mesh,
+            SolidMeshBuilder< dimension >& builder );
+    } // namespace detail
+} // namespace geode
@@ -0,0 +1,45 @@
+/*
+ * 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/basic/mapping.hpp>
+
+#include <geode/mesh/common.hpp>
+
+namespace geode
+{
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMesh );
+    FORWARD_DECLARATION_DIMENSION_CLASS( SurfaceMeshBuilder );
+} // namespace geode
+
+namespace geode
+{
+    namespace detail
+    {
+        template < index_t dimension >
+        GenericMapping< index_t > repair_non_manifold_vertices(
+            const SurfaceMesh< dimension >& mesh,
+            SurfaceMeshBuilder< dimension >& builder );
+    } // namespace detail
+} // namespace geode
@@ -0,0 +1,46 @@
+/*
+ * 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/basic/mapping.hpp>
+
+#include <geode/model/common.hpp>
+
+namespace geode
+{
+    class BRep;
+    class BRepBuilder;
+    FORWARD_DECLARATION_DIMENSION_CLASS( Block );
+    ALIAS_3D( Block );
+} // namespace geode
+
+namespace geode
+{
+    namespace detail
+    {
+        GenericMapping< index_t >
+            opengeode_model_api repair_non_manifold_vertices(
+                const BRep& model, BRepBuilder& builder, const Block3D& block );
+    } // namespace detail
+} // namespace geode
@@ -23,6 +23,8 @@
 
 #pragma once
 
+#include <geode/basic/mapping.hpp>
+
 #include <geode/model/common.hpp>
 
 namespace geode
@@ -35,7 +37,9 @@ namespace geode
     namespace detail
     {
         template < typename Model >
-        void repair_non_manifold_vertices(
-            Model& model, const Surface< Model::dim >& surface );
+        GenericMapping< index_t > repair_non_manifold_vertices(
+            const Model& model,
+            typename Model::Builder& builder,
+            const Surface< Model::dim >& surface );
     } // namespace detail
 } // namespace geode
@@ -127,8 +127,10 @@ add_geode_library(
         "helpers/detail/mesh_intersection_detection.cpp"
         "helpers/detail/point_set_merger.cpp"
         "helpers/detail/solid_merger.cpp"
+        "helpers/detail/solid_mesh_validity_fix.cpp"
         "helpers/detail/split_along_solid_facets.cpp"
         "helpers/detail/surface_merger.cpp"
+        "helpers/detail/surface_mesh_validity_fix.cpp"
         "helpers/detail/vertex_merger.cpp"
         "helpers/internal/copy.cpp"
         "helpers/internal/grid_shape_function.cpp"
@@ -316,8 +318,10 @@ add_geode_library(
         "helpers/detail/mesh_intersection_detection.hpp"
         "helpers/detail/point_set_merger.hpp"
         "helpers/detail/solid_merger.hpp"
+        "helpers/detail/solid_mesh_validity_fix.hpp"
         "helpers/detail/split_along_solid_facets.hpp"
         "helpers/detail/surface_merger.hpp"
+        "helpers/detail/surface_mesh_validity_fix.hpp"
         "helpers/detail/vertex_merger.hpp"
     INTERNAL_HEADERS
         "core/internal/edges_impl.hpp"
 
@@ -204,7 +204,11 @@ namespace
                     vertices_old2new[solid.polyhedron_vertex( { p, v } )];
                 OPENGEODE_EXCEPTION( new_vertex != geode::NO_ID,
                     "[SolidMesh::update_polyhedron_vertices] No polyhedron "
-                    "should be removed" );
+                    "should be removed (",
+                    p, ", ", v, " -> ", solid.polyhedron_vertex( { p, v } ),
+                    " located at ",
+                    solid.point( solid.polyhedron_vertex( { p, v } ) ).string(),
+                    ")" );
             }
         }
     }
@@ -803,6 +807,11 @@ namespace geode
         for( const auto v : Range{ solid_mesh_.nb_vertices() } )
         {
             to_delete[v] = !solid_mesh_.polyhedron_around_vertex( v );
+            if( to_delete[v] )
+            {
+                DEBUG( v );
+                SDEBUG( solid_mesh_.point( v ) );
+            }
         }
         return delete_vertices( to_delete );
     }
 
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ *
+ */
+
+#include <geode/mesh/helpers/detail/solid_mesh_validity_fix.hpp>
+
+#include <geode/basic/uuid.hpp>
+
+#include <geode/geometry/point.hpp>
+
+#include <geode/mesh/builder/solid_mesh_builder.hpp>
+#include <geode/mesh/core/solid_mesh.hpp>
+
+namespace geode
+{
+    namespace detail
+    {
+        template < index_t dimension >
+        GenericMapping< index_t > repair_non_manifold_vertices(
+            const SolidMesh< dimension >& mesh,
+            SolidMeshBuilder< dimension >& builder )
+        {
+            absl::FixedArray< PolyhedraAroundVertex > polyhedra_around_vertices(
+                mesh.nb_vertices() );
+            for( const auto p : Range{ mesh.nb_polyhedra() } )
+            {
+                for( const auto v : LRange{ mesh.nb_polyhedron_vertices( p ) } )
+                {
+                    polyhedra_around_vertices[mesh.polyhedron_vertex(
+                                                  { p, v } )]
+                        .emplace_back( p, v );
+                }
+            }
+            GenericMapping< index_t > vertex_mappings;
+            for( const auto v : Range{ mesh.nb_vertices() } )
+            {
+                auto polyhedra_around = mesh.polyhedra_around_vertex( v );
+                const auto& polyhedron_vertices = polyhedra_around_vertices[v];
+                auto nb_polyhedra_around = polyhedra_around.size();
+                if( nb_polyhedra_around == polyhedron_vertices.size() )
+                {
+                    continue;
+                }
+                PolyhedraAroundVertex total_polyhedra;
+                while( nb_polyhedra_around != polyhedron_vertices.size() )
+                {
+                    for( auto&& polyhedron : polyhedra_around )
+                    {
+                        total_polyhedra.emplace_back( std::move( polyhedron ) );
+                    }
+                    const auto new_vertex_id =
+                        builder.create_point( mesh.point( v ) );
+                    builder.replace_vertex( v, new_vertex_id );
+                    for( const auto& polyhedron_vertex : polyhedron_vertices )
+                    {
+                        if( absl::c_find( total_polyhedra, polyhedron_vertex )
+                            == total_polyhedra.end() )
+                        {
+                            builder.associate_polyhedron_vertex_to_vertex(
+                                polyhedron_vertex, v );
+                            break;
+                        }
+                    }
+                    vertex_mappings.map( v, new_vertex_id );
+                    polyhedra_around = mesh.polyhedra_around_vertex( v );
+                    nb_polyhedra_around += polyhedra_around.size();
+                }
+            }
+            return vertex_mappings;
+        }
+
+        template GenericMapping< index_t >
+            opengeode_mesh_api repair_non_manifold_vertices(
+                const SolidMesh< 3 >&, SolidMeshBuilder< 3 >& );
+    } // namespace detail
+} // namespace geode
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,11 @@ namespace`
`204`	`204`	`vertices_old2new[solid.polyhedron_vertex( { p, v } )];`
`205`	`205`	`OPENGEODE_EXCEPTION( new_vertex != geode::NO_ID,`
`206`	`206`	`"[SolidMesh::update_polyhedron_vertices] No polyhedron "`
`207`		`- "should be removed" );`
	`207`	`+ "should be removed (",`
	`208`	`+ p, ", ", v, " -> ", solid.polyhedron_vertex( { p, v } ),`
	`209`	`+ " located at ",`
	`210`	`+ solid.point( solid.polyhedron_vertex( { p, v } ) ).string(),`
	`211`	`+ ")" );`
`208`	`212`	`}`
`209`	`213`	`}`
`210`	`214`	`}`
`@@ -803,6 +807,11 @@ namespace geode`
`803`	`807`	`for( const auto v : Range{ solid_mesh_.nb_vertices() } )`
`804`	`808`	`{`
`805`	`809`	`to_delete[v] = !solid_mesh_.polyhedron_around_vertex( v );`
	`810`	`+ if( to_delete[v] )`
	`811`	`+ {`
	`812`	`+ DEBUG( v );`
	`813`	`+ SDEBUG( solid_mesh_.point( v ) );`
	`814`	`+ }`
`806`	`815`	`}`
`807`	`816`	`return delete_vertices( to_delete );`
`808`	`817`	`}`