Merge branch 'master' into chris_async_networking

conanfile.py

@@ -6,7 +6,6 @@ class Archimedes(ConanFile):
     settings = "build_type"
 
     def requirements(self):
-        self.requires("glad/0.1.36")
         self.requires("glfw/3.3.8")
         self.requires("glm/0.9.9.8")
         self.requires("assimp/5.2.2")
@@ -15,12 +14,15 @@ def requirements(self):
         self.requires("stb/cci.20220909")
         self.requires("draco/1.5.6", override=True)
 
-    def configure(self):
-        self.options["glad/0.1.36"].gl_profile = "core"
-        self.options["glad/0.1.36"].gl_version = "4.6"
-        self.options["glad/0.1.36"].spec = "gl"
-        self.options["glad/0.1.36"].no_loader = False
+        # Vulkan SDK
+        self.requires("volk/1.3.268.0")
+        self.requires("vulkan-headers/1.3.268.0", override=True)
+        self.requires("vulkan-memory-allocator/cci.20231120")
+
+        # SPIRV (Shader compiler)
+        # self.requires("shaderc/2021.1") # waiting for conan repo update
 
+    def configure(self):
         if is_msvc(self, True):
             self.options["spdlog/1.12.0"].use_std_fmt = True
 

include/engine.h

@@ -1,12 +1,12 @@
 #ifndef ARCHIMEDES_ENGINE_H
 #define ARCHIMEDES_ENGINE_H
 
+#include <gfx/Renderer.h>
+#include <gtest/gtest_prod.h>
 #include <window.h>
+
 #include <fstream>
 #include <string>
-#include <exceptions/config_exception.h>
-#include <gtest/gtest_prod.h>
-
 
 namespace arch {
 
@@ -33,6 +33,7 @@ class Engine {
 private:
     Window _window;
     EngineConfig _engine_config;
+    gfx::Renderer _renderer;
 
     FRIEND_TEST(EngineTest, ConfigWindowTest);
 

include/graphics/glfw_exception.h → include/exceptions/GLFWException.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "exception.h"
+#include <exception.h>
 
 namespace arch {
 
 class GLFWException : public Exception {
 public:
-    GLFWException();
+	GLFWException();
 };
 
-}
+}

include/gfx/Renderer.h

@@ -0,0 +1,17 @@
+#pragma once
+
+/// @brief Temporary code
+
+#include <volk.h>
+
+namespace arch::gfx {
+
+class Renderer {
+public:
+	void init();
+
+private:
+	VkInstance _instance;
+};
+
+}