#include "world_gate.h"
#include "ent_skateshop.h"
#include "addon.h"
+#include "save.h"
/*
* load the .mdl file located in path as a world instance
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( instance_id == 0 ) allocator = world_static.heap;
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;
+
+ vg_async_call( async_world_postprocess, world, 0 );
+ vg_async_stall();
}
-static void skaterift_client_world_change_done( void *payload, u32 size ){
+
+struct world_load_complete_data{
+ struct savedata save;
+ u32 instance_start, instance_count;
+};
+
+static void skaterift_world_load_done( void *payload, u32 size ){
+ struct world_load_complete_data *data = payload;
+
+ for( u32 i=0; i<data->instance_count; i++ ){
+ world_instance *world = &world_static.instances[ data->instance_start+i ];
+ world_entity_start( world, &data->save );
+ }
+
world_static.load_state = k_world_loader_none;
}
+struct world_load_args {
+ enum world_purpose{
+ k_world_purpose_hub,
+ k_world_purpose_client
+ }
+ purpose;
+ addon_reg *reg;
+};
+
/*
* Does a complete world switch using the remaining free slots
*/
-static void skaterift_client_world_changer_thread( void *_ ){
+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;
+
+ if( purpose == k_world_purpose_hub ) world_static.addon_hub = reg;
+ else world_static.addon_client = reg;
+
char path_buf[4096];
vg_str path;
vg_strnull( &path, path_buf, 4096 );
- assert( world_static.addon_client );
- addon_get_content_folder( world_static.addon_client, &path );
+ assert( reg );
+ addon_get_content_folder( reg, &path );
vg_str folder = path;
if( !vg_strgood( &folder ) ) {
}
}
- world_instance_load_mdl( 1, worlds[first_index] );
+ 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
}
#endif
- vg_async_call( skaterift_client_world_change_done, NULL, 0 );
+ vg_async_item *final_call =
+ vg_async_alloc( sizeof(struct world_load_complete_data) );
+
+ struct world_load_complete_data *data = final_call->payload;
+ data->instance_start = instance_start;
+ data->instance_count = instance_count;
+ strcpy( data->save.path, "temp_fuckyou.bkv" );
+
+ savedata_read( &data->save );
+
+ 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
}
}
- vg_info( "worlds cleared, begining load\n" );
- world_static.load_state = k_world_loader_load;
+ if( vg_loader_availible() ){
+ vg_info( "worlds cleared, begining load\n" );
+ world_static.load_state = k_world_loader_load;
+
+ 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.addon_client;
- /* finally can start the loader */
- vg_loader_start( skaterift_client_world_changer_thread, NULL );
+ /* 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 );
+ }
}
/* places all loaded worlds into unloading state */