Merge branch 'master' of https://github.com/evol3d/evol-sandbox

meson.build

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

src/main.c

@@ -26,6 +26,11 @@
 #define NAMESPACE_MODULE evmod_script
 #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
 DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) {
   if(event->keyCode == 81) // tests if Q was pressed
@@ -40,6 +45,7 @@ DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) {
     IMPORT_NAMESPACE(Rigidbody, physics_module); \
     IMPORT_NAMESPACE(CollisionShape, physics_module); \
     IMPORT_NAMESPACE(Script, script_module);   \
+    IMPORT_NAMESPACE(AssetSystem, asset_module); \
   } while (0)
 
 int main(int argc, char **argv) 
@@ -53,7 +59,7 @@ int main(int argc, char **argv)
   evolmodule_t window_module  = evol_loadmodule("window");  DEBUG_ASSERT(window_module);
   evolmodule_t input_module   = evol_loadmodule("input");   DEBUG_ASSERT(input_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_EVENTS_evmod_glfw(window_module);
@@ -131,6 +137,8 @@ int main(int argc, char **argv)
 
   rmt_SetCurrentThreadName("Main Thread");
 
+  AssetSystem->load_mesh("MESH_0_ToyCar.mesh");
+
   U32 result = 0;
   while(result == 0) {
     ev_ProfileCPU(EventSystemProgress, 0) {
@@ -159,6 +167,7 @@ int main(int argc, char **argv)
 
   evol_unloadmodule(physics_module);
   evol_unloadmodule(input_module);
+  evol_unloadmodule(asset_module);
   evol_unloadmodule(window_module);
   evol_unloadmodule(ecs_module);
   evol_unloadmodule(script_module);

subprojects/evmod_assetsystem.wrap

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