X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=5a2861351c7d75956caebbf3bdfbc532f6392fc8;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=5ab2dfb0793e80ce9e5670bd0b4e055fbba5ac83;hpb=2dbc6f4022802b89c934ba78e7085cc7ee81799b;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 5ab2dfb..5a28613 100644 --- a/world_load.c +++ b/world_load.c @@ -1,6 +1,3 @@ -#ifndef WORLD_LOAD_C -#define WORLD_LOAD_C - #include "world_load.h" #include "world_routes.h" #include "world_gate.h" @@ -10,13 +7,14 @@ #include "vg/vg_msg.h" #include "network.h" #include "player_remote.h" +#include "vg/vg_loader.h" +#include "vg/vg_io.h" +#include /* * 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; @@ -71,21 +69,27 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){ 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_LOAD_ARRAY( meta, &world->ent_npc, ent_npc, heap ); mdl_array_ptr infos; 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; @@ -98,33 +102,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} ); - if( rp ) - v3_copy( rp->transform.co, world->player_co ); - else{ - /* FIXME: we need to find a safe place to put the player_co using - * raycasts. */ - v3_zero( 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; @@ -144,34 +164,40 @@ struct world_load_complete_data{ enum world_purpose purpose; }; -static void skaterift_world_load_done( void *payload, u32 size ){ +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; vg_msg_init( &sav, data->save.buf, data->save.len ); - if( data->purpose != k_world_purpose_hub ){ + 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 ); + if( vg_msg_seekframe( &player_frame, "player" ) ) + { + vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, + world->player_co, NULL ); } } world_entity_start( world, &sav ); world->status = k_world_status_loaded; world_static.load_state = k_world_loader_none; -} -struct world_load_args { - enum world_purpose purpose; - addon_reg *reg; -}; + if( world_static.clear_async_op_when_done ) + { + skaterift.op = k_async_op_none; + world_static.clear_async_op_when_done = 0; + } +} /* * Does a complete world switch using the remaining free slots */ -static void skaterift_world_load_thread( void *_args ){ +void skaterift_world_load_thread( void *_args ) +{ struct world_load_args args = *((struct world_load_args *)_args); addon_reg *reg = args.reg; @@ -185,7 +211,6 @@ static void skaterift_world_load_thread( void *_args ){ vg_str path; vg_strnull( &path, path_buf, 4096 ); - assert( reg ); addon_get_content_folder( reg, &path, 1 ); vg_str folder = path; @@ -258,21 +283,29 @@ static void skaterift_world_load_thread( void *_args ){ 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_client_world_preupdate(void){ - for( u32 i=1; istatus == k_world_status_unloading ){ - if( world_freeable( inst ) ){ + if( inst->status == k_world_status_unloading ) + { + if( world_freeable( inst ) ) + { world_free( inst ); } return; } } - if( vg_loader_availible() ){ + if( vg_loader_availible() ) + { vg_info( "worlds cleared, begining load\n" ); world_static.load_state = k_world_loader_load; @@ -290,62 +323,96 @@ static void skaterift_change_client_world_preupdate(void){ } } -/* 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{ - if( world_static.instance_addons[ k_world_purpose_client ] == reg ){ - vg_warn( "World is already loaded\n" ); +/* + * places all loaded worlds into unloading state, pass NULL to reload the world + */ +void skaterift_change_world_start( addon_reg *reg ) +{ + if( world_static.instance_addons[ k_world_purpose_client ] == reg ) + { + vg_warn( "World is already loaded\n" ); + return; + } + + if( !reg ) + { + if( world_static.instance_addons[ k_world_purpose_client ] ) + { + reg = world_static.instance_addons[ k_world_purpose_client ]; + world_static.clear_async_op_when_done = 1; + } + else + { + vg_warn( "No client world 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; - world_static.load_state = k_world_loader_preload; + if( world_static.active_instance != 0 ) + skaterift.op = k_async_op_clientloading; - vg_linear_clear( vg_mem.scratch ); /* ?? */ - vg_info( "unloading old worlds\n" ); + char buf[76]; + addon_alias_uid( ®->alias, buf ); + vg_info( "switching to: %s\n", buf ); + skaterift_autosave(1); - world_instance *client_world = - &world_static.instances[ k_world_purpose_client ]; + vg_linear_clear( vg_mem.scratch ); /* ?? */ + vg_info( "unloading old worlds\n" ); - if( client_world->status == k_world_status_loaded ){ - client_world->status = k_world_status_unloading; - world_fadeout_audio( client_world ); - } + world_instance *client_world = + &world_static.instances[ k_world_purpose_client ]; - 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] ); + 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 */ +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 ) + { + if( !strcmp( argv[0], "reload" ) ) + { + skaterift_change_world_start( NULL ); + return 0; + } - if( argc == 1 ){ addon_alias q; addon_uid_to_alias( argv[0], &q ); u32 reg_id = addon_match( &q ); - if( reg_id != 0xffffffff ){ + if( reg_id != 0xffffffff ) + { addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id, 0 ); skaterift_change_world_start( reg ); } - else { + else + { vg_error( "Addon '%s' is not installed or not found.\n", argv[0] ); } } - else { + else + { vg_info( "worlds availible to load:\n" ); - for( int i=0; istatus != k_world_status_unloading ) return 0; u8 world_id = (world - world_static.instances) + 1; @@ -395,14 +463,14 @@ static int world_freeable( world_instance *world ){ /* * Free all resources for world instance */ -static void world_free( world_instance *world ){ +void world_free( world_instance *world ) +{ vg_info( "Free world @%p\n", world ); /* free meshes */ mesh_free( &world->mesh_route_lines ); mesh_free( &world->mesh_geo ); mesh_free( &world->mesh_no_collide ); - mesh_free( &world->mesh_water ); /* glDeleteBuffers silently ignores 0's and names that do not correspond to * existing buffer objects. @@ -434,7 +502,8 @@ 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 ){ +void world_init_blank( world_instance *world ) +{ memset( &world->meta, 0, sizeof(mdl_context) ); world->textures = NULL; @@ -464,12 +533,21 @@ static void world_init_blank( world_instance *world ){ state->g_shadow_length = 9.50f; state->g_shadow_spread = 0.65f; +#if 0 + /* 2023 style */ v3_copy( (v3f){0.37f, 0.54f, 0.97f}, state->g_daysky_colour ); v3_copy( (v3f){0.03f, 0.05f, 0.20f}, state->g_nightsky_colour ); v3_copy( (v3f){1.00f, 0.32f, 0.01f}, state->g_sunset_colour ); v3_copy( (v3f){0.13f, 0.17f, 0.35f}, state->g_ambient_colour ); v3_copy( (v3f){0.25f, 0.17f, 0.51f}, state->g_sunset_ambient ); v3_copy( (v3f){1.10f, 0.89f, 0.35f}, state->g_sun_colour ); +#else + /* 2024 style */ + v3_copy( (v3f){0.308f, 0.543f, 0.904f}, state->g_daysky_colour ); + v3_copy( (v3f){0.030f, 0.050f, 0.200f}, state->g_nightsky_colour ); + v3_copy( (v3f){1.000f, 0.320f, 0.010f}, state->g_sunset_colour ); + v3_copy( (v3f){0.130f, 0.170f, 0.350f}, state->g_ambient_colour ); + v3_copy( (v3f){0.25f, 0.17f, 0.51f}, state->g_sunset_ambient ); + v3_copy( (v3f){1.000f, 0.809f, 0.318f}, state->g_sun_colour ); +#endif } - -#endif /* WORLD_LOAD_C */