Merge branch 'next' of https://github.com/Geode-solutions/OpenGeode into fix/changing_triangle_flip_check_when_swaping_edge

benoit2776 · benoit2776 · commit a833186658da · 2025-10-06T15:33:08.000+02:00
diff --git a/bindings/python/src/model/representation/core/brep.cpp b/bindings/python/src/model/representation/core/brep.cpp
@@ -355,6 +355,8 @@ namespace geode
                 &BRep::is_surface_collection_item )
             .def( "is_block_collection_item", &BRep::is_block_collection_item )
             .def( "bounding_box", &BRep::bounding_box )
-            .def( "native_extension", &BRep::native_extension );
+            .def( "native_extension", &BRep::native_extension )
+            .def( "brep_component", &BRep::component,
+                pybind11::return_value_policy::reference );
     }
 } // namespace geode
diff --git a/bindings/python/src/model/representation/core/section.cpp b/bindings/python/src/model/representation/core/section.cpp
@@ -214,6 +214,8 @@ namespace geode
             .def( "is_surface_collection_item",
                 &Section::is_surface_collection_item )
             .def( "bounding_box", &Section::bounding_box )
-            .def( "native_extension", &Section::native_extension );
+            .def( "native_extension", &Section::native_extension )
+            .def( "section_component", &Section::component,
+                pybind11::return_value_policy::reference );
     }
 } // namespace geode
diff --git a/include/geode/model/mixin/core/block_collections.hpp b/include/geode/model/mixin/core/block_collections.hpp
@@ -96,6 +96,8 @@ namespace geode
         [[nodiscard]] const BlockCollection< dimension >& block_collection(
             const uuid& id ) const;
 
+        [[nodiscard]] bool has_block_collection( const uuid& id ) const;
+
         [[nodiscard]] BlockCollectionRange block_collections() const;
 
         [[nodiscard]] BlockCollectionRange active_block_collections() const;
@@ -105,6 +107,17 @@ namespace geode
             return block_collections();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_block_collection( id );
+        }
+
+        [[nodiscard]] const BlockCollection< dimension >& component(
+            const uuid& id ) const
+        {
+            return block_collection( id );
+        }
+
         void save_block_collections( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/blocks.hpp b/include/geode/model/mixin/core/blocks.hpp
@@ -118,6 +118,17 @@ namespace geode
             return blocks();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_block( id );
+        }
+
+        [[nodiscard]] const Block< dimension >& component(
+            const uuid& id ) const
+        {
+            return block( id );
+        }
+
         /*!
          * Save each Block in a file located in the specified directory
          */
diff --git a/include/geode/model/mixin/core/corner_collections.hpp b/include/geode/model/mixin/core/corner_collections.hpp
@@ -99,6 +99,8 @@ namespace geode
         [[nodiscard]] const CornerCollection< dimension >& corner_collection(
             const uuid& id ) const;
 
+        [[nodiscard]] bool has_corner_collection( const uuid& id ) const;
+
         [[nodiscard]] CornerCollectionRange corner_collections() const;
 
         [[nodiscard]] CornerCollectionRange active_corner_collections() const;
@@ -108,6 +110,17 @@ namespace geode
             return corner_collections();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_corner_collection( id );
+        }
+
+        [[nodiscard]] const CornerCollection< dimension >& component(
+            const uuid& id ) const
+        {
+            return corner_collection( id );
+        }
+
         void save_corner_collections( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/corners.hpp b/include/geode/model/mixin/core/corners.hpp
@@ -117,6 +117,17 @@ namespace geode
             return corners();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_corner( id );
+        }
+
+        [[nodiscard]] const Corner< dimension >& component(
+            const uuid& id ) const
+        {
+            return corner( id );
+        }
+
         /*!
          * Save each Corner in a file located in the specified directory
          */
diff --git a/include/geode/model/mixin/core/line_collections.hpp b/include/geode/model/mixin/core/line_collections.hpp
@@ -97,6 +97,8 @@ namespace geode
         [[nodiscard]] const LineCollection< dimension >& line_collection(
             const uuid& id ) const;
 
+        [[nodiscard]] bool has_line_collection( const uuid& id ) const;
+
         [[nodiscard]] LineCollectionRange line_collections() const;
 
         [[nodiscard]] LineCollectionRange active_line_collections() const;
@@ -106,6 +108,17 @@ namespace geode
             return line_collections();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_line_collection( id );
+        }
+
+        [[nodiscard]] const LineCollection< dimension >& component(
+            const uuid& id ) const
+        {
+            return line_collection( id );
+        }
+
         void save_line_collections( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/lines.hpp b/include/geode/model/mixin/core/lines.hpp
@@ -105,6 +105,16 @@ namespace geode
             return lines();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_line( id );
+        }
+
+        [[nodiscard]] const Line< dimension >& component( const uuid& id ) const
+        {
+            return line( id );
+        }
+
         void save_lines( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/model_boundaries.hpp b/include/geode/model/mixin/core/model_boundaries.hpp
@@ -97,6 +97,8 @@ namespace geode
         [[nodiscard]] const ModelBoundary< dimension >& model_boundary(
             const uuid& id ) const;
 
+        [[nodiscard]] bool has_model_boundary( const uuid& id ) const;
+
         [[nodiscard]] ModelBoundaryRange model_boundaries() const;
 
         [[nodiscard]] ModelBoundaryRange active_model_boundaries() const;
@@ -106,6 +108,17 @@ namespace geode
             return model_boundaries();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_model_boundary( id );
+        }
+
+        [[nodiscard]] const ModelBoundary< dimension >& component(
+            const uuid& id ) const
+        {
+            return model_boundary( id );
+        }
+
         void save_model_boundaries( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/surface_collections.hpp b/include/geode/model/mixin/core/surface_collections.hpp
@@ -100,6 +100,8 @@ namespace geode
         [[nodiscard]] const SurfaceCollection< dimension >& surface_collection(
             const uuid& id ) const;
 
+        [[nodiscard]] bool has_surface_collection( const uuid& id ) const;
+
         [[nodiscard]] SurfaceCollectionRange surface_collections() const;
 
         [[nodiscard]] SurfaceCollectionRange active_surface_collections() const;
@@ -109,6 +111,17 @@ namespace geode
             return surface_collections();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_surface_collection( id );
+        }
+
+        [[nodiscard]] const SurfaceCollection< dimension >& component(
+            const uuid& id ) const
+        {
+            return surface_collection( id );
+        }
+
         void save_surface_collections( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/mixin/core/surfaces.hpp b/include/geode/model/mixin/core/surfaces.hpp
@@ -106,6 +106,17 @@ namespace geode
             return surfaces();
         }
 
+        [[nodiscard]] bool has_component( const uuid& id ) const
+        {
+            return has_surface( id );
+        }
+
+        [[nodiscard]] const Surface< dimension >& component(
+            const uuid& id ) const
+        {
+            return surface( id );
+        }
+
         void save_surfaces( std::string_view directory ) const;
 
     protected:
diff --git a/include/geode/model/representation/core/brep.hpp b/include/geode/model/representation/core/brep.hpp
@@ -39,17 +39,19 @@
 
 namespace geode
 {
+    FORWARD_DECLARATION_DIMENSION_CLASS( BoundingBox );
+    FORWARD_DECLARATION_DIMENSION_CLASS( Component );
     ALIAS_3D( Block );
-    ALIAS_3D( ModelBoundary );
-    ALIAS_3D( CornerCollection );
-    ALIAS_3D( LineCollection );
-    ALIAS_3D( SurfaceCollection );
     ALIAS_3D( BlockCollection );
+    ALIAS_3D( BoundingBox );
+    ALIAS_3D( Component );
     ALIAS_3D( Corner );
+    ALIAS_3D( CornerCollection );
     ALIAS_3D( Line );
+    ALIAS_3D( LineCollection );
+    ALIAS_3D( ModelBoundary );
     ALIAS_3D( Surface );
-    FORWARD_DECLARATION_DIMENSION_CLASS( BoundingBox );
-    ALIAS_3D( BoundingBox );
+    ALIAS_3D( SurfaceCollection );
     class BRepBuilder;
 } // namespace geode
 
@@ -392,6 +394,9 @@ namespace geode
 
         [[nodiscard]] BRep clone() const;
 
+        [[nodiscard]] const Component3D& component(
+            const uuid& component_id ) const;
+
         [[nodiscard]] BoundaryCornerRange boundaries(
             const Line3D& line ) const;
 
diff --git a/include/geode/model/representation/core/detail/model_component.hpp b/include/geode/model/representation/core/detail/model_component.hpp
@@ -0,0 +1,88 @@
+/*
+ * 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/uuid.hpp>
+
+#include <geode/model/common.hpp>
+#include <geode/model/mixin/core/component.hpp>
+
+namespace geode
+{
+    namespace internal
+    {
+        template < typename Model, typename First, typename... Components >
+        const Component< Model::dim >& get_model_component(
+            const Model& model, const uuid& component_id )
+        {
+            if constexpr( sizeof...( Components ) == 0 )
+            {
+                if( model.First::has_component( component_id ) )
+                {
+                    return model.First::component( component_id );
+                }
+            }
+            else
+            {
+                if( model.First::has_component( component_id ) )
+                {
+                    return model.First::component( component_id );
+                }
+                return get_model_component< Model, Components... >(
+                    model, component_id );
+            }
+            throw OpenGeodeException{
+                "[ModelComponentGetter::get] Model has no component with id ",
+                component_id.string()
+            };
+        }
+
+        template < typename >
+        struct ModelComponentGetter;
+
+        template < typename... Components >
+        struct ModelComponentGetter< std::tuple< Components... > >
+        {
+            template < typename Model >
+            const Component< Model::dim >& get(
+                const Model& model, const uuid& component_id ) const
+            {
+                return get_model_component< Model, Components... >(
+                    model, component_id );
+            }
+        };
+    } // namespace internal
+
+    namespace detail
+    {
+        template < typename Model >
+        const Component< Model::dim >& model_component(
+            Model& model, const uuid& component_id )
+        {
+            const internal::ModelComponentGetter< typename Model::Components >
+                component_getter;
+            return component_getter.get( model, component_id );
+        }
+    } // namespace detail
+} // namespace geode
diff --git a/include/geode/model/representation/core/section.hpp b/include/geode/model/representation/core/section.hpp
@@ -39,15 +39,17 @@
 
 namespace geode
 {
+    FORWARD_DECLARATION_DIMENSION_CLASS( BoundingBox );
+    FORWARD_DECLARATION_DIMENSION_CLASS( Component );
+    ALIAS_2D( BoundingBox );
+    ALIAS_2D( Component );
     ALIAS_2D( Corner );
-    ALIAS_2D( Line );
-    ALIAS_2D( Surface );
-    ALIAS_2D( ModelBoundary );
     ALIAS_2D( CornerCollection );
+    ALIAS_2D( Line );
     ALIAS_2D( LineCollection );
+    ALIAS_2D( ModelBoundary );
+    ALIAS_2D( Surface );
     ALIAS_2D( SurfaceCollection );
-    FORWARD_DECLARATION_DIMENSION_CLASS( BoundingBox );
-    ALIAS_2D( BoundingBox );
     class SectionBuilder;
 } // namespace geode
 
@@ -290,6 +292,8 @@ namespace geode
 
         [[nodiscard]] Section clone() const;
 
+        [[nodiscard]] const Component2D& component( const uuid& id ) const;
+
         [[nodiscard]] BoundaryCornerRange boundaries(
             const Line2D& line ) const;
 
diff --git a/src/geode/model/CMakeLists.txt b/src/geode/model/CMakeLists.txt
@@ -186,6 +186,7 @@ add_geode_library(
         "representation/builder/detail/filter.hpp"
         "representation/builder/detail/register.hpp"
         "representation/core/detail/clone.hpp"
+        "representation/core/detail/model_component.hpp"
         "representation/core/detail/transfer_collections.hpp"
         "representation/core/detail/transfer_metadata.hpp"
     INTERNAL_HEADERS
diff --git a/src/geode/model/mixin/core/block_collections.cpp b/src/geode/model/mixin/core/block_collections.cpp
diff --git a/src/geode/model/mixin/core/corner_collections.cpp b/src/geode/model/mixin/core/corner_collections.cpp
diff --git a/src/geode/model/mixin/core/line_collections.cpp b/src/geode/model/mixin/core/line_collections.cpp
diff --git a/src/geode/model/mixin/core/model_boundaries.cpp b/src/geode/model/mixin/core/model_boundaries.cpp
diff --git a/src/geode/model/mixin/core/surface_collections.cpp b/src/geode/model/mixin/core/surface_collections.cpp
diff --git a/src/geode/model/representation/core/brep.cpp b/src/geode/model/representation/core/brep.cpp
diff --git a/src/geode/model/representation/core/section.cpp b/src/geode/model/representation/core/section.cpp
