Merge branch 'next' into feat_add_ellipsoid_radius_neighbors_in_nnsearch

Author: benoit2776

bindings/python/src/common.hpp

@@ -26,6 +26,7 @@
 #include <pybind11/stl.h>
 
 #include <absl/container/fixed_array.h>
+#include <absl/container/flat_hash_map.h>
 #include <absl/container/inlined_vector.h>
 #include <absl/types/span.h>
 
@@ -69,5 +70,11 @@ namespace pybind11
 
             std::vector< typename std::remove_const< Type >::type > cpp_;
         };
+
+        template < typename Key, typename Value >
+        struct type_caster< absl::flat_hash_map< Key, Value > >
+            : map_caster< absl::flat_hash_map< Key, Value >, Key, Value >
+        {
+        };
     } // namespace detail
 } // namespace pybind11

bindings/python/src/model/CMakeLists.txt

@@ -32,6 +32,7 @@ add_geode_python_binding(
         "helpers/ray_tracing.cpp"
         "mixin/builder/blocks_builder.cpp"
         "mixin/builder/block_collections_builder.cpp"
+        "mixin/builder/component_registry_builder.cpp"
         "mixin/builder/corners_builder.cpp"
         "mixin/builder/corner_collections_builder.cpp"
         "mixin/builder/lines_builder.cpp"
@@ -48,6 +49,7 @@ add_geode_python_binding(
         "mixin/core/blocks.cpp"
         "mixin/core/component.cpp"
         "mixin/core/component_mesh_element.cpp"
+        "mixin/core/component_registry.cpp"
         "mixin/core/component_type.cpp"
         "mixin/core/corner_collection.cpp"
         "mixin/core/corner_collections.cpp"

bindings/python/src/model/mixin/builder/component_registry_builder.cpp

@@ -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.
+ *
+ */
+
+#include "../../../common.hpp"
+
+#include <geode/model/mixin/builder/component_registry_builder.hpp>
+#include <geode/model/mixin/core/component_registry.hpp>
+
+namespace geode
+{
+    void define_component_registry_builder( pybind11::module& module )
+    {
+        pybind11::class_< ComponentRegistryBuilder >(
+            module, "ComponentRegistryBuilder" )
+            .def( pybind11::init< ComponentRegistry& >() )
+            .def( "add_mesh_component",
+                &ComponentRegistryBuilder::add_mesh_component )
+            .def( "add_collection_component",
+                &ComponentRegistryBuilder::add_collection_component )
+            .def( "remove_mesh_component",
+                &ComponentRegistryBuilder::remove_mesh_component )
+            .def( "remove_collection_component",
+                &ComponentRegistryBuilder::remove_collection_component );
+    }
+} // namespace geode

bindings/python/src/model/mixin/builder/topology_builder.cpp

@@ -30,6 +30,7 @@ namespace geode
     void define_topology_builder( pybind11::module& module )
     {
         pybind11::class_< TopologyBuilder, RelationshipsBuilder,
-            VertexIdentifierBuilder >( module, "TopologyBuilder" );
+            VertexIdentifierBuilder, ComponentRegistryBuilder >(
+            module, "TopologyBuilder" );
     }
 } // namespace geode

bindings/python/src/model/mixin/core/component_registry.cpp

@@ -0,0 +1,38 @@
+/*
+ * 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 "../../../common.hpp"
+
+#include <geode/model/mixin/core/component_registry.hpp>
+
+namespace geode
+{
+    void define_component_registry( pybind11::module& module )
+    {
+        pybind11::class_< ComponentRegistry >( module, "ComponentRegistry" )
+            .def( pybind11::init<>() )
+            .def( "mesh_components", &ComponentRegistry::mesh_components )
+            .def( "collection_components",
+                &ComponentRegistry::collection_components );
+    }
+} // namespace geode

bindings/python/src/model/mixin/core/topology.cpp

@@ -29,7 +29,7 @@ namespace geode
 {
     void define_topology( pybind11::module& module )
     {
-        pybind11::class_< Topology, Relationships, VertexIdentifier >(
-            module, "Topology" );
+        pybind11::class_< Topology, Relationships, VertexIdentifier,
+            ComponentRegistry >( module, "Topology" );
     }
 } // namespace geode

bindings/python/src/model/model.cpp

@@ -31,6 +31,7 @@ namespace geode
     void define_component_type( pybind11::module& );
     void define_component( pybind11::module& );
     void define_component_mesh_element( pybind11::module& );
+    void define_component_registry( pybind11::module& );
     void define_block( pybind11::module& );
     void define_blocks( pybind11::module& );
     void define_corner( pybind11::module& );
@@ -54,6 +55,7 @@ namespace geode
     void define_topology( pybind11::module& );
 
     void define_blocks_builder( pybind11::module& );
+    void define_component_registry_builder( pybind11::module& );
     void define_corners_builder( pybind11::module& );
     void define_lines_builder( pybind11::module& );
     void define_model_boundaries_builder( pybind11::module& );
@@ -106,6 +108,7 @@ PYBIND11_MODULE( opengeode_py_model, module )
     geode::define_component_type( module );
     geode::define_component( module );
     geode::define_component_mesh_element( module );
+    geode::define_component_registry( module );
     geode::define_block( module );
     geode::define_blocks( module );
     geode::define_corner( module );
@@ -129,6 +132,7 @@ PYBIND11_MODULE( opengeode_py_model, module )
     geode::define_topology( module );
 
     geode::define_blocks_builder( module );
+    geode::define_component_registry_builder( module );
     geode::define_corners_builder( module );
     geode::define_lines_builder( module );
     geode::define_model_boundaries_builder( module );