X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=ece92972c080625f6390e4252640363355572921;hb=refs%2Fheads%2Frigidbody;hp=7fb6e478694a76afb7be635211df3aaf5c621c21;hpb=88f8273a9ab7b0644813625c43c70c5af34cd4f5;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 7fb6e47..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,80 +43,142 @@ 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 ); - 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 ); + 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 ); - if( mdl_arrcount(&infos) ){ + world->skybox = k_skybox_default; + 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")) + { + 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 t; - struct tm *tm; - time( &t ); - tm = gmtime( &t ); - world->time = (float)tm->tm_min/20.0f + (world->info.timezone/24.0f); + time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60); + world->time = ((f64)(seconds)/(k_day_length*60.0)); + 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 */ + 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 ++ ) + { + struct leaderboard_cache *board = &world->leaderboard_cache[i]; + board->data = vg_linear_alloc( heap, NETWORK_REQUEST_MAX ); + board->status = k_request_status_client_error; + board->cache_time = 0.0; + 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(); } struct world_load_complete_data{ savedata_file save; - u32 instance_start, instance_count; + enum world_purpose purpose; }; 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 ]; - vg_msg sav = {0}; - sav.buf = data->save.buf; - sav.len = data->save.len; - sav.max = data->save.len; + 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 ); + 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; } @@ -131,19 +191,21 @@ struct world_load_args { * Does a complete world switch using the remaining free slots */ 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; + struct world_load_args args = *((struct world_load_args *)_args); - 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 uid[ADDON_UID_MAX]; + addon_alias_uid( ®->alias, uid ); + vg_info( "LOAD WORLD %s @%d\n", uid, args.purpose ); char path_buf[4096]; vg_str path; 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 ) ) { @@ -151,7 +213,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; @@ -174,7 +236,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; } @@ -200,30 +262,15 @@ static void skaterift_world_load_thread( void *_args ){ } } - 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 - world_loader.generate_point_cloud = 0; - for( u32 j=0; jpayload; - data->instance_start = instance_start; - data->instance_count = instance_count; + data->purpose = args.purpose; - skaterift_world_get_save_path( purpose, data->save.path ); + skaterift_world_get_save_path( args.purpose, data->save.path ); savedata_file_read( &data->save ); vg_async_dispatch( final_call, skaterift_world_load_done ); @@ -233,7 +280,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 ){ @@ -252,7 +299,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 */ @@ -267,7 +314,7 @@ 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.addon_client == reg ){ + if( world_static.instance_addons[ k_world_purpose_client ] == reg ){ vg_warn( "World is already loaded\n" ); return; } @@ -281,42 +328,57 @@ static void skaterift_change_world_start( addon_reg *reg ){ vg_linear_clear( vg_mem.scratch ); /* ?? */ vg_info( "unloading old worlds\n" ); - 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_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.addon_client = reg; + 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_change_world_command( int argc, const char *argv[] ){ - if( !vg_loader_availible() ) return 0; +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; - q.type = k_addon_type_world; - q.workshop_id = 0; - vg_strncpy( argv[0], q.foldername, 64, k_strncpy_always_add_null ); + addon_uid_to_alias( argv[0], &q ); 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 { - char buf[76]; - addon_alias_uid( &q, buf ); - vg_error( "Addon '%s' is not installed or not found.\n", buf ); + vg_error( "Addon '%s' is not installed or not found.\n", argv[0] ); + } + } + else { + vg_info( "worlds availible to load:\n" ); + + for( int i=0; ialias, buf ); + + if( w->flags & ADDON_REG_HIDDEN ) + vg_info( " %s [hidden]\n", buf ); + else + vg_info( " %s\n", buf ); } } @@ -357,8 +419,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 */ @@ -375,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 ){ @@ -397,8 +458,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 */ -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;