X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=5a2861351c7d75956caebbf3bdfbc532f6392fc8;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=b741a3178e48e0f93df0e01acf4b64e70d6795e2;hpb=14851c4c820eb07a0db0ec0366a70bdd6518c331;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index b741a31..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" @@ -11,6 +8,8 @@ #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 @@ -165,16 +164,19 @@ 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" ) ){ + if( vg_msg_seekframe( &player_frame, "player" ) ) + { vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, world->player_co, NULL ); } @@ -183,6 +185,12 @@ static void skaterift_world_load_done( void *payload, u32 size ){ world_entity_start( world, &sav ); world->status = k_world_status_loaded; world_static.load_state = k_world_loader_none; + + if( world_static.clear_async_op_when_done ) + { + skaterift.op = k_async_op_none; + world_static.clear_async_op_when_done = 0; + } } /* @@ -275,22 +283,29 @@ 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 */ 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; @@ -308,40 +323,57 @@ void skaterift_change_client_world_preupdate(void) } } -/* places all loaded worlds into unloading state */ +/* + * places all loaded worlds into unloading state, pass NULL to reload the world + */ 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" ); + 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 */ @@ -353,23 +385,34 @@ int skaterift_load_world_command( int argc, const char *argv[] ) return 0; } - if( argc == 1 ){ + if( argc == 1 ) + { + if( !strcmp( argv[0], "reload" ) ) + { + skaterift_change_world_start( NULL ); + return 0; + } + 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; imesh_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. @@ -491,12 +533,21 @@ 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 */