Replaced Vulkan extents for window

Author: jonjondev

engine/render/renderer/Renderer.cpp

@@ -26,7 +26,7 @@ Renderer::Renderer(Window& window) : window {window}
 
     if (instance == nullptr) instance = this;
 
-    auto extent = window.GetExtent();
+    auto extent = window.GetExtents();
 
     context.Init({extent.width, extent.height},
                  Window::GetRequiredExtensions,
@@ -63,11 +63,11 @@ void Renderer::DrawFrame()
 void Renderer::RecreateSwapChain()
 {
     ClearDeviceQueue();
-    auto extent = window.GetExtent();
+    auto extent = window.GetExtents();
 
     while (!window.IsVisible() || extent.width == 0.0 || extent.height == 0.0)
     {
-        extent = window.GetExtent();
+        extent = window.GetExtents();
         window.WaitEvents();
     }
 

engine/render/window/Window.cpp

@@ -40,10 +40,7 @@ MHArray<const char*> Window::GetRequiredExtensions()
 void Window::ResizeCallback(GLFWwindow* windowPtr, int width, int height)
 {
     auto windowContext = reinterpret_cast<Window*>(glfwGetWindowUserPointer(windowPtr));
-
     windowContext->wasResized = true;
-
-    windowContext->width = width;
-    windowContext->height = height;
+    windowContext->extents = {static_cast<uint32_t>(width), static_cast<uint32_t>(height)};
 }
 } // namespace Siege

engine/render/window/Window.h

@@ -13,19 +13,26 @@
 
 #include <cstdint>
 
-// Include Vulkan headers through GLFW
 #include <GLFW/glfw3.h>
 #include <utils/collections/HeapArray.h>
 
 namespace Siege
 {
+
+
+struct WindowExtents
+{
+    uint32_t width {0};
+    uint32_t height {0};
+};
+
 class Window
 {
 public:
 
     // 'Structors
 
-    Window(char const* name, int width, int height) : width(width), height(height)
+    Window(char const* name, WindowExtents extents) : extents(extents)
     {
         if (!glfwInitialised)
         {
@@ -36,7 +43,7 @@ class Window
         glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
         glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
 
-        if (!window) window = glfwCreateWindow(width, height, name, nullptr, nullptr);
+        if (!window) window = glfwCreateWindow(extents.width, extents.height, name, nullptr, nullptr);
 
         if (glfwRawMouseMotionSupported())
         {
@@ -55,7 +62,7 @@ class Window
         glfwGetMonitorContentScale(glfwGetPrimaryMonitor(), &DPI.width, &DPI.height);
     }
 
-    Window() : Window("Window", 800, 600) {}
+    Window() : Window("Window", {800, 600}) {}
 
     ~Window()
     {
@@ -67,12 +74,12 @@ class Window
 
     const int GetHeight() const
     {
-        return height;
+        return extents.height;
     }
 
     const int GetWidth() const
     {
-        return width;
+        return extents.width;
     }
 
     const bool IsVisible() const
@@ -89,17 +96,17 @@ class Window
 
     const uint32_t GetScaledWidth() const
     {
-        return width * DPI.width;
+        return extents.width * DPI.width;
     }
 
     const uint32_t GetScaledHeight() const
     {
-        return height * DPI.height;
+        return extents.height * DPI.height;
     }
 
-    VkExtent2D GetExtent() const
+    WindowExtents GetExtents() const
     {
-        return {static_cast<uint32_t>(width), static_cast<uint32_t>(height)};
+        return extents;
     }
 
     GLFWwindow* GetGlfwWindow()
@@ -166,8 +173,7 @@ class Window
 
     static GLFWwindow* window;
 
-    int width;
-    int height;
+    WindowExtents extents;
 
     MonitorPixelScale DPI {};
     bool wasResized {false};

examples/render/src/main.cpp

@@ -40,7 +40,7 @@ int main()
 {
     WINDOWS_ATTACH_CONSOLE
 
-    Siege::Window window("Render Example", WIDTH, HEIGHT);
+    Siege::Window window("Render Example", {WIDTH, HEIGHT});
 
     window.DisableCursor();