Merge branch 'next' into fix/unsegmentation

Author: panquez

bindings/python/src/geometry/bounding_box.cpp

@@ -35,7 +35,14 @@
         .def( pybind11::init<>() )                                             \
         .def( "add_box", &BoundingBox##dimension##D::add_box )                 \
         .def( "add_point", &BoundingBox##dimension##D::add_point )             \
-        .def( "contains", &BoundingBox##dimension##D::contains )               \
+        .def( "contains_point",                                                \
+            static_cast< bool ( BoundingBox##dimension##D::* )(                \
+                const Point< dimension >& ) const >(                           \
+                &BoundingBox##dimension##D::contains ) )                       \
+        .def( "contains_bbox",                                                 \
+            static_cast< bool ( BoundingBox##dimension##D::* )(                \
+                const BoundingBox< dimension >& ) const >(                     \
+                &BoundingBox##dimension##D::contains ) )                       \
         .def( "intersects_bbox",                                               \
             static_cast< bool ( BoundingBox##dimension##D::* )(                \
                 const BoundingBox< dimension >& ) const >(                     \

bindings/python/tests/geometry/test-py-bounding-box.py

@@ -43,7 +43,7 @@
     if box2.max() != geom.Point2D([1, 1]):
         raise ValueError("[Test] Error in BoundingBox union computation")
 
-    if not box2.contains(geom.Point2D([0, 0])):
+    if not box2.contains_point(geom.Point2D([0, 0])):
         raise ValueError("[Test] BBox should contain this point")
-    if box2.contains(geom.Point2D([10, 0])):
+    if box2.contains_point(geom.Point2D([10, 0])):
         raise ValueError("[Test] BBox should not contain this point")

include/geode/geometry/bounding_box.hpp

@@ -61,6 +61,8 @@ namespace geode
 
         bool contains( const Point< dimension >& point ) const;
 
+        bool contains( const BoundingBox< dimension >& bbox ) const;
+
         [[nodiscard]] bool intersects(
             const BoundingBox< dimension >& bbox ) const;
 

src/geode/geometry/bounding_box.cpp

@@ -209,6 +209,13 @@ namespace geode
         return true;
     }
 
+    template < index_t dimension >
+    bool BoundingBox< dimension >::contains(
+        const BoundingBox< dimension >& bbox ) const
+    {
+        return contains( bbox.min_ ) && contains( bbox.max_ );
+    }
+
     template < index_t dimension >
     bool BoundingBox< dimension >::intersects(
         const BoundingBox< dimension >& box ) const