Split out window 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,16 @@ 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/renderer/Renderer.cpp

@@ -14,6 +14,15 @@
 #include "platform/vulkan/utils/Types.h"
 #include "statics/Statics.h"
 
+// TODO look into why including via GLFW header + volk isn't defining this - JDM
+extern "C"
+{
+    GLFWAPI VkResult glfwCreateWindowSurface(VkInstance instance,
+                                             GLFWwindow* window,
+                                             const VkAllocationCallbacks* allocator,
+                                             VkSurfaceKHR* surface);
+}
+
 namespace Siege
 {
 Renderer* Renderer::instance {nullptr};
@@ -27,13 +36,12 @@ Renderer::Renderer(Window& window) : window {window}
     if (instance == nullptr) instance = this;
 
     auto createWindowSurface = [&window](VkInstance instance, VkSurfaceKHR* surface) -> bool {
-        return glfwCreateWindowSurface(instance, window.GetGlfwWindow(), nullptr, surface) == VK_SUCCESS;
+        return glfwCreateWindowSurface(instance, window.GetGlfwWindow(), nullptr, surface) ==
+               VK_SUCCESS;
     };
 
     auto extent = window.GetExtents();
-    context.Init({extent.width, extent.height},
-                 Window::GetRequiredExtensions,
-                 createWindowSurface);
+    context.Init({extent.width, extent.height}, Window::GetRequiredExtensions, createWindowSurface);
 
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024);
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);

engine/render/renderer/Renderer.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"
 

engine/render/input/Input.cpp renamed to engine/window/Input.cpp

@@ -11,7 +11,7 @@
 
 #include <map>
 
-#include "../window/Window.h"
+#include "Window.h"
 
 #define KEY_W GLFW_KEY_W
 #define KEY_A GLFW_KEY_A

engine/render/input/Input.h renamed to engine/window/Input.h

@@ -0,0 +1,32 @@
+# Copyright (c) 2022 Jonathan Moallem (@J-Mo63) & Aryeh Zinn (@Raelr)
+#
+# This code is released under an unmodified zlib license.
+# For conditions of distribution and use, please see:
+#     https://opensource.org/licenses/Zlib
+
+include $(makeDir)/Functions.mk
+include $(makeDir)/Platform.mk
+
+# Set source build vars
+windowSrcDir := .
+windowBinDir := $(binDir)/engine/window
+windowSources := $(call rwildcard,$(windowSrcDir)/,*.cpp)
+windowObjects := $(call findobjs,$(windowSrcDir),$(windowBinDir),$(windowSources))
+windowDepends := $(patsubst %.o, %.d, $(call rwildcard,$(windowBinDir)/,*.o))
+windowLibs := $(vendorDir)/glfw/build/src/libglfw3.a
+
+linkFlags += -l utils
+compileFlags += -I $(vendorDir)/glfw/include
+
+# Build the static library
+$(windowLib): $(windowObjects)
+	$(RM) $(call platformpth, $(windowLib))
+	$(call COMBINE_LIBS, $(windowLibs), $(windowObjects), $(libDir), window)
+
+# Add all rules from dependency files
+-include $(windowDepends)
+
+# Compile object files to the bin directory
+$(windowBinDir)/%.o: $(windowSrcDir)/%.cpp
+	$(MKDIR) $(call platformpth, $(@D))
+	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)

engine/window/Makefile

@@ -9,15 +9,14 @@
 #ifndef SIEGE_ENGINE_RENDERER_WINDOW_H
 #define SIEGE_ENGINE_RENDERER_WINDOW_H
 
-#include <cstdint>
-
 #include <GLFW/glfw3.h>
 #include <utils/collections/HeapArray.h>
 
+#include <cstdint>
+
 namespace Siege
 {
 
-
 struct WindowExtents
 {
     uint32_t width {0};
@@ -41,7 +40,10 @@ class Window
         glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
         glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
 
-        if (!window) window = glfwCreateWindow(extents.width, extents.height, name, nullptr, nullptr);
+        if (!window)
+        {
+            window = glfwCreateWindow(extents.width, extents.height, name, nullptr, nullptr);
+        }
 
         if (glfwRawMouseMotionSupported())
         {

engine/render/window/Window.cpp renamed to engine/window/Window.cpp

@@ -41,7 +41,7 @@ packagingFlags = $(ENV_VARS) --excludes "$(packagingExcludes)"
 # Set build vars
 compileFlags += -I $(vendorDir)/vulkan/include -I $(vendorDir)/glfw/include -I $(vendorDir)/glm \
 				-I $(vendorDir)/tinyobjloader -I $(vendorDir)/freetype/include
-linkFlags += -l render -l utils
+linkFlags += -l render -l window -l utils
 
 .PHONY: all render-assets