X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_load.c;h=18f405e03735e2cd3ac5caf7fe010c0a26488c08;hb=0ff2713a286a77fa3e3538f5a76b0bf60525eb5b;hp=9ca847c85d191f09707a7bd6a2fca92e38307b0f;hpb=a1b878e2cdbf145b59d611b5060d3c1a1a80d017;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_load.c b/world_load.c index 9ca847c..18f405e 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); @@ -42,30 +45,42 @@ VG_STATIC void world_load_mdl( 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_challenge, "ent_challenge", 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 ); + MDL_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld, heap ); + MDL_LOAD_ARRAY( meta, &world->ent_prop, ent_prop, 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) ){ 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{ world->info.pstr_author = 0; @@ -74,49 +89,97 @@ VG_STATIC void world_load_mdl( const char *path ) world->info.timezone = 0.0f; } - 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 */ - world_gen_load_surfaces(); - world_gen_routes_ent_init(); - world_gen_entities_init(); - world->volume_bh = bh_create( heap, &bh_system_volumes, world, - mdl_arrcount( &world->ent_volume ), 1 ); + 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 ); + world_gen_generate_meshes( world ); + world_gen_routes_generate( instance_id ); + world_gen_compute_light_indices( world ); + mdl_close( meta ); + + /* 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 ); + } + + /* 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; + } + + vg_async_call( async_world_postprocess, world, 0 ); vg_async_stall(); +} - mdl_close( meta ); +struct world_load_complete_data{ + savedata_file save; + 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; + vg_msg_init( &sav, data->save.buf, data->save.len ); + + 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; } -static void skaterift_world_change_done( void *payload, u32 size ){ - world_loader.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 = *((struct world_load_args *)_args); + + 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 ); - 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, 1 ); vg_str folder = path; if( !vg_strgood( &folder ) ) { @@ -124,7 +187,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; @@ -147,7 +210,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; } @@ -173,26 +236,26 @@ static void skaterift_world_changer_thread( void *_ ){ } } - world_loader.generate_point_cloud = 1; - world_loader.world_index = 1; - world_load_mdl( worlds[first_index] ); + world_instance_load_mdl( args.purpose, worlds[first_index] ); - world_loader.generate_point_cloud = 0; - for( u32 j=0; jpayload; + data->purpose = args.purpose; + + skaterift_world_get_save_path( args.purpose, data->save.path ); + savedata_file_read( &data->save ); - vg_async_call( skaterift_world_change_done, NULL, 0 ); + 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 ) ){ @@ -202,76 +265,106 @@ 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] ); - - 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_change_world_command( int argc, const char *argv[] ) -{ +static int skaterift_load_world_command( int argc, const char *argv[] ){ + if( !vg_loader_availible() ) return 0; /* FIXME */ + 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; + 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, 0 ); + skaterift_change_world_start( reg ); + } + else { + 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 ); + } } 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; } @@ -328,8 +427,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; @@ -338,8 +436,8 @@ VG_STATIC void world_init_blank( world_instance *world ) world->surface_count = 0; world->geo_bh = NULL; - world->volume_bh = NULL; - world->audio_bh = NULL; + world->entity_bh = NULL; + world->entity_list = NULL; world->rendering_gate = NULL; world->water.enabled = 0; @@ -367,6 +465,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 */