X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=fd75aa8f8cca887ca34443154fbaf071800936ff;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=01fa9cc6da2a6796b11f2d5a9bf4e048b69e3112;hpb=7eba38b8178c82040618a518634d8ff4813e2ff2;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 01fa9cc..fd75aa8 100644 --- a/world_load.c +++ b/world_load.c @@ -5,24 +5,27 @@ #include "world_routes.h" #include "world_gate.h" #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 (relative to exe), it will load into the - * slot specified by world_loader.world_index + * load the .mdl file located in path as a world instance */ -VG_STATIC void world_load_mdl( const char *path ) -{ +static void world_instance_load_mdl( u32 instance_id, const char *path ){ vg_rand_seed( 9001 ); - world_instance *world = world_loading_instance(); + world_instance *world = &world_static.instances[ instance_id ]; 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( world_loader.world_index == 0 ) allocator = world_static.heap; - else allocator = world_static.worlds[world_loader.world_index-1].heap; + if( instance_id == 0 ) allocator = world_static.heap; + else allocator = world_static.instances[instance_id-1].heap; u32 heap_availible = vg_linear_remaining( allocator ); u32 min_overhead = sizeof(vg_linear_allocator); @@ -59,7 +62,10 @@ VG_STATIC void world_load_mdl( 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_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 ); @@ -81,40 +87,71 @@ VG_STATIC void world_load_mdl( const char *path ) world->time = (float)tm->tm_min/20.0f + (world->info.timezone/24.0f); /* process resources from pack */ - world_gen_load_surfaces(); - world_gen_routes_ent_init(); - world_gen_entities_init(); + world_gen_load_surfaces( world ); + world_gen_routes_ent_init( world ); + world_gen_entities_init( world ); /* main bulk */ - world_gen_generate_meshes(); - world_gen_routes_generate(); - world_gen_compute_light_indices(); - vg_async_call( async_world_postprocess_render, NULL, 0 ); - vg_async_stall(); - + world_gen_generate_meshes( world ); + world_gen_routes_generate( instance_id ); + world_gen_compute_light_indices( world ); mdl_close( meta ); - world->status = k_world_status_loaded; + + /* 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(); } -static void skaterift_world_change_done( void *payload, u32 size ){ - world_loader.state = k_world_loader_none; +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; + 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, &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_world_changer_thread( void *_ ){ +static void skaterift_world_load_thread( void *_args ){ + struct world_load_args *args = _args; + + addon_reg *reg = args->reg; + world_static.instance_addons[ args->purpose ] = reg; + char path_buf[4096]; vg_str path; vg_strnull( &path, path_buf, 4096 ); - if( world_loader.reg ){ - addon_get_content_folder( world_loader.reg, &path ); - } - else { - vg_strcat( &path, "maps/" ); - vg_strcat( &path, world_loader.override_name ); - } + assert( reg ); + addon_get_content_folder( reg, &path ); vg_str folder = path; if( !vg_strgood( &folder ) ) { @@ -122,7 +159,7 @@ static void skaterift_world_changer_thread( void *_ ){ return; } - char worlds[3][4096]; + char worlds[k_world_max-1][4096]; u32 i=0; vg_dir dir; @@ -145,7 +182,7 @@ static void skaterift_world_changer_thread( void *_ ){ 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; } @@ -171,10 +208,13 @@ static void skaterift_world_changer_thread( void *_ ){ } } - world_loader.generate_point_cloud = 1; - world_loader.world_index = 1; - world_load_mdl( worlds[first_index] ); + u32 instance_start = 0, instance_count = 1; + if( args->purpose == k_world_purpose_client ) instance_start = 1; + + world_instance_load_mdl( instance_start, worlds[first_index] ); + /* TODO: Support multiply packed worlds */ +#if 0 world_loader.generate_point_cloud = 0; for( u32 j=0; jpayload; + data->instance_start = instance_start; + data->instance_count = instance_count; + + 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(); } /* holding pattern before we can start loading the new world, since we might be * waiting for audio to stop */ -static void skaterift_change_world_preupdate(void){ - for( u32 i=1; istatus == k_world_status_unloading ){ if( world_freeable( inst ) ){ @@ -200,76 +252,96 @@ static void skaterift_change_world_preupdate(void){ } } - vg_info( "worlds cleared, begining load\n" ); - world_loader.state = k_world_loader_load; + if( vg_loader_availible() ){ + vg_info( "worlds cleared, begining load\n" ); + world_static.load_state = k_world_loader_load; - /* finally can start the loader */ - vg_loader_start( skaterift_world_changer_thread, NULL ); -} + 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.instance_addons[ k_world_purpose_client ]; -/* places all loaded worlds into unloading state */ -static void skaterift_change_world_start(void){ - if( world_loader.reg ){ - vg_info( "switching to %s ("PRINTF_U64"\n", - world_loader.reg->alias.foldername, - world_loader.reg->alias.workshop_id ); - } - else{ - vg_info( "switching to %s(local)\n", world_loader.override_name ); + /* 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 ); } +} - if( world_static.active_world != 0 ){ +/* places all loaded worlds into unloading state */ +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{ - world_loader.state = k_world_loader_preload; + 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; vg_linear_clear( vg_mem.scratch ); /* ?? */ vg_info( "unloading old worlds\n" ); - world_unlink_nonlocal( &world_static.worlds[0] ); + world_unlink_nonlocal( &world_static.instances[0] ); - for( u32 i=1; istatus == k_world_status_loaded ){ inst->status = k_world_status_unloading; world_fadeout_audio( inst ); } } + + 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[] ) -{ +static int skaterift_change_world_command( int argc, const char *argv[] ){ + if( !vg_loader_availible() ) return 0; + if( argc == 1 ){ - world_loader.reg = NULL; - vg_strncpy( argv[0], world_loader.override_name, - vg_list_size( world_loader.override_name ), - k_strncpy_always_add_null ); - skaterift_change_world_start(); + addon_alias q; + q.type = k_addon_type_world; + q.workshop_id = 0; + vg_strncpy( argv[0], q.foldername, 64, k_strncpy_always_add_null ); + + u32 reg_id = addon_match( &q ); + if( reg_id != 0xffffffff ){ + addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id ); + skaterift_change_world_start( reg ); + } + else { + char buf[76]; + addon_alias_uid( &q, buf ); + vg_error( "Addon '%s' is not installed or not found.\n", buf ); + } } return 0; } - -static world_instance *world_loading_instance(void){ - return &world_static.worlds[ world_loader.world_index ]; -} - /* * checks: * 1. to see if all audios owned by the world have been stopped * 2. that this is the least significant world */ -static int world_freeable( world_instance *world ) -{ +static int world_freeable( world_instance *world ){ if( world->status != k_world_status_unloading ) return 0; - u8 world_id = (world - world_static.worlds) + 1; + u8 world_id = (world - world_static.instances) + 1; - for( u32 i=world_id; itexture_count, world->textures ); - u32 world_index = world - world_static.worlds; + u32 world_index = world - world_static.instances; if( world_index ){ - vg_linear_del( world_static.worlds[world_index-1].heap, + vg_linear_del( world_static.instances[world_index-1].heap, 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; } @@ -326,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; @@ -365,6 +442,4 @@ VG_STATIC void world_init_blank( world_instance *world ) v3_copy( (v3f){1.10f, 0.89f, 0.35f}, state->g_sun_colour ); } - - #endif /* WORLD_LOAD_C */