Game rewrite to ECS

CMakeLists.txt

@@ -10,8 +10,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(SOURCE_FILES
     src/game/main.cpp
     src/game/gui.cpp
+    src/game/player.cpp
+    src/game/enemy.cpp
     src/game/world_gen/map.cpp
-    src/engine/utils/logging.cpp
     src/engine/Renderer.cpp
     src/engine/Camera.cpp
     src/engine/ecs/ecs.cpp
@@ -25,16 +26,19 @@ set(SOURCE_FILES
     src/engine/ecs/systemmanager.cpp
     src/engine/AssetLoader.cpp
     src/engine/Input.cpp
+    src/engine/Prefs.cpp
     src/engine/scene/Scene.cpp
     src/engine/scene/Node.cpp
     src/engine/scene/AssetManifest.cpp
     src/engine/graphics/Pipeline.cpp
     src/engine/graphics/Image.cpp
     src/engine/graphics/Sampler.cpp
+    src/engine/graphics/GPURingBuffer.cpp
+    src/engine/Game.cpp
     vendor/glad/src/glad.c
 )
 
-set(COMMON_COMPILE_FLAGS -Wall -Wextra -Wunused-result -Wno-missing-field-initializers -Wno-unused-function -fno-exceptions)
+set(COMMON_COMPILE_FLAGS -Wall -Wextra -Wunused-result -Wno-missing-field-initializers -Wno-unused-function -fno-exceptions -g)
 
 FetchContent_Declare(
     glm
@@ -54,7 +58,13 @@ FetchContent_Declare(
     GIT_TAG 3.4
 )
 
-FetchContent_MakeAvailable(glm glfw imgui)
+FetchContent_Declare(
+    miniaudio
+    GIT_REPOSITORY https://github.com/mackron/miniaudio
+    GIT_TAG 0.11.22
+)
+
+FetchContent_MakeAvailable(glm glfw imgui miniaudio)
 
 add_executable(game_engine ${SOURCE_FILES})
 set_target_properties(game_engine PROPERTIES
@@ -92,5 +102,9 @@ target_sources(game_engine PRIVATE ${imgui_SOURCE_DIR}/backends/imgui_impl_openg
 # GLAD
 target_include_directories(game_engine PRIVATE vendor/glad/include)
 
+# miniaudio
+target_include_directories(game_engine PRIVATE ${miniaudio_SOURCE_DIR})
+target_link_libraries(game_engine PRIVATE miniaudio)
+
 target_link_libraries(game_engine PRIVATE ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
 target_compile_options(game_engine PRIVATE ${COMMON_COMPILE_FLAGS})

README.md

@@ -0,0 +1,28 @@
+## Steps:
+1. Download assets from [OneDrive](https://kth-my.sharepoint.com/:f:/g/personal/oscae_ug_kth_se/EkvNSq58i9VEh5Iqsg_l-UIB83xngGy-dJDav7ChcgHiJQ?e=J3qyYU) and put the assets directory in root.
+2. Build asset_processor:
+```bash
+cd tools/asset_processor
+cmake . -GNinja -Bbuild
+cd build
+ninja
+cd ../../..
+./tools/asset_processor/build/asset_processor manifest.json
+```
+3. Initial build:
+```bash
+cmake . -GNinja -Bbuild
+cd build
+ninja
+cd ..
+```
+4. Build and Run
+```bash
+cd build; ninja; cd ..; ./build/game_engine
+```
+
+### Note:
+Build with clang, NOT MinGW:
+```bash
+CMAKE . -GNinja -B build -DCMAKE_CXX_COMPILER=clang -DCMAKE_C_COMPILER=clang
+```

manifest.json

@@ -2,11 +2,7 @@
     "meshes": [
         {
             "name": "Helmet",
-            "path": "assets/SciFiHelmet/glTF/SciFiHelmet.gltf"
-        },
-        {
-            "name": "Sponza",
-            "path": "assets/Sponza/Sponza.gltf"
+            "path": "assets/SciFiHelmet/SciFiHelmet.glb"
         },
         {
             "name": "Sword",
@@ -15,11 +11,14 @@
         {
             "name": "Cube",
             "path": "assets/cube.glb"
+        },
+        {
+            "name": "Ghost",
+            "path": "assets/ghost.glb"
         }
     ],
     "prefabs": [
         "prefabs/Player.json",
-        "prefabs/Scene.json",
-        "prefabs/Enemy.json"
+        "prefabs/Ghost.json"
     ]
 }

prefabs/Enemy.json → prefabs/Ghost.json

@@ -1,26 +1,26 @@
-{
-    "name": "Enemy",
-    "nodes": [
-        {
-            "mesh": "Helmet",
-            "name": "Enemy",
-            "rotation": [
-                0.0,
-                1.0,
-                0.0,
-                0.0
-            ],
-            "scale": [
-                1.0,
-                1.0,
-                1.0
-            ],
-            "translation": [
-                0.0,
-                0.0,
-                0.0
-            ]
-        }
-    ],
-    "root": 0
+{
+    "name": "Ghost",
+    "nodes": [
+        {
+            "mesh": "Ghost",
+            "name": "Ghost",
+            "rotation": [
+                0.0,
+                1.0,
+                0.0,
+                0.0
+            ],
+            "scale": [
+                1.0,
+                1.0,
+                1.0
+            ],
+            "translation": [
+                0.0,
+                0.0,
+                0.0
+            ]
+        }
+    ],
+    "root": 0
 }

shaders/rect.frag.glsl

@@ -0,0 +1,8 @@
+#version 460 core
+
+layout (location = 0) in vec4 color;
+layout (location = 0) out vec4 frag_color;
+
+void main() {
+    frag_color = color;
+}

shaders/rect.vert.glsl

@@ -0,0 +1,17 @@
+#version 460 core
+
+layout (location = 0) in vec2 a_pos;
+layout (location = 1) in vec4 a_color;
+
+layout (location = 0) out vec4 color;
+
+layout (std140, binding = 0) uniform UBOMatrices {
+    mat4 model;
+    mat4 view;
+    mat4 projection;
+};
+
+void main() {
+    gl_Position = projection * vec4(a_pos, 0.0, 1.0);
+    color = a_color;
+}

src/engine/Game.cpp

@@ -0,0 +1,64 @@
+#include "Game.h"
+
+#include "utils/logging.h"
+
+static void error_callback(int error, const char *description) {
+    ERROR("GLFW error with code {}: {}", error, description);
+}
+
+static void framebuffer_size_callback(GLFWwindow *window, int width, int height) {
+    (void)window;
+    glViewport(0, 0, width, height);
+}
+
+game::GameHandle game::init(int width, int height, const std::string& title)
+{
+    if (!glfwInit()) {
+        FATAL("Failed to initiliaze glfw");
+    }
+    INFO("Initialized GLFW");
+    glfwSetErrorCallback(error_callback);
+
+    f32 content_x_scale;
+    f32 content_y_scale;
+    glfwGetMonitorContentScale(glfwGetPrimaryMonitor(), &content_x_scale,
+                                &content_y_scale);
+    INFO("Monitor content scale is ({}, {})", content_x_scale, content_y_scale);
+
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
+    glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_FALSE);
+    glfwWindowHint(GLFW_SRGB_CAPABLE, GLFW_TRUE);
+    glfwWindowHint(GLFW_SAMPLES, 8);
+#ifndef NDEBUG
+    glfwWindowHint(GLFW_CONTEXT_DEBUG, GLFW_TRUE);
+#else
+    glfwWindowHint(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE);
+#endif
+
+    f32 content_scale = std::max(content_x_scale, content_y_scale);
+    auto window = glfwCreateWindow(1920 / content_scale, 1080 / content_scale,
+                                title.c_str(), nullptr, nullptr);
+    if (!window) {
+        FATAL("Failed to create glfw window");
+    }
+
+    glfwMakeContextCurrent(window);
+
+    glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
+
+    return game::GameHandle {
+        .window = window,
+    };
+}
+
+bool game::should_run(GameHandle& handle)
+{
+    return !glfwWindowShouldClose(handle.window);
+}
+
+void game::end_frame(GameHandle& handle)
+{
+    glfwSwapBuffers(handle.window);
+    glfwPollEvents();
+}

src/engine/Game.h

@@ -0,0 +1,16 @@
+#include <string>
+
+#include <glad/glad.h>
+#include <GLFW/glfw3.h>
+#include "core.h"
+
+namespace game {
+    struct GameHandle {
+        GLFWwindow* window;
+    };
+
+    GameHandle init(int width, int height, const std::string& title);
+
+    bool should_run(GameHandle& handle);
+    void end_frame(GameHandle& handle);
+}

src/engine/Input.cpp

@@ -1,4 +1,5 @@
 #include "Input.h"
+#include <print>
 
 engine::Input::Input(GLFWwindow* window) : window{window}, prevKeyStates{false}, prevMousePosition(get_mouse_position()) {}