Merge branch 'main' into feat/shape_base

Author: rmaxi-me

lib/include/Vulk/Contexts/ContextVulkan.hpp

@@ -36,11 +36,14 @@ class ContextVulkan
     ~ContextVulkan();
 
     /**
-     * TODO: This should not be public imo. The Vulkan context should only be exposed to the window.
+     * TODO: This should not be public. The Vulkan context should only be exposed to the window.
      * Calling this function from the static `getInstance().draw()` can break stuff.
      */
     void draw();
 
+    // TODO: should not be public, remove once events are implemented
+    void setFrameBufferResized(bool value) noexcept { m_frameBufferResized = value; }
+
     static void createInstance(GLFWwindow* windowHandle);
     static ContextVulkan& getInstance();
 
@@ -121,10 +124,10 @@ class ContextVulkan
     explicit ContextVulkan(GLFWwindow* windowHandle);
 
     void createInstance();
-    void createSurface(GLFWwindow* windowHandle);
+    void createSurface();
     void pickPhysicalDevice();
     void createLogicalDevice();
-    void createSwapChain(GLFWwindow* windowHandle);
+    void createSwapChain();
     void createImageViews();
     void createRenderPass();
     void createGraphicsPipeline();
@@ -135,13 +138,17 @@ class ContextVulkan
     void createCommandBuffers();
     void createSyncObject();
 
+    void recreateSwapChain();
     void createBuffer(vk::DeviceSize size, vk::BufferUsageFlags usage, vk::MemoryPropertyFlags properties,
                       vk::Buffer& outBuffer, vk::DeviceMemory& outDeviceMemory);
     void copyBuffer(const vk::Buffer& sourceBuffer, vk::Buffer& destinationBuffer, vk::DeviceSize size);
 
+    void cleanupSwapchain(vk::SwapchainKHR& swapchain);
+    void cleanupSwapchainSubObjects();
+
     void chooseSwapSurfaceFormat();
     void chooseSwapPresentMode();
-    void chooseSwapExtent(GLFWwindow* windowHandle);
+    void chooseSwapExtent();
 
     [[nodiscard]] uint32_t findMemoryType(uint32_t typeFilter, vk::MemoryPropertyFlags properties) const;
 
@@ -152,6 +159,9 @@ class ContextVulkan
 
     // TODO: cache image count used in framebuffers, swap-chain, etc
 
+    // TODO: the ContextVulkan should not contain the raw window handle, maybe a Window reference though
+    GLFWwindow* m_windowHandle;
+
     vk::Instance m_instance{};
     vk::PhysicalDevice m_physicalDevice{};
     vk::Device m_device{};
@@ -164,10 +174,10 @@ class ContextVulkan
     vk::Queue m_graphicsQueue{};
     vk::Queue m_presentQueue{};
 
-    vk::SwapchainKHR m_swapChain{};
-    std::vector<vk::Image> m_swapChainImages{};
-    std::vector<vk::ImageView> m_swapChainImageViews{};
-    vk::Format m_swapChainFormat{};
+    vk::SwapchainKHR m_swapchain{};
+    std::vector<vk::Image> m_swapchainImages{};
+    std::vector<vk::ImageView> m_swapchainImageViews{};
+    vk::Format m_swapchainFormat{};
 
     vk::Viewport m_viewport{};
     vk::RenderPass m_renderPass{};
@@ -176,9 +186,9 @@ class ContextVulkan
 
     QueueFamilyIndices m_queueFamilyIndices{};
     QueueFamilyPropertiesList m_queueFamilyProperties{};
-    SwapChainSupportDetails m_swapChainSupport{};
+    SwapChainSupportDetails m_swapchainSupport{};
 
-    std::vector<vk::Framebuffer> m_swapChainFrameBuffers{};
+    std::vector<vk::Framebuffer> m_swapchainFrameBuffers{};
 
     vk::CommandPool m_commandPool{};
     std::vector<vk::CommandBuffer> m_commandBuffers{};
@@ -196,6 +206,8 @@ class ContextVulkan
     static const size_t s_maxFramesInFlight;
     //
 
+    bool m_frameBufferResized{false};
+
     template<typename T>
     static constexpr vk::IndexType getIndexType()
     {

lib/include/Vulk/FrameManager.hpp

@@ -50,7 +50,7 @@ class FrameManager final
     TimePoint m_lastFrame{};
     TimePoint m_lastSecond{};
 
-    double m_deltaTime{};
+    float m_deltaTime{};
     uint32_t m_framerate{};
     uint32_t m_frameCounter{};
 

lib/include/Vulk/Time.hpp

@@ -22,5 +22,5 @@
 #include <chrono>
 
 using Clock = std::chrono::high_resolution_clock;
-using Duration = std::chrono::duration<double>;
+using Duration = std::chrono::duration<float>;
 using TimePoint = decltype(Clock::now());