From dbddea69f56e282c0e464c57f976f0f980953f1d Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Sat, 31 May 2025 14:36:11 +0200 Subject: [PATCH] Add asset module --- src/assets.cpp | 2 +- src/assets.hpp | 5 ++++- src/main.cpp | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/assets.cpp b/src/assets.cpp index 61f237f..7fb8e12 100644 --- a/src/assets.cpp +++ b/src/assets.cpp @@ -53,7 +53,7 @@ AudioAsset load_audio(uint8_t const* data, size_t size) return audio_asset; } -void init_assets(flecs::world& world) +AssetModule::AssetModule(flecs::world& world) { auto* renderer = world.get()->renderer; diff --git a/src/assets.hpp b/src/assets.hpp index 7e390a9..d7766d1 100644 --- a/src/assets.hpp +++ b/src/assets.hpp @@ -31,4 +31,7 @@ struct AudioAssets AudioAsset background_music; }; -void init_assets(flecs::world& world); +struct AssetModule +{ + AssetModule(flecs::world& world); +}; diff --git a/src/main.cpp b/src/main.cpp index cea1357..4e2a9ab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,11 +39,12 @@ int main() } flecs::world world; - + world.set(Game{.ticks = 0}); world.set(ButtonInput{}); world.set(SdlHandles{.window = window, .renderer = renderer}); - init_assets(world); + + world.import (); world.import (); world.import ();