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

Fixed watch

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-07-21 21:26:04 +02:00
parent f92691ca05
commit 2301f973fb
1 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.c
View File

@@ -40,24 +40,10 @@ struct {
void void
project_changed_cb() project_changed_cb()
{ {
Game->clearScenes(); evol_unloadmodule(State.renderer_mod);
Renderer->clear(); Game->reload();
/* evol_unloadmodule(State.renderer_mod); */ State.renderer_mod = evol_loadmodule("renderer");
/* State.renderer_mod = evol_loadmodule("renderer"); */ Renderer->setWindow((GenericHandle)State.window);
/* Renderer->setWindow((GenericHandle)State.window); */
evstring project_dir = NULL;
EvConfigLoaderResult project_dir_get_res = ev_configloader_get("project_dir", EV_TYPE_NAME(STRING), &project_dir);
if(project_dir_get_res != EV_CONFIGLOADER_SUCCESS) {
ev_log_error("[sandbox] Could not get project_dir from config file. Error: %s", EvConfigLoaderResultStrings[project_dir_get_res]);
}
assert(project_dir);
evstring project_mountpoint = evstring_new("project");
AssetManager->mount(&project_dir, &project_mountpoint);
evstring_free(project_mountpoint);
EV_DEFER( EV_DEFER(
AssetHandle project_config = Asset->load("project://game.proj"), AssetHandle project_config = Asset->load("project://game.proj"),
@@ -65,27 +51,6 @@ project_changed_cb()
{ {
JSONAsset project_desc = JSONLoader->loadAsset(project_config); JSONAsset project_desc = JSONLoader->loadAsset(project_config);
// Loading filesystem mounts
double mounts_count = evjs_get(project_desc.json_data, "mounts.len")->as_num;
for(int i = 0; i < (int)mounts_count;i++) {
evstring path_id = evstring_newfmt("mounts[%d].path", i);
evstring mountpoint_id = evstring_newfmt("mounts[%d].mountpoint", i);
evstr_ref path_ref = evjs_get(project_desc.json_data, path_id)->as_str;
evstr_ref mountpoint_ref = evjs_get(project_desc.json_data, mountpoint_id)->as_str;
evstring path = evstring_newfmt("%s/%.*s", project_dir, path_ref.len, path_ref.data + path_ref.offset);
evstring mountpoint = evstring_refclone(mountpoint_ref);
AssetManager->mount(&path, &mountpoint);
evstring_free(mountpoint);
evstring_free(path);
evstring_free(mountpoint_id);
evstring_free(path_id);
}
// Loading Scenes // Loading Scenes
double scene_count = evjs_get(project_desc.json_data, "scenes.len")->as_num; double scene_count = evjs_get(project_desc.json_data, "scenes.len")->as_num;
for(int i = 0; i < (int)scene_count;i++) { for(int i = 0; i < (int)scene_count;i++) {
@@ -107,9 +72,6 @@ project_changed_cb()
Game->setActiveScene(Scene->getFromName(activeScene)); Game->setActiveScene(Scene->getFromName(activeScene));
evstring_free(activeScene); evstring_free(activeScene);
} }
evstring_free(project_dir);
} }
void void
@@ -131,7 +93,6 @@ load_project()
State.window = Window->create(width, height, "Main Window"); State.window = Window->create(width, height, "Main Window");
Input->setActiveWindow(State.window); Input->setActiveWindow(State.window);
Renderer->setWindow((GenericHandle)State.window);
ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent); ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent);
evstring project_dir = NULL; evstring project_dir = NULL;
@@ -173,6 +134,9 @@ load_project()
evstring_free(path_id); evstring_free(path_id);
} }
Renderer->setWindow((GenericHandle)State.window);
// Loading Scenes // Loading Scenes
double scene_count = evjs_get(project_desc.json_data, "scenes.len")->as_num; double scene_count = evjs_get(project_desc.json_data, "scenes.len")->as_num;
for(int i = 0; i < (int)scene_count;i++) { for(int i = 0; i < (int)scene_count;i++) {
@@ -218,7 +182,7 @@ int main(int argc, char **argv)
load_project(); load_project();
// AssetManager->watchRecursively("project:/", project_changed_cb); AssetManager->watchRecursively("project:/", project_changed_cb);
rmt_SetCurrentThreadName("Main Thread"); rmt_SetCurrentThreadName("Main Thread");