From eaa20a2cb020dca36b5b71a4dae21edfc8456bab Mon Sep 17 00:00:00 2001
From: Johannes Schneider <johannesschneider@outlook.com>
Date: Sat, 24 Jul 2021 17:36:31 +0200
Subject: [PATCH] [collision-solver] Correct critical section and simplify loop

---
 src/vulkan-renderer/world/collision_solver.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vulkan-renderer/world/collision_solver.cpp b/src/vulkan-renderer/world/collision_solver.cpp
index 125c97fef..2d47739e1 100644
--- a/src/vulkan-renderer/world/collision_solver.cpp
+++ b/src/vulkan-renderer/world/collision_solver.cpp
@@ -22,18 +22,17 @@ OctreeCollisionSolver::find_all_ray_octree_collisions(const std::vector<std::sha
     found_collisions.reserve(worlds.size());
 
     // We need a critical section because we are modifying m_collision_candidates.
-    std::scoped_lock lock(m_collision_solver_mutex);
     {
+        std::scoped_lock lock(m_collision_solver_mutex);
+
         // TODO: Optimize this! Avoid memory re-allocation if possible and benchmark it.
         m_collision_candidates.clear();
         m_collision_candidates.reserve(worlds.size());
 
         for (const auto &world : worlds) {
-            if (!is_bounding_box_and_bounding_sphere_hit(world, position, direction)) {
-                continue;
+            if (is_bounding_box_and_bounding_sphere_hit(world, position, direction)) {
+                m_collision_candidates.emplace_back(std::make_pair(world, glm::distance2(position, direction)));
             }
-
-            m_collision_candidates.emplace_back(std::make_pair(world, glm::distance2(position, direction)));
         }
 
         // Sort the octree collision candidates by increasing square of distance between cube center and camera.