X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=2ca957a1cca75b13b04761da3e59122b43dc6166;hb=53597f45307d8a2120e3a0bbe71797b216e8750b;hp=f815fa5d2d3675593def3d62c51f3c4a08ae46b5;hpb=844527ec68c063d78d4993bd8e4053f9ddc47b78;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index f815fa5..2ca957a 100644 --- a/world_load.c +++ b/world_load.c @@ -6,6 +6,8 @@ #include "world_gate.h" #include "ent_skateshop.h" #include "addon.h" +#include "save.h" +#include "vg/vg_msg.h" /* * load the .mdl file located in path as a world instance @@ -17,7 +19,7 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){ world_init_blank( world ); world->status = k_world_status_loading; - vg_info( "Loading world: %s\n", path ); + vg_info( "Loading instance[%u]: %s\n", instance_id, path ); void *allocator = NULL; if( instance_id == 0 ) allocator = world_static.heap; @@ -58,9 +60,10 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){ mdl_load_array( meta, &world->ent_skateshop, "ent_skateshop", heap ); mdl_load_array( meta, &world->ent_swspreview,"ent_swspreview", heap ); mdl_load_array( meta, &world->ent_ccmd, "ent_ccmd", heap ); + mdl_load_array( meta, &world->ent_objective, "ent_objective", heap ); mdl_load_array( meta, &world->ent_challenge, "ent_challenge", heap ); - mdl_load_array( meta, &world->ent_unlock, "ent_unlock", heap ); mdl_load_array( meta, &world->ent_relay, "ent_relay", heap ); + mdl_load_array( meta, &world->ent_cubemap, "ent_cubemap", heap ); mdl_array_ptr infos; mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch ); @@ -90,27 +93,55 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){ world_gen_generate_meshes( world ); world_gen_routes_generate( instance_id ); world_gen_compute_light_indices( world ); - vg_async_call( async_world_postprocess_render, world, 0 ); - vg_async_stall(); - mdl_close( meta ); - world->status = k_world_status_loaded; + + vg_async_call( async_world_postprocess, world, 0 ); + vg_async_stall(); } -static void skaterift_client_world_change_done( void *payload, u32 size ){ +struct world_load_complete_data{ + savedata_file save; + u32 instance_start, instance_count; +}; + +static void skaterift_world_load_done( void *payload, u32 size ){ + struct world_load_complete_data *data = payload; + + vg_msg sav = {0}; + sav.buf = data->save.buf; + sav.len = data->save.len; + sav.max = data->save.len; + + for( u32 i=0; iinstance_count; i++ ){ + world_instance *world = &world_static.instances[ data->instance_start+i ]; + world_entity_start( world, &sav ); + } + world_static.load_state = k_world_loader_none; } +struct world_load_args { + enum world_purpose purpose; + addon_reg *reg; +}; + /* * Does a complete world switch using the remaining free slots */ -static void skaterift_client_world_changer_thread( void *_ ){ +static void skaterift_world_load_thread( void *_args ){ + struct world_load_args *args = _args; + enum world_purpose purpose = args->purpose; + addon_reg *reg = args->reg; + + if( purpose == k_world_purpose_hub ) world_static.addon_hub = reg; + else world_static.addon_client = reg; + char path_buf[4096]; vg_str path; vg_strnull( &path, path_buf, 4096 ); - assert( world_static.addon_client ); - addon_get_content_folder( world_static.addon_client, &path ); + assert( reg ); + addon_get_content_folder( reg, &path ); vg_str folder = path; if( !vg_strgood( &folder ) ) { @@ -167,7 +198,10 @@ static void skaterift_client_world_changer_thread( void *_ ){ } } - world_instance_load_mdl( 1, worlds[first_index] ); + u32 instance_start = 0, instance_count = 1; + if( purpose == k_world_purpose_client ) instance_start = 1; + + world_instance_load_mdl( instance_start, worlds[first_index] ); /* TODO: Support multiply packed worlds */ #if 0 @@ -180,7 +214,18 @@ static void skaterift_client_world_changer_thread( void *_ ){ } #endif - vg_async_call( skaterift_client_world_change_done, NULL, 0 ); + vg_async_item *final_call = + vg_async_alloc( sizeof(struct world_load_complete_data) ); + + struct world_load_complete_data *data = final_call->payload; + data->instance_start = instance_start; + data->instance_count = instance_count; + + skaterift_world_get_save_path( purpose, data->save.path ); + savedata_file_read( &data->save ); + + vg_async_dispatch( final_call, skaterift_world_load_done ); + vg_async_stall(); } /* holding pattern before we can start loading the new world, since we might be @@ -197,11 +242,22 @@ static void skaterift_change_client_world_preupdate(void){ } } - vg_info( "worlds cleared, begining load\n" ); - world_static.load_state = k_world_loader_load; + if( vg_loader_availible() ){ + vg_info( "worlds cleared, begining load\n" ); + world_static.load_state = k_world_loader_load; + + vg_linear_clear( vg_async.buffer ); + struct world_load_args *args = + vg_linear_alloc( vg_async.buffer, sizeof(struct world_load_args) ); + args->purpose = k_world_purpose_client; + args->reg = world_static.addon_client; - /* finally can start the loader */ - vg_loader_start( skaterift_client_world_changer_thread, NULL ); + /* this is replaces the already correct reg but we have to set it again + * TOO BAD */ + + /* finally can start the loader */ + vg_loader_start( skaterift_world_load_thread, args ); + } } /* places all loaded worlds into unloading state */ @@ -212,6 +268,7 @@ static void skaterift_change_world_start( addon_reg *reg ){ char buf[76]; addon_alias_uid( ®->alias, buf ); vg_info( "switching to: %s\n", buf ); + skaterift_autosave(1); world_static.load_state = k_world_loader_preload; @@ -225,8 +282,6 @@ static void skaterift_change_world_start( addon_reg *reg ){ if( inst->status == k_world_status_loaded ){ inst->status = k_world_status_unloading; world_fadeout_audio( inst ); - - /* TODO: THIS IS WHERE A SAVE SHOULD BE DONE */ } } @@ -257,12 +312,6 @@ static int skaterift_change_world_command( int argc, const char *argv[] ){ return 0; } -#if 0 -static world_instance *world_loading_instance(void){ - return &world_static.instances[ world_loader.world_index ]; -} -#endif - /* * checks: * 1. to see if all audios owned by the world have been stopped @@ -323,6 +372,13 @@ static void world_free( world_instance *world ) vg_linear_header(world->heap) ); } + for( u32 i=0; ient_cubemap); i++ ){ + ent_cubemap *cm = mdl_arritm(&world->ent_cubemap,i); + glDeleteTextures( 1, &cm->texture_id ); + glDeleteFramebuffers( 1, &cm->framebuffer_id ); + glDeleteRenderbuffers( 1, &cm->renderbuffer_id ); + } + world->status = k_world_status_unloaded; }