Merge branch 'next' of https://github.com/Geode-solutions/OpenGeode into generic-search-in-aabbtree

Author: BotellaA

include/geode/mesh/helpers/detail/solid_mesh_validity_fix.hpp

@@ -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

include/geode/mesh/helpers/detail/surface_mesh_validity_fix.hpp

@@ -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

include/geode/model/helpers/detail/mappings_merger.hpp

@@ -41,7 +41,11 @@ namespace geode
         [[nodiscard]] ModelGenericMapping opengeode_model_api
             copy_to_generic_mappings( const ModelCopyMapping& mappings2 );
 
-        [[nodiscard]] ModelMappings opengeode_model_api merge_mappings(
-            const ModelMappings& mappings1, const ModelMappings& mappings2 );
+        [[nodiscard]] SectionMappings opengeode_model_api merge_mappings(
+            const SectionMappings& mappings1,
+            const SectionMappings& mappings2 );
+
+        [[nodiscard]] BRepMappings opengeode_model_api merge_mappings(
+            const BRepMappings& mappings1, const BRepMappings& mappings2 );
     } // namespace detail
 } // namespace geode

include/geode/model/helpers/detail/solid_mesh_validity_fix.hpp

@@ -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

include/geode/model/helpers/detail/surface_mesh_validity_fix.hpp

@@ -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

include/geode/model/representation/core/mapping.hpp

@@ -34,6 +34,12 @@
 #include <geode/model/mixin/core/component_mesh_element.hpp>
 #include <geode/model/mixin/core/vertex_identifier.hpp>
 
+namespace geode
+{
+    class Section;
+    class BRep;
+} // namespace geode
+
 namespace geode
 {
     template < typename MappingType >
@@ -126,6 +132,23 @@ namespace geode
         MeshElementMapping blocks;
     };
 
+    template < typename Model >
+    struct TypedModelMeshesElementMapping
+    {
+    };
+
+    template <>
+    struct TypedModelMeshesElementMapping< Section >
+    {
+        using type = SectionMeshesElementMapping;
+    };
+
+    template <>
+    struct TypedModelMeshesElementMapping< BRep >
+    {
+        using type = BRepMeshesElementMapping;
+    };
+
     struct ModelMeshesVertexMapping
     {
         MeshVertexMapping corners;
@@ -142,19 +165,62 @@ namespace geode
         MeshVertexMapping blocks;
     };
 
-    struct ModelMappings
+    template < typename Model >
+    struct TypedModelMeshesVertexMapping
+    {
+    };
+
+    template <>
+    struct TypedModelMeshesVertexMapping< Section >
+    {
+        using type = SectionMeshesVertexMapping;
+    };
+
+    template <>
+    struct TypedModelMeshesVertexMapping< BRep >
+    {
+        using type = BRepMeshesVertexMapping;
+    };
+
+    struct ModelComponentMappings
     {
         ModelGenericMapping component_mapping;
         ModelAddedComponentMapping added_components;
         ModelUnchangedComponentMapping unchanged_components;
+    };
+
+    struct [[deprecated]] ModelMappings : public ModelComponentMappings
+    {
         ModelMeshesElementMapping mesh_element_mapping;
         ModelMeshesVertexMapping mesh_vertices_mapping;
     };
 
-    struct BRepMappings
+    struct SectionMappings : public ModelComponentMappings
+    {
+        ModelMeshesElementMapping mesh_element_mapping;
+        ModelMeshesVertexMapping mesh_vertices_mapping;
+    };
+
+    struct BRepMappings : public ModelComponentMappings
     {
-        ModelGenericMapping component_mapping;
         BRepMeshesElementMapping mesh_element_mapping;
         BRepMeshesVertexMapping mesh_vertices_mapping;
     };
+
+    template < typename Model >
+    struct TypedModelMappings
+    {
+    };
+
+    template <>
+    struct TypedModelMappings< Section >
+    {
+        using type = SectionMappings;
+    };
+
+    template <>
+    struct TypedModelMappings< BRep >
+    {
+        using type = BRepMappings;
+    };
 } // namespace geode

src/geode/mesh/CMakeLists.txt

@@ -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"

src/geode/mesh/builder/solid_mesh_builder.cpp

@@ -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(),
+                    ")" );
             }
         }
     }