}
else{
sav->len = 0;
- vg_error( "Error reading savedata (%s)\n", sav->path );
+ vg_warn( "Error reading savedata (%s)\n", sav->path );
}
}
#include "ent_skateshop.h"
-static void skaterift_write_savedata(void);
-static void skaterift_read_savedata(void);
+static void savedata_read( struct savedata *sav );
+static void savedata_write_thread( void *file );
static void skaterift_read_main_savedata( struct savedata *sav );
static void skaterift_write_main_savedata(void);
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
- world_static.addon_client = reg;
world_static.load_state = k_world_loader_load;
- skaterift_client_world_changer_thread(NULL);
+ struct world_load_args args = {
+ .purpose = k_world_purpose_client,
+ .reg = reg
+ };
+ skaterift_world_load_thread( &args );
world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
}
/* load home/permanent world manually */
- world_static.addon_hub = spawn;
- world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+ world_static.load_state = k_world_loader_load;
+ struct world_load_args args = {
+ .purpose = k_world_purpose_hub,
+ .reg = spawn
+ };
+ skaterift_world_load_thread( &args );
vg_async_call( async_skaterift_player_start, NULL, 0 );
vg_async_stall();
#include "entity.h"
#include "world.h"
#include "world_load.h"
+#include "save.h"
VG_STATIC void world_gen_entities_init( world_instance *world ){
/* lights */
}
}
+VG_STATIC void world_entity_start( world_instance *world,
+ struct savedata *sav ){
+ vg_info( "Start instance %p\n", world );
+
+ world->probabilities[ k_probability_curve_constant ] = 1.0f;
+ for( u32 i=0; i<mdl_arrcount(&world->ent_audio); i++ ){
+ ent_audio *audio = mdl_arritm(&world->ent_audio,i);
+ if( audio->flags & AUDIO_FLAG_AUTO_START ){
+ ent_call call;
+ call.data = NULL;
+ call.function = k_ent_function_trigger;
+ call.id = mdl_entity_id( k_ent_audio, i );
+ entity_call( world, &call );
+ }
+ }
+}
+
+VG_STATIC void async_world_entity_start( void *payload, u32 size ){
+
+}
+
#endif /* WORLD_ENTITY_C */
#include "world.h"
#include "entity.h"
#include "bvh.h"
+#include "save.h"
VG_STATIC void world_gen_entities_init( world_instance *world );
VG_STATIC ent_spawn *world_find_spawn_by_name( world_instance *world,
const char *name );
VG_STATIC ent_spawn *world_find_closest_spawn( world_instance *world,
v3f position );
+VG_STATIC void world_entity_start( world_instance *world,
+ struct savedata *sav );
VG_STATIC void ent_volume_call( world_instance *world, ent_call *call );
VG_STATIC void ent_audio_call( world_instance *world, ent_call *call );
/*
* Rendering pass needed to complete the world
*/
-VG_STATIC void async_world_postprocess_render( void *payload, u32 _size ){
+VG_STATIC void async_world_postprocess( void *payload, u32 _size ){
/* create scene lighting buffer */
world_instance *world = payload;
glBufferSubData( GL_UNIFORM_BUFFER, 0,
sizeof(struct ub_world_lighting), &world->ub_lighting );
- /* yes we are using this as the entity begin thing. FIXME */
- world->probabilities[ k_probability_curve_constant ] = 1.0f;
- for( u32 i=0; i<mdl_arrcount(&world->ent_audio); i++ ){
- ent_audio *audio = mdl_arritm(&world->ent_audio,i);
- if( audio->flags & AUDIO_FLAG_AUTO_START ){
- ent_call call;
- call.data = NULL;
- call.function = k_ent_function_trigger;
- call.id = mdl_entity_id( k_ent_audio, i );
- entity_call( world, &call );
- }
- }
+ world->status = k_world_status_loaded;
}
/* Loads textures from the pack file */
VG_STATIC void world_gen_load_surfaces( world_instance *world );
VG_STATIC void world_gen_generate_meshes( world_instance *world );
VG_STATIC void world_gen_compute_light_indices( world_instance *world );
-VG_STATIC void async_world_postprocess_render( void *payload, u32 _size );
+VG_STATIC void async_world_postprocess( void *payload, u32 _size );
#endif /* WORLD_GEN_H */
#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 */
projects / carveJwlIkooP6JGAAIwe30JlM.git / commitdiff