#include "world_routes.h"
#include "world_gate.h"
#include "ent_skateshop.h"
+#include "addon.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 )
-{
+VG_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 );
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);
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_unlock, "ent_unlock", heap );
+ mdl_load_array( meta, &world->ent_relay, "ent_relay", heap );
mdl_array_ptr infos;
mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
world->time = (float)tm->tm_min/20.0f + (world->info.timezone/24.0f);
/* 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 );
+ vg_async_call( async_world_postprocess_render, world, 0 );
+ vg_async_stall();
mdl_close( meta );
world->status = k_world_status_loaded;
}
-/*
- * op: k_async_op_world_loading
- * k_async_op_world_preloading
- * -----------------------------------------------------------------------------
- */
-
-static void async_skaterift_world_loaded( void *payload, u32 size )
-{
- skaterift_end_op();
+static void skaterift_client_world_change_done( void *payload, u32 size ){
+ world_static.load_state = k_world_loader_none;
}
/*
* Does a complete world switch using the remaining free slots
*/
-static void skaterift_world_changer_thread( void *data )
-{
- if( world_loader.location == k_world_load_type_workshop ){
- vg_fatal_error( "Unimplemented\n" );
- }
-
+static void skaterift_client_world_changer_thread( void *_ ){
char path_buf[4096];
vg_str path;
vg_strnull( &path, path_buf, 4096 );
- vg_strcat( &path, "maps/" );
+
+ assert( world_static.addon_client );
+ addon_get_content_folder( world_static.addon_client, &path );
vg_str folder = path;
- vg_strcat( &folder, world_loader.name );
if( !vg_strgood( &folder ) ) {
vg_error( "Load target too long\n" );
- vg_async_call( workshop_async_any_complete, NULL, 0 );
return;
}
vg_dir dir;
if( !vg_dir_open(&dir, folder.buffer) ){
vg_error( "opendir('%s') failed\n", folder.buffer );
- vg_async_call( async_skaterift_world_loaded, NULL, 0 );
return;
}
}
}
- world_loader.generate_point_cloud = 1;
- world_loader.world_index = 1;
- world_load_mdl( worlds[first_index] );
+ world_instance_load_mdl( 1, worlds[first_index] );
+ /* TODO: Support multiply packed worlds */
+#if 0
world_loader.generate_point_cloud = 0;
for( u32 j=0; j<i; j++ ){
if( j != first_index ){
world_load_mdl( worlds[j] );
}
}
+#endif
- vg_async_call( async_skaterift_world_loaded, NULL, 0 );
+ vg_async_call( skaterift_client_world_change_done, NULL, 0 );
}
/* 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; i<vg_list_size(world_static.worlds); i++ ){
- world_instance *inst = &world_static.worlds[i];
+static void skaterift_change_client_world_preupdate(void){
+ for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
+ world_instance *inst = &world_static.instances[i];
if( inst->status == k_world_status_unloading ){
if( world_freeable( inst ) ){
}
vg_info( "worlds cleared, begining load\n" );
- skaterift_shift_op( k_async_op_world_loading );
+ world_static.load_state = k_world_loader_load;
/* finally can start the loader */
- vg_loader_start( skaterift_world_changer_thread, NULL );
+ vg_loader_start( skaterift_client_world_changer_thread, NULL );
}
/* places all loaded worlds into unloading state */
-static void skaterift_change_world( const char *world_name )
-{
- vg_info( "switching to %s\n", world_name );
-
- if( world_static.active_world != 0 ){
+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{
- skaterift_begin_op( k_async_op_world_preloading );
+ char buf[76];
+ addon_alias_uid( ®->alias, buf );
+ vg_info( "switching to: %s\n", buf );
- vg_linear_clear( vg_mem.scratch );
- vg_strncpy( world_name, world_loader.name,
- vg_list_size(world_loader.name), k_strncpy_overflow_fatal );
-
+ 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] );
+ world_unlink_nonlocal( &world_static.instances[0] );
- for( u32 i=1; i<vg_list_size(world_static.worlds); i++ ){
- world_instance *inst = &world_static.worlds[i];
+ for( u32 i=1; i<vg_list_size(world_static.instances); i++ ){
+ world_instance *inst = &world_static.instances[i];
if( inst->status == k_world_status_loaded ){
inst->status = k_world_status_unloading;
world_fadeout_audio( inst );
+
+ /* TODO: THIS IS WHERE A SAVE SHOULD BE DONE */
}
}
+
+ world_static.addon_client = reg;
}
}
/* console command for the above function */
-static int skaterift_change_world_command( int argc, const char *argv[] )
-{
- if( argc == 1 )
- skaterift_change_world( argv[0] );
+static int skaterift_change_world_command( int argc, const char *argv[] ){
+ 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 );
+
+ u32 reg_id = addon_match( &q );
+ if( reg_id != 0xffffffff ){
+ addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
+ 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 );
+ }
+ }
return 0;
}
-
+#if 0
static world_instance *world_loading_instance(void){
- return &world_static.worlds[ world_loader.world_index ];
+ return &world_static.instances[ world_loader.world_index ];
}
+#endif
/*
* 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; i<vg_list_size(world_static.worlds); i++ ){
- if( world_static.worlds[i].status != k_world_status_unloaded ){
+ for( u32 i=world_id; i<vg_list_size(world_static.instances); i++ ){
+ if( world_static.instances[i].status != k_world_status_unloaded ){
return 0;
}
}
/* delete textures and meshes */
glDeleteTextures( world->texture_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) );
}
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;
v3_copy( (v3f){1.10f, 0.89f, 0.35f}, state->g_sun_colour );
}
-
-
#endif /* WORLD_LOAD_C */