evol3D/evol-sandbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged pull request #4 from evol3D/asset-module

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-06-08 15:11:12 +02:00
parent 39f6cb87f2
commit e530eb37e0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@@ -24,6 +24,7 @@ subproject('evmod_ecs')
subproject('evmod_physics') subproject('evmod_physics')
subproject('evmod_script') subproject('evmod_script')
subproject('evmod_assets') subproject('evmod_assets')
subproject('evmod_renderer')
subproject('evmod_game') subproject('evmod_game')
evmodglfw_dep = dependency('evmod_glfw') evmodglfw_dep = dependency('evmod_glfw')
@@ -31,6 +32,7 @@ evmodecs_dep = dependency('evmod_ecs')
evmodphysics_dep = dependency('evmod_physics') evmodphysics_dep = dependency('evmod_physics')
evmodscript_dep = dependency('evmod_script') evmodscript_dep = dependency('evmod_script')
evmodgame_dep = dependency('evmod_game') evmodgame_dep = dependency('evmod_game')
evmodrenderer_dep = dependency('evmod_renderer')
evmod_assets_dep = dependency('evmod_assets') evmod_assets_dep = dependency('evmod_assets')
# Setup build directory # Setup build directory
@@ -47,6 +49,7 @@ sandbox_exe = executable(
evmodphysics_dep, evmodphysics_dep,
evmodscript_dep, evmodscript_dep,
evmodgame_dep, evmodgame_dep,
evmodrenderer_dep,
evmod_assets_dep, evmod_assets_dep,
], ],
install : true, install : true,

6
src/main.c
View File

@@ -34,12 +34,13 @@ int main(int argc, char **argv)
evolmodule_t asset_mod = evol_loadmodule("assetmanager"); DEBUG_ASSERT(asset_mod); evolmodule_t asset_mod = evol_loadmodule("assetmanager"); DEBUG_ASSERT(asset_mod);
evolmodule_t window_mod = evol_loadmodule("window"); DEBUG_ASSERT(window_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 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(asset_mod , (AssetManager, Asset, TextLoader, JSONLoader, ShaderLoader))
imports(game_mod , (Game, Object, Camera, Scene)) imports(game_mod , (Game, Object, Camera, Scene))
imports(window_mod , (Window)) imports(window_mod , (Window))
imports(input_mod , (Input)) imports(input_mod , (Input))
imports(renderer_mod,(Renderer))
IMPORT_EVENTS_evmod_glfw(window_mod); IMPORT_EVENTS_evmod_glfw(window_mod);
U32 width = 800; U32 width = 800;
@@ -47,6 +48,7 @@ int main(int argc, char **argv)
WindowHandle windowHandle = Window->create(width, height, "Main Window"); WindowHandle windowHandle = Window->create(width, height, "Main Window");
Input->setActiveWindow(windowHandle); Input->setActiveWindow(windowHandle);
Renderer->setWindow(windowHandle);
ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent); ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent);
evstring project_dir = NULL; evstring project_dir = NULL;
@@ -136,7 +138,7 @@ int main(int argc, char **argv)
ev_ProfileCPU(GameProgress, 0) { ev_ProfileCPU(GameProgress, 0) {
result |= Game->progress(0.01666667f); result |= Game->progress(0.01666667f);
} }
Renderer->run();
sleep_ms(17); sleep_ms(17);
} }