Merge pull request #42 from CapsCollective/feature/window-target

Split out window and input into its own module

Author: jonjondev

Makefile

@@ -42,6 +42,7 @@ export examplesDir := $(abspath examples)
 
 # Set top level targets
 export utilsLib := $(libDir)/libutils.a
+export windowLib := $(libDir)/libwindow.a
 export coreLib := $(libDir)/libcore.a
 export renderLib := $(libDir)/librender.a
 export testApp := $(binDir)/tests/build/app
@@ -60,10 +61,13 @@ all: testapp package-gameapp package-renderapp
 $(utilsLib): buildFlags
 	"$(MAKE)" -C $(engineDir)/utils CXXFLAGS="$(CXXFLAGS)"
 
+$(windowLib): buildFlags $(utilsLib)
+	"$(MAKE)" -C $(engineDir)/window CXXFLAGS="$(CXXFLAGS)"
+
 $(coreLib): buildFlags $(utilsLib)
 	"$(MAKE)" -C $(engineDir)/core CXXFLAGS="$(CXXFLAGS)"
 
-$(renderLib): buildFlags $(utilsLib)
+$(renderLib): buildFlags $(utilsLib) $(windowLib)
 	"$(MAKE)" -C $(engineDir)/render CXXFLAGS="$(CXXFLAGS)"
 
 $(testApp): buildFlags $(utilsLib) $(coreLib)

engine/render/Makefile

@@ -14,16 +14,15 @@ renderSources := $(call rwildcard,$(renderSrcDir)/,*.cpp)
 renderObjects := $(call findobjs,$(renderSrcDir),$(renderBinDir),$(renderSources))
 renderDepends := $(patsubst %.o, %.d, $(call rwildcard,$(renderBinDir)/,*.o))
 renderBuildDir := $(renderBinDir)/build
-renderLibs := $(vendorDir)/glfw/build/src/libglfw3.a $(vendorDir)/zlib/build/lib/libz.a \
-$(vendorDir)/libpng/build/libpng.a $(vendorDir)/freetype/build/libfreetype.a
+renderLibs := $(vendorDir)/zlib/build/lib/libz.a $(vendorDir)/libpng/build/libpng.a $(vendorDir)/freetype/build/libfreetype.a
 
 # Set shader build vars
 vertSources := $(call rwildcard,assets/shaders,*.vert)
 fragSources := $(call rwildcard,assets/shaders,*.frag)
 vertObjects := $(patsubst %.vert,$(renderBuildDir)/%.vert.spv,$(vertSources))
 fragObjects := $(patsubst %.frag,$(renderBuildDir)/%.frag.spv,$(fragSources))
 
-linkFlags += -l utils
+linkFlags += -l utils -l window
 
 compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include -I $(vendorDir)/glm \
 				-I $(vendorDir)/tinyobjloader -I $(vendorDir)/stb_image -I $(vendorDir)/zlib/build/include \

engine/render/input/Input.cpp

@@ -26,11 +26,9 @@ 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,
-                 Window::CreateWindowSurface);
+    context.Init(window);
 
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024);
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);
@@ -63,11 +61,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();
     }
 
@@ -123,7 +121,7 @@ void Renderer::DrawQuad(const Vec2 position,
     renderer2D.DrawQuad(position, scale, colour, rotation, zIndex, texture);
 }
 
-void Renderer::DrawText2D(const char* const text,
+void Renderer::DrawText2D(const char* text,
                           Vulkan::Font& font,
                           const Vec2 position,
                           const Vec2 scale,

engine/render/input/Input.h

@@ -10,13 +10,13 @@
 #define SIEGE_ENGINE_RENDERER_H
 
 #include <utils/Logging.h>
+#include <window/Window.h>
 
 #include "descriptor/DescriptorPool.h"
 #include "lights/PointLight.h"
 #include "model/Model.h"
 #include "render/renderer/platform/vulkan/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
-#include "render/window/Window.h"
 #include "renderer/Renderer2D.h"
 #include "renderer/Renderer3D.h"
 
@@ -64,7 +64,7 @@ class Renderer
                   float rotation = 0.f,
                   const uint8_t zIndex = 0,
                   Vulkan::Texture2D* texture = nullptr);
-    void DrawText2D(const char* const text,
+    void DrawText2D(const char* text,
                     Vulkan::Font& font,
                     const Vec2 position,
                     const Vec2 scale,

engine/render/renderer/Renderer.cpp

@@ -9,6 +9,7 @@
 
 #include "Context.h"
 
+#include <GLFW/glfw3.h>
 #include <utils/Logging.h>
 
 #include "render/renderer/Renderer.h"
@@ -23,22 +24,24 @@ Context::~Context()
     vulkanInstance.~Instance();
 }
 
-void Context::Init(const Utils::Extent2D& extent,
-                   Instance::GetSurfaceExtensionsCallback surfaceExtensionsCallback,
-                   GetWindowSurfaceCallBack windowSurfaceCallback)
+void Context::Init(Window& window)
 {
     CC_ASSERT(volkInitialize() == VK_SUCCESS, "Unable to initialise Volk!")
 
-    vulkanInstance = Instance(surfaceExtensionsCallback);
+    vulkanInstance = Instance(window.GetRequiredExtensions());
+    glfwCreateWindowSurface(vulkanInstance.GetInstance(),
+                            reinterpret_cast<GLFWwindow*>(window.GetRawWindow()),
+                            nullptr,
+                            &surface);
 
-    CC_ASSERT(windowSurfaceCallback(vulkanInstance.GetInstance(), &surface),
-              "Unable to create window surface!")
+    CC_ASSERT(surface != VK_NULL_HANDLE, "Unable to create surface!")
 
     physicalDevice = PhysicalDevice(surface, vulkanInstance);
 
     logicalDevice = LogicalDevice(surface, physicalDevice);
 
-    swapchain = Swapchain(extent);
+    auto extents = window.GetExtents();
+    swapchain = Swapchain({extents.width, extents.height});
 }
 
 Context& Context::Get()

engine/render/renderer/Renderer.h

@@ -13,22 +13,18 @@
 #include "LogicalDevice.h"
 #include "PhysicalDevice.h"
 #include "Swapchain.h"
+#include "window/Window.h"
 
 namespace Siege::Vulkan
 {
 class Context
 {
 public:
 
-    typedef bool (*getSurfaceCallback)(VkInstance, Surface*);
-    typedef getSurfaceCallback GetWindowSurfaceCallBack;
-
     Context() = default;
     ~Context();
 
-    void Init(const Utils::Extent2D& extent,
-              Instance::GetSurfaceExtensionsCallback surfaceExtensionsCallback,
-              GetWindowSurfaceCallBack windowSurfaceCallback);
+    void Init(Window& window);
 
     static Context& Get();
 

engine/render/renderer/platform/vulkan/Context.cpp

@@ -64,9 +64,9 @@
 
 namespace Siege::Vulkan
 {
-Instance::Instance(GetSurfaceExtensionsCallback surfaceExtensionsCallback)
+Instance::Instance(MHArray<const char*> surfaceExtensions)
 {
-    CreateInstance(surfaceExtensionsCallback());
+    CreateInstance(surfaceExtensions);
 
     SETUP_UTILS_MESSENGER
 }

engine/render/renderer/platform/vulkan/Context.h

@@ -19,11 +19,8 @@ class Instance
 {
 public:
 
-    typedef Siege::MHArray<const char*> (*surfaceCallback)(void);
-    typedef surfaceCallback GetSurfaceExtensionsCallback;
-
     Instance() = default;
-    Instance(GetSurfaceExtensionsCallback surfaceExtensionsCallback);
+    Instance(MHArray<const char*> surfaceExtensions);
     Instance(Instance&& other);
     ~Instance();