geometry

cppd · cppd · commit 2da82a81b81b · 2026-03-31T08:49:07.000+03:00
diff --git a/src/geometry/accelerators/tree.cpp b/src/geometry/accelerators/tree.cpp
@@ -143,7 +143,7 @@ void insert_child_box_indices(const Objects& objects, const std::vector<int>& bo
 }
 
 template <typename Box, typename Objects>
-void extend(
+bool extend_iteration(
         const Objects& objects,
         const unsigned max_depth,
         const unsigned min_objects,
@@ -153,37 +153,57 @@ void extend(
         ThreadTaskManager<Task<Box>>* const task_manager,
         progress::Ratio* const progress)
 {
-        while (true)
+        const auto task = task_manager->get();
+        if (!task)
         {
-                const auto task = task_manager->get();
-                if (!task)
-                {
-                        break;
-                }
+                return false;
+        }
+
+        if (task->depth >= max_depth || task->box->object_indices.size() <= min_objects)
+        {
+                task->box->childs[0] = -1;
+                return true;
+        }
 
-                if (task->depth >= max_depth || task->box->object_indices.size() <= min_objects)
+        const std::array child_boxes = create_child_boxes(task->box->parallelotope, boxes_lock, boxes);
+        for (std::size_t i = 0; i < child_boxes.size(); ++i)
+        {
+                if ((child_boxes[i].index & 0xfff) == 0xfff)
                 {
-                        task->box->childs[0] = -1;
-                        continue;
+                        progress->set(child_boxes[i].index, max_boxes);
                 }
 
-                const std::array child_boxes = create_child_boxes(task->box->parallelotope, boxes_lock, boxes);
-                for (std::size_t i = 0; i < child_boxes.size(); ++i)
-                {
-                        if ((child_boxes[i].index & 0xfff) == 0xfff)
-                        {
-                                progress->set(child_boxes[i].index, max_boxes);
-                        }
+                task->box->childs[i] = child_boxes[i].index;
 
-                        task->box->childs[i] = child_boxes[i].index;
+                Box* const child_box = child_boxes[i].box;
+                insert_child_box_indices(objects, task->box->object_indices, child_box);
+                task_manager->emplace(child_box, task->depth + 1);
+        }
 
-                        Box* const child_box = child_boxes[i].box;
-                        insert_child_box_indices(objects, task->box->object_indices, child_box);
-                        task_manager->emplace(child_box, task->depth + 1);
-                }
+        task->box->object_indices.clear();
+        task->box->object_indices.shrink_to_fit();
 
-                task->box->object_indices.clear();
-                task->box->object_indices.shrink_to_fit();
+        return true;
+}
+
+template <typename Box, typename Objects>
+void extend(
+        const Objects& objects,
+        const unsigned max_depth,
+        const unsigned min_objects,
+        const unsigned max_boxes,
+        std::mutex* const boxes_lock,
+        std::deque<Box>* const boxes,
+        ThreadTaskManager<Task<Box>>* const task_manager,
+        progress::Ratio* const progress)
+{
+        while (true)
+        {
+                if (!extend_iteration(
+                            objects, max_depth, min_objects, max_boxes, boxes_lock, boxes, task_manager, progress))
+                {
+                        return;
+                }
         }
 }
 
