Merge pull request #120 from Geode-solutions/perf/aabb-async

MelchiorSchuh · web-flow · commit 96627628defb · 2024-12-05T13:52:16.000+01:00
fix(OpenGeode): add mutex in intersection detection
diff --git a/src/geode/inspector/criterion/intersections/model_intersections.cpp b/src/geode/inspector/criterion/intersections/model_intersections.cpp
@@ -176,6 +176,7 @@ namespace
 
         void emplace( geode::index_t p1_id, geode::index_t p2_id )
         {
+            std::lock_guard< std::mutex > lock( mutex_ );
             intersecting_polygons_.emplace_back( p1_id, p2_id );
         }
 
@@ -207,6 +208,7 @@ namespace
         const geode::SurfaceMesh< Model::dim >& mesh2_;
         std::vector< std::pair< geode::index_t, geode::index_t > >
             intersecting_polygons_;
+        std::mutex mutex_;
     };
 
     template < typename Model >

Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ namespace`
`176`	`176`
`177`	`177`	`void emplace( geode::index_t p1_id, geode::index_t p2_id )`
`178`	`178`	`{`
	`179`	`+ std::lock_guard< std::mutex > lock( mutex_ );`
`179`	`180`	`intersecting_polygons_.emplace_back( p1_id, p2_id );`
`180`	`181`	`}`
`181`	`182`
`@@ -207,6 +208,7 @@ namespace`
`207`	`208`	`const geode::SurfaceMesh< Model::dim >& mesh2_;`
`208`	`209`	`std::vector< std::pair< geode::index_t, geode::index_t > >`
`209`	`210`	`intersecting_polygons_;`
	`211`	`+ std::mutex mutex_;`
`210`	`212`	`};`
`211`	`213`
`212`	`214`	`template < typename Model >`