[*] Remove old collision detection

Author: IAmNotHanni

benchmarks/CMakeLists.txt

@@ -1,7 +1,5 @@
 set(INEXOR_BENCHMARKING_SOURCE_FILES
     engine_benchmark_main.cpp
-
-    world/cube_collision.cpp
 )
 
 add_executable(inexor-vulkan-renderer-benchmarks ${INEXOR_BENCHMARKING_SOURCE_FILES})

benchmarks/world/cube_collision.cpp

@@ -2,7 +2,6 @@
 
 #include "inexor/vulkan-renderer/input/keyboard_mouse_data.hpp"
 #include "inexor/vulkan-renderer/renderer.hpp"
-#include "inexor/vulkan-renderer/world/collision_query.hpp"
 #include "inexor/vulkan-renderer/world/cube.hpp"
 
 #include <GLFW/glfw3.h>
@@ -32,6 +31,15 @@ class Application : public VulkanRenderer {
     /// Inexor engine supports a variable number of octrees.
     std::vector<std::shared_ptr<world::Cube>> m_worlds;
 
+    /// If multiple root octrees exist, we check for collisions between camera ray and octree by increasing square of
+    /// the distance between the camera and the root octree's center. This way, we check for collisions with the nearest
+    /// root octrees first. Furthermore, we avoid using a sqrt function for distance calculation, which is an expensive
+    /// calculation to perform.
+    /// The first value of the std::pair is the index in the m_worlds vector, the second value is the square of the
+    /// distance betweeen the camera and the root octree's center.
+    /// We do not perform any memory allocations on m_collision_candidates as long as m_worlds does not change.
+    std::vector<std::pair<std::size_t, float>> m_collision_candidates;
+
     // If the user specified command line argument "--stop-on-validation-message", the program will call
     // std::abort(); after reporting a validation layer (error) message.
     bool m_stop_on_validation_message{false};

include/inexor/vulkan-renderer/application.hpp

@@ -43,8 +43,6 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/window.cpp
     vulkan-renderer/wrapper/window_surface.cpp
 
-    vulkan-renderer/world/collision.cpp
-    vulkan-renderer/world/collision_query.cpp
     vulkan-renderer/world/cube.cpp
     vulkan-renderer/world/indentation.cpp)
 

include/inexor/vulkan-renderer/world/collision.hpp

@@ -5,7 +5,6 @@
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/standard_ubo.hpp"
 #include "inexor/vulkan-renderer/tools/cla_parser.hpp"
-#include "inexor/vulkan-renderer/world/collision.hpp"
 #include "inexor/vulkan-renderer/world/cube.hpp"
 #include "inexor/vulkan-renderer/wrapper/cpu_texture.hpp"
 #include "inexor/vulkan-renderer/wrapper/descriptor_builder.hpp"
@@ -200,6 +199,9 @@ void Application::load_octree_geometry(bool initialize) {
     m_worlds.push_back(
         world::create_random_world(2, {10.0f, 0.0f, 0.0f}, initialize ? std::optional(60) : std::nullopt));
 
+    // Reserve memory for collision checks
+    m_collision_candidates.reserve(m_worlds.size());
+
     m_octree_vertices.clear();
     for (const auto &world : m_worlds) {
         for (const auto &polygons : world->polygons(true)) {
@@ -575,24 +577,7 @@ void Application::process_mouse_input() {
 }
 
 void Application::check_octree_collisions() {
-    // Check for collision between camera ray and every octree
-    for (const auto &world : m_worlds) {
-        const auto collision = ray_cube_collision_check(*world, m_camera->position(), m_camera->front());
-
-        if (collision) {
-            const auto intersection = collision.value().intersection();
-            const auto face_normal = collision.value().face();
-            const auto corner = collision.value().corner();
-            const auto edge = collision.value().edge();
-
-            spdlog::trace("pos {} {} {} | face {} {} {} | corner {} {} {} | edge {} {} {}", intersection.x,
-                          intersection.y, intersection.z, face_normal.x, face_normal.y, face_normal.z, corner.x,
-                          corner.y, corner.z, edge.x, edge.y, edge.z);
-
-            // Break after one collision.
-            break;
-        }
-    }
+    // TODO
 }
 
 void Application::run() {