X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=fd75aa8f8cca887ca34443154fbaf071800936ff;hb=7122b79f53f4501751d884c0bf2e838ab501c4a3;hp=0b96ad8cd0a83b42c144f6d0e8921e0cb67fb31a;hpb=2329044d44a5aff035b01926f7901d9e89ad284e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 0b96ad8..fd75aa8 100644 --- a/world_load.c +++ b/world_load.c @@ -7,11 +7,14 @@ #include "ent_skateshop.h" #include "addon.h" #include "save.h" +#include "vg/vg_msg.h" +#include "network.h" +#include "player_remote.h" /* * load the .mdl file located in path as a world instance */ -VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){ +static void world_instance_load_mdl( u32 instance_id, const char *path ){ vg_rand_seed( 9001 ); world_instance *world = &world_static.instances[ instance_id ]; @@ -59,9 +62,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 ); @@ -93,33 +97,43 @@ VG_STATIC void world_instance_load_mdl( u32 instance_id, const char *path ){ world_gen_compute_light_indices( world ); mdl_close( meta ); + /* allocate leaderboard buffers */ + u32 bs = mdl_arrcount(&world->ent_route)*sizeof(struct leaderboard_cache); + world->leaderboard_cache = vg_linear_alloc( heap, bs ); + + for( u32 i=0; ient_route ); i ++ ){ + struct leaderboard_cache *board = &world->leaderboard_cache[i]; + board->data = vg_linear_alloc( heap, NETWORK_LEADERBOARD_MAX_SIZE ); + board->status = k_request_status_client_error; + board->cache_time = 0.0; + board->data_len = 0; + } + vg_async_call( async_world_postprocess, world, 0 ); vg_async_stall(); } - struct world_load_complete_data{ - struct savedata save; + 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; + vg_msg_init( &sav, data->save.buf, data->save.len ); + for( u32 i=0; iinstance_count; i++ ){ world_instance *world = &world_static.instances[ data->instance_start+i ]; - world_entity_start( world, &data->save ); + world_entity_start( world, &sav ); } world_static.load_state = k_world_loader_none; } struct world_load_args { - enum world_purpose{ - k_world_purpose_hub, - k_world_purpose_client - } - purpose; + enum world_purpose purpose; addon_reg *reg; }; @@ -128,11 +142,9 @@ struct world_load_args { */ 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; + addon_reg *reg = args->reg; + world_static.instance_addons[ args->purpose ] = reg; char path_buf[4096]; vg_str path; @@ -147,7 +159,7 @@ static void skaterift_world_load_thread( void *_args ){ return; } - char worlds[3][4096]; + char worlds[k_world_max-1][4096]; u32 i=0; vg_dir dir; @@ -170,7 +182,7 @@ static void skaterift_world_load_thread( void *_args ){ if( !ext ) continue; if( strcmp(ext,".mdl") ) continue; - if( i == 3 ){ + if( i == k_world_max-1 ){ vg_warn( "There are too many .mdl files in the map folder!(3)\n" ); break; } @@ -197,7 +209,7 @@ static void skaterift_world_load_thread( void *_args ){ } u32 instance_start = 0, instance_count = 1; - if( purpose == k_world_purpose_client ) instance_start = 1; + if( args->purpose == k_world_purpose_client ) instance_start = 1; world_instance_load_mdl( instance_start, worlds[first_index] ); @@ -218,9 +230,9 @@ static void skaterift_world_load_thread( void *_args ){ struct world_load_complete_data *data = final_call->payload; data->instance_start = instance_start; data->instance_count = instance_count; - strcpy( data->save.path, "temp_fuckyou.bkv" ); - savedata_read( &data->save ); + skaterift_world_get_save_path( args->purpose, data->save.path ); + savedata_file_read( &data->save ); vg_async_dispatch( final_call, skaterift_world_load_done ); vg_async_stall(); @@ -229,7 +241,7 @@ static void skaterift_world_load_thread( void *_args ){ /* holding pattern before we can start loading the new world, since we might be * waiting for audio to stop */ static void skaterift_change_client_world_preupdate(void){ - for( u32 i=1; istatus == k_world_status_unloading ){ @@ -248,7 +260,7 @@ static void skaterift_change_client_world_preupdate(void){ 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; + args->reg = world_static.instance_addons[ k_world_purpose_client ]; /* this is replaces the already correct reg but we have to set it again * TOO BAD */ @@ -263,9 +275,15 @@ static void skaterift_change_world_start( addon_reg *reg ){ if( world_static.active_instance != 0 ) vg_error( "Cannot change worlds while in non-root world\n" ); else{ + if( world_static.instance_addons[ k_world_purpose_client ] == reg ){ + vg_warn( "World is already loaded\n" ); + return; + } + 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; @@ -279,17 +297,19 @@ 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 */ } } - world_static.addon_client = reg; + world_static.instance_addons[ k_world_purpose_client ] = reg; + network_send_item( k_netmsg_playeritem_world1 ); + relink_all_remote_player_worlds(); } } /* console command for the above function */ static int skaterift_change_world_command( int argc, const char *argv[] ){ + if( !vg_loader_availible() ) return 0; + if( argc == 1 ){ addon_alias q; q.type = k_addon_type_world; @@ -311,12 +331,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 @@ -351,8 +365,7 @@ static int world_freeable( world_instance *world ){ /* * Free all resources for world instance */ -static void world_free( world_instance *world ) -{ +static void world_free( world_instance *world ){ vg_info( "Free world @%p\n", world ); /* free meshes */ @@ -377,6 +390,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; } @@ -384,8 +404,7 @@ static void world_free( world_instance *world ) * reset the world structure without deallocating persistent buffers * TODO: Make this a memset(0), and have persistent items live in a static loc */ -VG_STATIC void world_init_blank( world_instance *world ) -{ +static void world_init_blank( world_instance *world ){ memset( &world->meta, 0, sizeof(mdl_context) ); world->textures = NULL;