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

Added asset module to sandbox

Browse Source
This commit is contained in:
J3oss
2021-05-11 16:12:17 +02:00
parent 9dc81756a8
commit bdfb14228f
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@@ -23,11 +23,13 @@ subproject('evmod_glfw')
subproject('evmod_ecs') subproject('evmod_ecs')
subproject('evmod_physics') subproject('evmod_physics')
subproject('evmod_script') subproject('evmod_script')
subproject('evmod_assetsystem')
evmodglfw_dep = dependency('evmod_glfw') evmodglfw_dep = dependency('evmod_glfw')
evmodecs_dep = dependency('evmod_ecs') 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')
evmod_assetsystem_dep = dependency('evmod_assetsystem')
# Setup build directory # Setup build directory
subdir('buildscripts') subdir('buildscripts')
@@ -42,6 +44,7 @@ sandbox_exe = executable(
evmodecs_dep, evmodecs_dep,
evmodphysics_dep, evmodphysics_dep,
evmodscript_dep, evmodscript_dep,
evmod_assetsystem_dep
], ],
install : true, install : true,
c_args: sandbox_args, c_args: sandbox_args,

11
src/main.c
View File

@@ -26,6 +26,11 @@
#define NAMESPACE_MODULE evmod_script #define NAMESPACE_MODULE evmod_script
#include <evol/meta/namespace_import.h> #include <evol/meta/namespace_import.h>
#define TYPE_MODULE evmod_assetsystem
#include <evol/meta/type_import.h>
#define NAMESPACE_MODULE evmod_assetsystem
#include <evol/meta/namespace_import.h>
// Close window when Q is pressed // Close window when Q is pressed
DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) { DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) {
if(event->keyCode == 81) // tests if Q was pressed if(event->keyCode == 81) // tests if Q was pressed
@@ -39,6 +44,7 @@ DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) {
IMPORT_NAMESPACE(Rigidbody, physics_module); \ IMPORT_NAMESPACE(Rigidbody, physics_module); \
IMPORT_NAMESPACE(CollisionShape, physics_module); \ IMPORT_NAMESPACE(CollisionShape, physics_module); \
IMPORT_NAMESPACE(Script, script_module); \ IMPORT_NAMESPACE(Script, script_module); \
IMPORT_NAMESPACE(AssetSystem, asset_module); \
} while (0) } while (0)
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -51,7 +57,7 @@ int main(int argc, char **argv)
evolmodule_t ecs_module = evol_loadmodule("ecs"); DEBUG_ASSERT(ecs_module); evolmodule_t ecs_module = evol_loadmodule("ecs"); DEBUG_ASSERT(ecs_module);
evolmodule_t window_module = evol_loadmodule("window"); DEBUG_ASSERT(window_module); evolmodule_t window_module = evol_loadmodule("window"); DEBUG_ASSERT(window_module);
evolmodule_t physics_module = evol_loadmodule("physics"); DEBUG_ASSERT(physics_module); evolmodule_t physics_module = evol_loadmodule("physics"); DEBUG_ASSERT(physics_module);
evolmodule_t asset_module = evol_loadmodule("asset-importer"); DEBUG_ASSERT(asset_module);
IMPORT_NAMESPACES; IMPORT_NAMESPACES;
IMPORT_EVENTS_evmod_glfw(window_module); IMPORT_EVENTS_evmod_glfw(window_module);
@@ -113,6 +119,8 @@ int main(int argc, char **argv)
rmt_SetCurrentThreadName("Main Thread"); rmt_SetCurrentThreadName("Main Thread");
AssetSystem->load_mesh("MESH_0_ToyCar.mesh");
U32 result = 0; U32 result = 0;
while(result == 0) { while(result == 0) {
ev_ProfileCPU(EventSystemProgress, 0) { ev_ProfileCPU(EventSystemProgress, 0) {
@@ -140,6 +148,7 @@ int main(int argc, char **argv)
} }
evol_unloadmodule(physics_module); evol_unloadmodule(physics_module);
evol_unloadmodule(ecs_module);
evol_unloadmodule(window_module); evol_unloadmodule(window_module);
evol_unloadmodule(ecs_module); evol_unloadmodule(ecs_module);
evol_unloadmodule(script_module); evol_unloadmodule(script_module);

6
subprojects/evmod_assetsystem.wrap Normal file
View File

@@ -0,0 +1,6 @@
[wrap-git]
url = https://github.com/evol3D/evol-mod-assetsystem
revision = master
[provide]
dependency_names = evmod_assetsystem