X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=ece92972c080625f6390e4252640363355572921;hb=refs%2Fheads%2Frigidbody;hp=50a882c2fab5dc1f8907a87c051d189eb55fed62;hpb=d171c9ad5de05c9ac8563fcf9f23760b93fb50f8;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 50a882c..ece9297 100644 --- a/world_load.c +++ b/world_load.c @@ -15,8 +15,6 @@ * load the .mdl file located in path as a world instance */ static void world_instance_load_mdl( u32 instance_id, const char *path ){ - vg_rand_seed( 9001 ); - world_instance *world = &world_static.instances[ instance_id ]; world_init_blank( world ); world->status = k_world_status_loading; @@ -45,49 +43,57 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ mdl_load_animation_block( meta, world->heap ); mdl_load_mesh_block( meta, world->heap ); - /* TODO: Make this a table? */ - mdl_load_array( meta, &world->ent_gate, "ent_gate", heap ); - mdl_load_array( meta, &world->ent_camera, "ent_camera", heap ); - mdl_load_array( meta, &world->ent_spawn, "ent_spawn", heap ); - mdl_load_array( meta, &world->ent_light, "ent_light", heap ); - mdl_load_array( meta, &world->ent_route_node,"ent_route_node", heap ); - mdl_load_array( meta, &world->ent_path_index,"ent_path_index", heap ); - mdl_load_array( meta, &world->ent_checkpoint,"ent_checkpoint", heap ); - mdl_load_array( meta, &world->ent_route, "ent_route", heap ); - mdl_load_array( meta, &world->ent_water, "ent_water", heap ); - mdl_load_array( meta, &world->ent_audio_clip,"ent_audio_clip", heap ); - mdl_load_array( meta, &world->ent_audio, "ent_audio", heap ); - mdl_load_array( meta, &world->ent_volume, "ent_volume", heap ); - mdl_load_array( meta, &world->ent_traffic, "ent_traffic", heap ); - mdl_load_array( meta, &world->ent_marker, "ent_marker", heap ); - 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_load_array( meta, &world->ent_miniworld, "ent_miniworld", heap ); - mdl_load_array( meta, &world->ent_prop, "ent_prop", heap ); + vg_info( "%u\n", sizeof(ent_cubemap) ); + + MDL_LOAD_ARRAY( meta, &world->ent_gate, ent_gate, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_camera, ent_camera, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_spawn, ent_spawn, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_light, ent_light, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_route_node,ent_route_node, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_path_index,ent_path_index, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_checkpoint,ent_checkpoint, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_route, ent_route, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_water, ent_water, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_audio_clip,ent_audio_clip, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_audio, ent_audio, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_volume, ent_volume, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_traffic, ent_traffic, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_marker, ent_marker, heap ); + 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_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_prop, ent_prop, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_region, ent_region, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_glider, ent_glider, heap ); mdl_array_ptr infos; - mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch ); + MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch ); world->skybox = k_skybox_default; - if( mdl_arrcount(&infos) ){ + if( mdl_arrcount(&infos) ) + { world->info = *((ent_worldinfo *)mdl_arritm(&infos,0)); - if( world->meta.info.version >= 104 ){ - if( MDL_CONST_PSTREQ( &world->meta, world->info.pstr_skybox,"space")){ + if( world->meta.info.version >= 104 ) + { + if( MDL_CONST_PSTREQ( &world->meta, world->info.pstr_skybox,"space")) + { world->skybox = k_skybox_space; } } } - else{ + else + { world->info.pstr_author = 0; world->info.pstr_desc = 0; world->info.pstr_name = 0; world->info.timezone = 0.0f; + world->info.flags = 0; } time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60); @@ -95,30 +101,49 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ world->time += (world->info.timezone/24.0); /* process resources from pack */ + u64 t4 = SDL_GetPerformanceCounter(); world_gen_load_surfaces( world ); + u64 t5 = SDL_GetPerformanceCounter(); world_gen_routes_ent_init( world ); world_gen_entities_init( world ); + u64 t6 = SDL_GetPerformanceCounter(); /* main bulk */ + u64 t0 = SDL_GetPerformanceCounter(); world_gen_generate_meshes( world ); + u64 t1 = SDL_GetPerformanceCounter(); world_gen_routes_generate( instance_id ); + u64 t2 = SDL_GetPerformanceCounter(); world_gen_compute_light_indices( world ); + u64 t3 = SDL_GetPerformanceCounter(); mdl_close( meta ); + u64 utime_mesh = t1-t0, + utime_route = t2-t1, + utime_indices = t3-t2, + utime_tex = t5-t4, + utime_ent = t6-t5, + ufreq = SDL_GetPerformanceFrequency(); + + f64 ftime_mesh = ((f64)utime_mesh / (f64)ufreq)*1000.0, + ftime_route = ((f64)utime_route / (f64)ufreq)*1000.0, + ftime_ind = ((f64)utime_route / (f64)ufreq)*1000.0, + ftime_tex = ((f64)utime_tex / (f64)ufreq)*1000.0, + ftime_ent = ((f64)utime_ent / (f64)ufreq)*1000.0; + + vg_info( "wtime:mesh %.2fms route %.2fms ind %.2fms tex %.2fms ent %.2fms\n", + ftime_mesh, ftime_route, ftime_ind, ftime_tex, ftime_ent ); + /* init player position. * - this is overriden by the save state when(if) it loads */ - ent_spawn *rp = world_find_spawn_by_name( world, "start" ); - if( !rp ) rp = world_find_closest_spawn( world, (v3f){0.0f,0.0f,0.0f} ); - - /* TODO: fallback to searching for a safe location using raycasts */ - assert(rp); - v3_copy( rp->transform.co, world->player_co ); + world_default_spawn_pos( world, world->player_co ); /* 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 ++ ){ + for( u32 i=0; ient_route ); i ++ ) + { struct leaderboard_cache *board = &world->leaderboard_cache[i]; board->data = vg_linear_alloc( heap, NETWORK_REQUEST_MAX ); board->status = k_request_status_client_error; @@ -126,6 +151,9 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ board->data_len = 0; } + world->routes_ui = vg_linear_alloc( heap, + sizeof(struct route_ui)*mdl_arrcount(&world->ent_route) ); + vg_async_call( async_world_postprocess, world, 0 ); vg_async_stall(); } @@ -137,12 +165,18 @@ struct world_load_complete_data{ static void skaterift_world_load_done( void *payload, u32 size ){ struct world_load_complete_data *data = payload; + world_instance *world = &world_static.instances[ data->purpose ]; - /* TODO(W2): Load player position from this save file */ vg_msg sav; vg_msg_init( &sav, data->save.buf, data->save.len ); - world_instance *world = &world_static.instances[ data->purpose ]; + if( data->purpose != k_world_purpose_hub ){ + vg_msg player_frame = sav; + if( vg_msg_seekframe( &player_frame, "player" ) ){ + vg_msg_getkvv3f( &player_frame, "position", world->player_co, NULL ); + } + } + world_entity_start( world, &sav ); world->status = k_world_status_loaded; world_static.load_state = k_world_loader_none; @@ -157,7 +191,6 @@ struct world_load_args { * Does a complete world switch using the remaining free slots */ static void skaterift_world_load_thread( void *_args ){ - /* FIXME: we need to check all threads that take args. args can dissapear! */ struct world_load_args args = *((struct world_load_args *)_args); addon_reg *reg = args.reg; @@ -172,7 +205,7 @@ static void skaterift_world_load_thread( void *_args ){ vg_strnull( &path, path_buf, 4096 ); assert( reg ); - addon_get_content_folder( reg, &path ); + addon_get_content_folder( reg, &path, 1 ); vg_str folder = path; if( !vg_strgood( &folder ) ) { @@ -295,25 +328,30 @@ static void skaterift_change_world_start( addon_reg *reg ){ vg_linear_clear( vg_mem.scratch ); /* ?? */ vg_info( "unloading old worlds\n" ); - - for( u32 i=1; istatus == k_world_status_loaded ){ - inst->status = k_world_status_unloading; - world_fadeout_audio( inst ); - } + world_instance *client_world = + &world_static.instances[ k_world_purpose_client ]; + + if( client_world->status == k_world_status_loaded ){ + client_world->status = k_world_status_unloading; + world_fadeout_audio( client_world ); } world_static.instance_addons[ k_world_purpose_client ] = reg; network_send_item( k_netmsg_playeritem_world1 ); relink_all_remote_player_worlds(); + world_unlink_nonlocal( &world_static.instances[k_world_purpose_hub] ); } } /* console command for the above function */ -static int skaterift_load_world_command( int argc, const char *argv[] ){ - if( !vg_loader_availible() ) return 0; /* FIXME */ +static int skaterift_load_world_command( int argc, const char *argv[] ) +{ + if( !vg_loader_availible() ) + { + vg_error( "Loading thread is currently unavailible\n" ); + return 0; + } if( argc == 1 ){ addon_alias q; @@ -321,7 +359,7 @@ static int skaterift_load_world_command( int argc, const char *argv[] ){ u32 reg_id = addon_match( &q ); if( reg_id != 0xffffffff ){ - addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id ); + addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id, 0 ); skaterift_change_world_start( reg ); } else { @@ -331,12 +369,16 @@ static int skaterift_load_world_command( int argc, const char *argv[] ){ else { vg_info( "worlds availible to load:\n" ); - for( int i=0; ialias, buf ); - vg_info( " %s\n", buf ); + + if( w->flags & ADDON_REG_HIDDEN ) + vg_info( " %s [hidden]\n", buf ); + else + vg_info( " %s\n", buf ); } } @@ -394,7 +436,7 @@ static void world_free( world_instance *world ){ glDeleteTextures( 1, &world->tex_light_cubes ); /* delete textures and meshes */ - glDeleteTextures( world->texture_count, world->textures ); + glDeleteTextures( world->texture_count-1, world->textures+1 ); u32 world_index = world - world_static.instances; if( world_index ){