[*] Move camera code to tools folder

Author: IAmNotHanni

include/inexor/vulkan-renderer/renderer.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "inexor/vulkan-renderer/camera.hpp"
 #include "inexor/vulkan-renderer/fps_counter.hpp"
 #include "inexor/vulkan-renderer/imgui.hpp"
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/time_step.hpp"
+#include "inexor/vulkan-renderer/tools/camera.hpp"
 #include "inexor/vulkan-renderer/wrapper/instance.hpp"
 #include "inexor/vulkan-renderer/wrapper/uniform_buffer.hpp"
 #include "inexor/vulkan-renderer/wrapper/window/surface.hpp"
@@ -35,7 +35,7 @@ class VulkanRenderer {
 
     bool m_vsync_enabled{false};
 
-    std::unique_ptr<Camera> m_camera;
+    std::unique_ptr<tools::Camera> m_camera;
 
     std::unique_ptr<Window> m_window;
     std::unique_ptr<wrapper::Instance> m_instance;

include/inexor/vulkan-renderer/camera.hpp renamed to include/inexor/vulkan-renderer/tools/camera.hpp

@@ -7,7 +7,7 @@
 #include <array>
 #include <vector>
 
-namespace inexor::vulkan_renderer {
+namespace inexor::vulkan_renderer::tools {
 
 namespace directions {
 /// The default value of the camera's front vector.
@@ -225,4 +225,4 @@ class Camera {
         return m_perspective_matrix;
     }
 };
-} // namespace inexor::vulkan_renderer
+} // namespace inexor::vulkan_renderer::tools

src/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(INEXOR_SOURCE_FILES
     vulkan-renderer/application.cpp
-    vulkan-renderer/camera.cpp
     vulkan-renderer/exception.cpp
     vulkan-renderer/fps_counter.cpp
     vulkan-renderer/imgui.cpp
@@ -15,6 +14,7 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/io/byte_stream.cpp
     vulkan-renderer/io/nxoc_parser.cpp
 
+    vulkan-renderer/tools/camera.cpp
     vulkan-renderer/tools/cla_parser.cpp
     vulkan-renderer/tools/device_info.cpp
     vulkan-renderer/tools/enumerate.cpp

src/vulkan-renderer/application.cpp

@@ -1,10 +1,10 @@
 #include "inexor/vulkan-renderer/application.hpp"
 
-#include "inexor/vulkan-renderer/camera.hpp"
 #include "inexor/vulkan-renderer/exception.hpp"
 #include "inexor/vulkan-renderer/meta.hpp"
 #include "inexor/vulkan-renderer/octree_gpu_vertex.hpp"
 #include "inexor/vulkan-renderer/standard_ubo.hpp"
+#include "inexor/vulkan-renderer/tools/camera.hpp"
 #include "inexor/vulkan-renderer/tools/cla_parser.hpp"
 #include "inexor/vulkan-renderer/tools/enumerate.hpp"
 #include "inexor/vulkan-renderer/world/collision.hpp"
@@ -526,6 +526,8 @@ void Application::process_input() {
 
     auto deadzone_lambda = [](const float state) { return (glm::abs(state) < 0.2f) ? 0.0f : state; };
 
+    using namespace tools;
+
     if (m_camera->type() == CameraType::LOOK_AT &&
         m_input->kbm_data().is_mouse_button_pressed(GLFW_MOUSE_BUTTON_LEFT)) {
         m_camera->rotate(static_cast<float>(cursor_pos_delta[0]), -static_cast<float>(cursor_pos_delta[1]));

src/vulkan-renderer/renderer.cpp

@@ -78,7 +78,8 @@ void VulkanRenderer::recreate_swapchain() {
     m_render_graph = std::make_unique<RenderGraph>(*m_device, *m_swapchain);
     setup_render_graph();
 
-    m_camera = std::make_unique<Camera>(glm::vec3(6.0f, 10.0f, 2.0f), 180.0f, 0.0f,
+    m_camera =
+        std::make_unique<tools::Camera>(glm::vec3(6.0f, 10.0f, 2.0f), 180.0f, 0.0f,
                                         static_cast<float>(m_window->width()), static_cast<float>(m_window->height()));
 
     m_camera->set_movement_speed(5.0f);

src/vulkan-renderer/camera.cpp renamed to src/vulkan-renderer/tools/camera.cpp

@@ -1,6 +1,6 @@
-#include "inexor/vulkan-renderer/camera.hpp"
+#include "inexor/vulkan-renderer/tools/camera.hpp"
 
-namespace inexor::vulkan_renderer {
+namespace inexor::vulkan_renderer::tools {
 
 Camera::Camera(const glm::vec3 &position, const float yaw, const float pitch, const float window_width,
                const float window_height)
@@ -144,4 +144,4 @@ void Camera::update(const float delta_time) {
     }
 }
 
-} // namespace inexor::vulkan_renderer
+} // namespace inexor::vulkan_renderer::tools