changes for cell_attribute_manager

Author: MelchiorSchuh

bindings/python/src/mesh/core/light_regular_grid.cpp

@@ -30,28 +30,39 @@
 
 #include <geode/mesh/core/light_regular_grid.hpp>
 
-#define PYTHON_LIGHT_REGULAR_GRID( dimension )                                 \
-    const auto name##dimension =                                               \
-        "LightRegularGrid" + std::to_string( dimension ) + "D";                \
-    pybind11::class_< LightRegularGrid##dimension##D, Grid##dimension##D,      \
-        Identifier >( module, name##dimension.c_str() )                        \
-        .def( pybind11::init< Point< dimension >,                              \
-            std::array< index_t, dimension >,                                  \
-            std::array< double, dimension > >() )                              \
-        .def( pybind11::init< Point< dimension >,                              \
-            std::array< index_t, dimension >,                                  \
-            std::array< Vector< dimension >, dimension > >() )                 \
-        .def( "vertex_attribute_manager",                                      \
-            &Grid##dimension##D::grid_vertex_attribute_manager,                \
-            pybind11::return_value_policy::reference )                         \
-        .def( "native_extension",                                              \
-            &LightRegularGrid##dimension##D::native_extension )
+namespace
+{
+    template < geode::index_t dimension >
+    void define_python_light_regular_grid( pybind11::module& module )
+    {
+        const auto class_name =
+            absl::StrCat( "LightRegularGrid", dimension, "D" );
+        pybind11::class_< geode::LightRegularGrid< dimension >,
+            geode::Grid< dimension >, geode::Identifier >(
+            module, class_name.c_str() )
+            .def( pybind11::init< geode::Point< dimension >,
+                std::array< geode::index_t, dimension >,
+                std::array< double, dimension > >() )
+            .def( pybind11::init< geode::Point< dimension >,
+                std::array< geode::index_t, dimension >,
+                std::array< geode::Vector< dimension >, dimension > >() )
+            .def( "vertex_attribute_manager",
+                &geode::Grid< dimension >::grid_vertex_attribute_manager,
+                pybind11::return_value_policy::reference )
+            .def( dimension == 2 ? "polygon_attribute_manager"
+                                 : "polyhedron_attribute_manager",
+                &geode::Grid< dimension >::cell_attribute_manager,
+                pybind11::return_value_policy::reference )
+            .def( "native_extension",
+                &geode::LightRegularGrid< dimension >::native_extension );
+    }
+} // namespace
 
 namespace geode
 {
     void define_light_regular_grid( pybind11::module& module )
     {
-        PYTHON_LIGHT_REGULAR_GRID( 2 );
-        PYTHON_LIGHT_REGULAR_GRID( 3 );
+        define_python_light_regular_grid< 2 >( module );
+        define_python_light_regular_grid< 3 >( module );
     }
 } // namespace geode

bindings/python/tests/mesh/test-py-light-regular-grid.py

@@ -240,9 +240,30 @@ def test_closest_vertex( grid ):
     if result != answer:
         raise ValueError( "[Test] Wrong result for closest vertex for query p4" )
 
-def test_attribute( grid ):
+def test_attribute_3d( grid ):
     attribute = grid.cell_attribute_manager().find_or_create_attribute_variable_double( "toto", -1 )
     attribute.set_value( 10, 10 )
+    attribute = grid.polyhedron_attribute_manager().find_attribute_double( "toto" )
+    if attribute.value( 0 ) != -1:
+        raise ValueError( "[Test] Wrong attribute value" )
+    if attribute.value( 10 ) != 10:
+        raise ValueError( "[Test] Wrong attribute value" )
+    if attribute.value( grid.nb_cells() - 1 ) != -1:
+        raise ValueError( "[Test] Wrong attribute value" )
+    attribute = grid.vertex_attribute_manager().find_or_create_attribute_variable_double( "toto_vertex", 1 )
+    attribute.set_value( 10, 10 )
+    if attribute.value( 0 ) != 1:
+        raise ValueError( "[Test] Wrong attribute value" )
+    if attribute.value( 10 ) != 10:
+        raise ValueError( "[Test] Wrong attribute value" )
+    if attribute.value( grid.nb_cells() - 1 ) != 1:
+        raise ValueError( "[Test] Wrong attribute value" )
+
+def test_attribute_2d():
+    grid = mesh.LightRegularGrid2D(geom.Point2D([1.5, 0]), [5, 10], [1., 2.])
+    attribute = grid.cell_attribute_manager().find_or_create_attribute_variable_double( "toto", -1 )
+    attribute.set_value( 10, 10 )
+    attribute = grid.polygon_attribute_manager().find_attribute_double( "toto" )
     if attribute.value( 0 ) != -1:
         raise ValueError( "[Test] Wrong attribute value" )
     if attribute.value( 10 ) != 10:
@@ -274,5 +295,6 @@ def test_io(grid, filename):
     test_cell_query( grid )
     test_boundary_box( grid )
     test_closest_vertex( grid )
-    test_attribute( grid )
+    test_attribute_3d( grid )
+    test_attribute_2d()
     test_io(grid, "test." + grid.native_extension())