[window] Move window and surface code to subfolder in wrapper folder

Author: IAmNotHanni

include/inexor/vulkan-renderer/renderer.hpp

@@ -7,11 +7,14 @@
 #include "inexor/vulkan-renderer/time_step.hpp"
 #include "inexor/vulkan-renderer/wrapper/instance.hpp"
 #include "inexor/vulkan-renderer/wrapper/uniform_buffer.hpp"
-#include "inexor/vulkan-renderer/wrapper/window.hpp"
-#include "inexor/vulkan-renderer/wrapper/window_surface.hpp"
+#include "inexor/vulkan-renderer/wrapper/window/surface.hpp"
+#include "inexor/vulkan-renderer/wrapper/window/window.hpp"
 
 namespace inexor::vulkan_renderer {
 
+using wrapper::window::Window;
+using wrapper::window::WindowSurface;
+
 class VulkanRenderer {
 protected:
     std::vector<VkPipelineShaderStageCreateInfo> m_shader_stages;
@@ -24,7 +27,7 @@ class VulkanRenderer {
 
     std::uint32_t m_window_width{0};
     std::uint32_t m_window_height{0};
-    wrapper::Window::Mode m_window_mode{wrapper::Window::Mode::WINDOWED};
+    Window::Mode m_window_mode{Window::Mode::WINDOWED};
 
     std::string m_window_title;
 
@@ -34,10 +37,10 @@ class VulkanRenderer {
 
     std::unique_ptr<Camera> m_camera;
 
-    std::unique_ptr<wrapper::Window> m_window;
+    std::unique_ptr<Window> m_window;
     std::unique_ptr<wrapper::Instance> m_instance;
     std::unique_ptr<wrapper::Device> m_device;
-    std::unique_ptr<wrapper::WindowSurface> m_surface;
+    std::unique_ptr<WindowSurface> m_surface;
     std::unique_ptr<wrapper::Swapchain> m_swapchain;
     std::unique_ptr<ImGUIOverlay> m_imgui_overlay;
     std::unique_ptr<RenderGraph> m_render_graph;

…lkan-renderer/wrapper/window_surface.hpp …lkan-renderer/wrapper/window/surface.hppinclude/inexor/vulkan-renderer/wrapper/window_surface.hpp renamed to include/inexor/vulkan-renderer/wrapper/window/surface.hpp include/inexor/vulkan-renderer/wrapper/window_surface.hpp renamed to include/inexor/vulkan-renderer/wrapper/window/surface.hpp

@@ -3,7 +3,7 @@
 #include <GLFW/glfw3.h>
 #include <volk.h>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::window {
 
 /// @brief RAII wrapper class for VkSurfaceKHR.
 class WindowSurface {
@@ -29,4 +29,4 @@ class WindowSurface {
     }
 };
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::window

…nexor/vulkan-renderer/wrapper/window.hpp …ulkan-renderer/wrapper/window/window.hppinclude/inexor/vulkan-renderer/wrapper/window.hpp renamed to include/inexor/vulkan-renderer/wrapper/window/window.hpp include/inexor/vulkan-renderer/wrapper/window.hpp renamed to include/inexor/vulkan-renderer/wrapper/window/window.hpp

@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <string>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::window {
 
 /// @brief RAII wrapper class for GLFW windows.
 class Window {
@@ -93,4 +93,4 @@ class Window {
     }
 };
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::window

src/CMakeLists.txt

@@ -38,8 +38,9 @@ set(INEXOR_SOURCE_FILES
     vulkan-renderer/wrapper/shader.cpp
     vulkan-renderer/wrapper/swapchain.cpp
     vulkan-renderer/wrapper/uniform_buffer.cpp
-    vulkan-renderer/wrapper/window.cpp
-    vulkan-renderer/wrapper/window_surface.cpp
+
+    vulkan-renderer/wrapper/window/window.cpp
+    vulkan-renderer/wrapper/window/surface.cpp
 
     vulkan-renderer/world/collision.cpp
     vulkan-renderer/world/collision_query.cpp

src/vulkan-renderer/application.cpp

@@ -44,7 +44,8 @@ void Application::load_toml_configuration_file(const std::string &file_name) {
     const auto &configuration_title = toml::find<std::string>(renderer_configuration, "title");
     spdlog::trace("Title: {}", configuration_title);
 
-    using WindowMode = ::inexor::vulkan_renderer::wrapper::Window::Mode;
+    using WindowMode = wrapper::window::Window::Mode;
+
     const auto &wmodestr = toml::find<std::string>(renderer_configuration, "application", "window", "mode");
     if (wmodestr == "windowed") {
         m_window_mode = WindowMode::WINDOWED;
@@ -336,8 +337,10 @@ Application::Application(int argc, char **argv) {
 
     spdlog::trace("Creating Vulkan instance");
 
-    m_window =
-        std::make_unique<wrapper::Window>(m_window_title, m_window_width, m_window_height, true, true, m_window_mode);
+    using wrapper::window::Window;
+    using wrapper::window::WindowSurface;
+
+    m_window = std::make_unique<Window>(m_window_title, m_window_width, m_window_height, true, true, m_window_mode);
 
     m_instance = std::make_unique<wrapper::Instance>(
         APP_NAME, ENGINE_NAME, VK_MAKE_API_VERSION(0, APP_VERSION[0], APP_VERSION[1], APP_VERSION[2]),
@@ -346,7 +349,7 @@ Application::Application(int argc, char **argv) {
 
     m_input = std::make_unique<input::Input>();
 
-    m_surface = std::make_unique<wrapper::WindowSurface>(m_instance->instance(), m_window->get());
+    m_surface = std::make_unique<WindowSurface>(m_instance->instance(), m_window->get());
 
     setup_window_and_input_callbacks();
 

…lkan-renderer/wrapper/window_surface.cpp …lkan-renderer/wrapper/window/surface.cppsrc/vulkan-renderer/wrapper/window_surface.cpp renamed to src/vulkan-renderer/wrapper/window/surface.cpp src/vulkan-renderer/wrapper/window_surface.cpp renamed to src/vulkan-renderer/wrapper/window/surface.cpp

@@ -1,4 +1,4 @@
-#include "inexor/vulkan-renderer/wrapper/window_surface.hpp"
+#include "inexor/vulkan-renderer/wrapper/window/surface.hpp"
 
 #include "inexor/vulkan-renderer/exception.hpp"
 
@@ -7,7 +7,7 @@
 #include <cassert>
 #include <utility>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::window {
 
 WindowSurface::WindowSurface(const VkInstance instance, GLFWwindow *window) : m_instance(instance) {
     assert(instance);
@@ -29,4 +29,4 @@ WindowSurface::~WindowSurface() {
     vkDestroySurfaceKHR(m_instance, m_surface, nullptr);
 }
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::window

src/vulkan-renderer/wrapper/window.cpp …ulkan-renderer/wrapper/window/window.cppsrc/vulkan-renderer/wrapper/window.cpp renamed to src/vulkan-renderer/wrapper/window/window.cpp src/vulkan-renderer/wrapper/window.cpp renamed to src/vulkan-renderer/wrapper/window/window.cpp

@@ -1,12 +1,12 @@
-#include "inexor/vulkan-renderer/wrapper/window.hpp"
+#include "inexor/vulkan-renderer/wrapper/window/window.hpp"
 
 #include <GLFW/glfw3.h>
 #include <spdlog/spdlog.h>
 
 #include <cassert>
 #include <stdexcept>
 
-namespace inexor::vulkan_renderer::wrapper {
+namespace inexor::vulkan_renderer::wrapper::window {
 
 Window::Window(const std::string &title, const std::uint32_t width, const std::uint32_t height, const bool visible,
                const bool resizable, const Mode mode)
@@ -99,4 +99,4 @@ bool Window::should_close() {
     return glfwWindowShouldClose(m_window) == GLFW_TRUE;
 }
 
-} // namespace inexor::vulkan_renderer::wrapper
+} // namespace inexor::vulkan_renderer::wrapper::window