Apply prepare changes

Author: BotellaA

include/geode/geometry/detail/aabb_impl.hpp

@@ -458,7 +458,7 @@ namespace geode
 
             // The acceleration is here:
             if( !node( node_index1 )
-                    .intersects( other_tree.impl_->node( node_index2 ) ) )
+                     .intersects( other_tree.impl_->node( node_index2 ) ) )
             {
                 return false;
             }

src/geode/mesh/helpers/ray_tracing.cpp

@@ -254,6 +254,7 @@ namespace geode
                     {
                         distance *= -1.;
                     }
+                    std::lock_guard< std::mutex > lock{ mutex_ };
                     results_.emplace_back( polygon_id, distance, result.second,
                         std::move( intersection_result ) );
                 }
@@ -272,6 +273,7 @@ namespace geode
                         {
                             distance *= -1.;
                         }
+                        std::lock_guard< std::mutex > lock{ mutex_ };
                         results_.emplace_back( polygon_id, distance,
                             result.second, std::move( point ) );
                     }
@@ -304,6 +306,7 @@ namespace geode
         DEBUG_CONST OwnerSegment3D segment_;
         mutable std::vector< PolygonDistance > results_;
         mutable bool are_results_sorted_{ false };
+        std::mutex mutex_;
     };
 
     RayTracing3D::RayTracing3D( const SurfaceMesh3D& mesh, const Ray3D& ray )

tests/geometry/test-aabb.cpp

@@ -187,7 +187,6 @@ class BoxAABBIntersection
     }
     bool operator()( geode::index_t box1, geode::index_t box2 )
     {
-        DEBUG( "operator()" );
         if( box_contains_box( box1, box2 ) )
         {
             std::lock_guard< std::mutex > lock( mutex_ );
@@ -417,8 +416,6 @@ void test_self_intersections()
     eval_intersection.included_box_.clear();
     aabb.compute_self_element_bbox_intersections( eval_intersection );
 
-    DEBUG( eval_intersection.included_box_.size() );
-    DEBUG( nb_boxes * nb_boxes );
     OPENGEODE_EXCEPTION(
         eval_intersection.included_box_.size() == nb_boxes * nb_boxes,
         "[Test] Box self intersection - Every box should have one box "
@@ -438,12 +435,14 @@ class OtherAABBIntersection
 public:
     bool operator()( geode::index_t box1, geode::index_t box2 )
     {
+        std::lock_guard< std::mutex > lock( mutex_ );
         included_box_.push_back( { box1, box2 } );
         return false;
     }
 
 public:
     std::vector< std::pair< geode::index_t, geode::index_t > > included_box_;
+    std::mutex mutex_;
 };
 
 template < geode::index_t dimension >

tests/mesh/test-ray-tracing.cpp

@@ -35,6 +35,7 @@
 
 void test_ray_inside()
 {
+    geode::Logger::info( "Test ray inside" );
     auto mesh = geode::SurfaceMesh3D::create();
     auto builder = geode::SurfaceMeshBuilder3D::create( *mesh );
     builder->create_point( geode::Point3D{ { -1, -1, 1 } } );
@@ -62,26 +63,27 @@ void test_ray_inside()
 
 void test_ray_edge()
 {
+    geode::Logger::info( "Test ray edge" );
     auto mesh = geode::SurfaceMesh3D::create();
     auto builder = geode::SurfaceMeshBuilder3D::create( *mesh );
     builder->create_point( geode::Point3D{ { 1, -1, 0 } } );
     builder->create_point( geode::Point3D{ { 1, 1, 0 } } );
-    builder->create_point( geode::Point3D{ { 1, 0, 1 } } );
+    builder->create_point( geode::Point3D{ { 1, 0, -1 } } );
     builder->create_point( geode::Point3D{ { 1, 0, 3 } } );
     builder->create_polygon( { 0, 1, 2 } );
     builder->create_polygon( { 1, 0, 3 } );
     builder->compute_polygon_adjacencies();
 
     const auto aabb = geode::create_aabb_tree( *mesh );
     const geode::Vector3D direction{ { 1, 0, 0 } };
-    const geode::Point3D origin{ { 0, 0, 0 } };
+    const geode::Point3D origin{ { 0, 0, 1 } };
     const geode::Ray3D ray{ direction, origin };
     geode::RayTracing3D tracing{ *mesh, ray };
     aabb.compute_ray_element_bbox_intersections( ray, tracing );
     const auto result = tracing.closest_polygon();
     OPENGEODE_EXCEPTION( result, "[Test] Ray edge no result" );
     OPENGEODE_EXCEPTION(
-        result->polygon == 0, "[Test] Ray edge wrong polygon" );
+        result->polygon == 1, "[Test] Ray edge wrong polygon" );
     OPENGEODE_EXCEPTION(
         result->distance == 1, "[Test] Ray edge wrong distance" );
     OPENGEODE_EXCEPTION( tracing.all_intersections().size() == 1,
@@ -90,6 +92,7 @@ void test_ray_edge()
 
 void test_ray_parallel()
 {
+    geode::Logger::info( "Test ray parallel" );
     auto mesh = geode::SurfaceMesh3D::create();
     auto builder = geode::SurfaceMeshBuilder3D::create( *mesh );
     builder->create_point( geode::Point3D{ { -1, -1, 0 } } );