fix compilation errors

.github/workflows/cmake-multi-platform.yml

@@ -2,9 +2,9 @@ name: CMake on multiple platforms
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "staging" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "staging" ]
 
 jobs:
   build:

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 project("Vixen")
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -16,6 +16,7 @@ endif ()
 
 set(SKIP_INSTALL_ALL ON)
 
+include(FetchContent)
 find_package(PkgConfig REQUIRED)
 
 option(ENABLE_VULKAN "Enable or disable Vulkan support" ON)

editor/CMakeLists.txt

@@ -4,7 +4,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core Qml Widgets Quick)
 qt_standard_project_setup()
 qt_policy(SET QTP0001 NEW)
 
-add_executable(editor main.cpp widgets/GlViewport.cpp widgets/GlViewport.h widgets/GlViewportRenderer.cpp widgets/GlViewportRenderer.h)
+add_executable(editor main.cpp)
 target_include_directories(editor PUBLIC ../engine)
 target_link_libraries(editor PRIVATE Vixen Qt6::Core Qt6::Qml Qt6::Quick Qt6::Widgets)
 

editor/main.cpp

@@ -2,9 +2,6 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 #include <QQuickView>
-#include "widgets/GlViewport.h"
-
-using namespace Vixen::Editor;
 
 int main(int argc, char **argv) {
     spdlog::set_level(spdlog::level::trace);
@@ -14,7 +11,7 @@ int main(int argc, char **argv) {
     QCoreApplication::setApplicationName("Vixen Editor");
     QCoreApplication::setOrganizationName("Vixen");
 
-    qmlRegisterType<GlViewport>("Vixen", 1, 0, "GlViewport");
+    //qmlRegisterType<GlViewport>("Vixen", 1, 0, "GlViewport");
 
     QQmlApplicationEngine engine;
     engine.load(u"qrc:/editor/ui/main.qml"_qs);

engine/Buffer.cpp

@@ -1,6 +1,6 @@
 #include "Buffer.h"
 
-namespace Vixen::Vk {
+namespace Vixen {
     Buffer::Buffer(Usage bufferUsage, const size_t &size)
             : bufferUsage(bufferUsage),
               size(size) {}

engine/Buffer.h

@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <cstring>
 
-namespace Vixen::Vk {
+namespace Vixen {
     /**
      * A persistently mapped, coherent, synchronized, host or server data buffer.
      */
@@ -18,7 +18,9 @@ namespace Vixen::Vk {
             TRANSFER_SRC = 1 << 4,
         };
 
-        Buffer &operator=(const Buffer &) = delete;
+        virtual char *map() = 0;
+
+        virtual void unmap() = 0;
 
         /**
          * Map the buffer, write to it and unmap the buffer from host memory.
@@ -44,10 +46,6 @@ namespace Vixen::Vk {
          * @param allocationUsage Specifies how this buffer's allocated memory will be used.
          */
         Buffer(Usage bufferUsage, const std::size_t &size);
-
-        virtual char *map() = 0;
-
-        virtual void unmap() = 0;
     };
 
     inline Buffer::Usage operator|(Buffer::Usage a, Buffer::Usage b) {

engine/ShaderModule.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <vector>
 #include <string>
 #include <utility>
 #include <optional>

engine/Window.cpp

@@ -1,5 +1,5 @@
 #define GLFW_INCLUDE_NONE
-
+#include <GLFW/glfw3.h>
 #include "Window.h"
 
 namespace Vixen {

engine/Window.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#define GLFW_INCLUDE_NONE
+#include <GLFW/glfw3.h>
 #include <string>
 #include <spdlog/spdlog.h>
-#include <GLFW/glfw3.h>
 #include <iostream>
 #include <glm/glm.hpp>
 #include "Monitor.h"
@@ -23,6 +24,7 @@ namespace Vixen {
 
         std::unordered_map<GLFWmonitor *, Monitor> monitors;
 
+    public:
         Window(
                 const std::string &title,
                 const uint32_t &width,
@@ -32,7 +34,6 @@ namespace Vixen {
 
         ~Window();
 
-    public:
         /**
          * Has the current window been requested to close?
          * @return True if the window should close, false if not.