From e530eb37e04af79eba4af29127130ec84184329b Mon Sep 17 00:00:00 2001 From: Robear Selwans Date: Tue, 8 Jun 2021 15:11:12 +0200 Subject: [PATCH] Merged pull request #4 from evol3D/asset-module Signed-off-by: Robear Selwans --- meson.build | 3 +++ src/main.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index d488825..cef1802 100644 --- a/meson.build +++ b/meson.build @@ -24,6 +24,7 @@ subproject('evmod_ecs') subproject('evmod_physics') subproject('evmod_script') subproject('evmod_assets') +subproject('evmod_renderer') subproject('evmod_game') evmodglfw_dep = dependency('evmod_glfw') @@ -31,6 +32,7 @@ evmodecs_dep = dependency('evmod_ecs') evmodphysics_dep = dependency('evmod_physics') evmodscript_dep = dependency('evmod_script') evmodgame_dep = dependency('evmod_game') +evmodrenderer_dep = dependency('evmod_renderer') evmod_assets_dep = dependency('evmod_assets') # Setup build directory @@ -47,6 +49,7 @@ sandbox_exe = executable( evmodphysics_dep, evmodscript_dep, evmodgame_dep, + evmodrenderer_dep, evmod_assets_dep, ], install : true, diff --git a/src/main.c b/src/main.c index 39bb729..8c10858 100644 --- a/src/main.c +++ b/src/main.c @@ -34,12 +34,13 @@ int main(int argc, char **argv) evolmodule_t asset_mod = evol_loadmodule("assetmanager"); DEBUG_ASSERT(asset_mod); evolmodule_t window_mod = evol_loadmodule("window"); DEBUG_ASSERT(window_mod); evolmodule_t input_mod = evol_loadmodule("input"); DEBUG_ASSERT(input_mod); + evolmodule_t renderer_mod= evol_loadmodule("renderer"); DEBUG_ASSERT(renderer_mod); imports(asset_mod , (AssetManager, Asset, TextLoader, JSONLoader, ShaderLoader)) imports(game_mod , (Game, Object, Camera, Scene)) imports(window_mod , (Window)) imports(input_mod , (Input)) - + imports(renderer_mod,(Renderer)) IMPORT_EVENTS_evmod_glfw(window_mod); U32 width = 800; @@ -47,6 +48,7 @@ int main(int argc, char **argv) WindowHandle windowHandle = Window->create(width, height, "Main Window"); Input->setActiveWindow(windowHandle); + Renderer->setWindow(windowHandle); ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent); evstring project_dir = NULL; @@ -136,7 +138,7 @@ int main(int argc, char **argv) ev_ProfileCPU(GameProgress, 0) { result |= Game->progress(0.01666667f); } - + Renderer->run(); sleep_ms(17); }