Clean up a bit

Author: AR-DEV-1

CMakeLists.txt

@@ -50,10 +50,11 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(X11_LIBS REQUIRED x11 xext xcursor xrandr xrender xi xfixes)
 
 add_executable(draconic engine/native/main/main.cpp)
+enable_modules(draconic)
 target_link_libraries(draconic
     PRIVATE
-    core
     rhi
+    core
     bgfx
     bx
     bimg

engine/native/CMakeLists.txt

@@ -4,6 +4,6 @@ include(Modules)
 add_subdirectory(thirdparty)
 
 add_modules_library(core SHARED)
-target_link_libraries(core PUBLIC definitions math)
+target_link_libraries(core PUBLIC definitions math filesystem)
 
 add_subdirectory(rendering)

engine/native/core/CMakeLists.txt

@@ -1,3 +1,5 @@
 add_modules_library(definitions)
 add_modules_library(math)
-target_link_libraries(math PUBLIC definitions)
+add_modules_library(filesystem)
+target_link_libraries(math PUBLIC definitions)
+target_link_libraries(filesystem PUBLIC definitions)

engine/native/core/filesystem/filesystem.cpp

@@ -0,0 +1,35 @@
+module;
+
+import std;
+
+module core.filesystem;
+
+namespace draco::filesystem
+{
+    std::vector<std::uint8_t> load_binary(const std::string& path)
+    {
+        // Open at the end (ate) to get size and in binary mode
+        std::ifstream file(path, std::ios::binary | std::ios::ate);
+    
+        if (!file.is_open()) {
+            std::println("Error: Could not find shader file at: {}", path);
+            // Return an empty vector
+            return {}; 
+        }
+
+        std::streamsize size = file.tellg();
+        if (size <= 0) {
+            std::println("Error: Shader file is empty: {}", path);
+            return {};
+        }
+
+        file.seekg(0, std::ios::beg);
+
+        std::vector<std::uint8_t> buffer(static_cast<std::size_t>(size));
+        if (file.read(reinterpret_cast<char*>(buffer.data()), size)) {
+            return buffer;
+        }
+
+        return {};
+    }
+}

engine/native/core/filesystem/filesystem.cppm

@@ -0,0 +1,9 @@
+export module core.filesystem;
+
+import std;
+
+export namespace draco::filesystem
+{
+    // Returns a buffer of the file data
+    std::vector<std::uint8_t> load_binary(const std::string& path);
+}

engine/native/main/main.cpp

@@ -4,45 +4,10 @@ import std;
 #include <bgfx/bgfx.h>
 #include <bx/math.h>
 
-import rendering.rhi;
-
-// Vertex struct
-// Will later be moved to a seperate file & rewritten
-struct Vertex
-{
-    float x, y, z; // Position
-    uint32_t agbr; // Color, stored as AGBR
-};
-
-// Shader binary loadin' logic
-// Will later be moved to a seperate file & rewritten
-std::vector<uint8_t> loadShaderBinary(const std::string& path);
-
-std::vector<uint8_t> loadShaderBinary(const std::string& path) {
-    // Open at the end (ate) to get size and in binary mode
-    std::ifstream file(path, std::ios::binary | std::ios::ate);
-    
-    if (!file.is_open()) {
-        std::println("Error: Could not find shader file at: {}", path);
-        // Return an empty vector
-        return {}; 
-    }
+import core.filesystem;
 
-    std::streamsize size = file.tellg();
-    if (size <= 0) {
-        std::println("Error: Shader file is empty: {}", path);
-        return {};
-    }
-
-    file.seekg(0, std::ios::beg);
-
-    std::vector<uint8_t> buffer(static_cast<size_t>(size));
-    if (file.read(reinterpret_cast<char*>(buffer.data()), size)) {
-        return buffer;
-    }
-
-    return {};
-}
+import rendering.rhi;
+import rendering.rhi.vertex;
 
 int main(int argc, char* argv[])
 {
@@ -95,7 +60,7 @@ int main(int argc, char* argv[])
 
     // Geometry data for a triangle to test rendering
     // It includes both positions & colors
-    Vertex triangle[] = {
+    draco::rhi::PosColorVertex triangle[] = {
         { 0.0f, 0.5f, 0.0f, 0xff0000ff }, 
         { 0.5f, -0.5f, 0.0f, 0xff00ff00 },
         { -0.5f, -0.5f, 0.0f, 0xffff0000}
@@ -104,8 +69,8 @@ int main(int argc, char* argv[])
     auto vbh = draco::rhi::create_vertex_buffer(triangle, sizeof(triangle));
 
     // Load the vertex & fragment shaders
-    auto vs_data = loadShaderBinary("vs_triangle.bin");
-    auto fs_data = loadShaderBinary("fs_triangle.bin");
+    auto vs_data = draco::filesystem::load_binary("vs_triangle.bin");
+    auto fs_data = draco::filesystem::load_binary("fs_triangle.bin");
 
     // If the path is empty, return an error
     if (vs_data.empty() || fs_data.empty()) {

engine/native/rendering/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_modules_library(rhi SHARED)
+target_sources(rhi PRIVATE rhi/rhi_bgfx.cpp rhi/vertex.cppm)
 target_link_libraries(rhi PUBLIC core bgfx bx)

engine/native/rendering/rhi/vertex.cppm

@@ -0,0 +1,27 @@
+module;
+#include <bgfx/bgfx.h>
+
+export module rendering.rhi.vertex;
+
+import std;
+
+
+export namespace draco::rhi
+{
+    struct PosColorVertex
+    {
+        float x, y, z; // Position
+        uint32_t agbr; // Color, stored as AGBR
+
+        static void init() {
+            layout
+                .begin()
+                .add(bgfx::Attrib::Position, 3, bgfx::AttribType::Float)
+                .add(bgfx::Attrib::Color0,   4, bgfx::AttribType::Uint8, true)
+                .end();
+        }
+
+        static inline bgfx::VertexLayout layout;
+    };
+    
+}