#include "vg/vg_msg.h"
#include "network.h"
#include "player_remote.h"
+#include "vg/vg_loader.h"
/*
* load the .mdl file located in path as a world instance
*/
static void world_instance_load_mdl( u32 instance_id, const char *path ){
- vg_rand_seed( 9001 );
-
world_instance *world = &world_static.instances[ instance_id ];
world_init_blank( world );
world->status = k_world_status_loading;
mdl_load_animation_block( meta, world->heap );
mdl_load_mesh_block( meta, world->heap );
+ vg_info( "%u\n", sizeof(ent_cubemap) );
+
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_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_LOAD_ARRAY( meta, &world->ent_region, ent_region, heap );
+ MDL_LOAD_ARRAY( meta, &world->ent_glider, ent_glider, heap );
+ MDL_LOAD_ARRAY( meta, &world->ent_npc, ent_npc, heap );
mdl_array_ptr infos;
MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch );
world->skybox = k_skybox_default;
- if( mdl_arrcount(&infos) ){
+ 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")){
+ if( world->meta.info.version >= 104 )
+ {
+ if( MDL_CONST_PSTREQ( &world->meta, world->info.pstr_skybox,"space"))
+ {
world->skybox = k_skybox_space;
}
}
}
- else{
+ else
+ {
world->info.pstr_author = 0;
world->info.pstr_desc = 0;
world->info.pstr_name = 0;
world->info.timezone = 0.0f;
+ world->info.flags = 0;
}
time_t seconds = time(NULL) % ((u32)vg_maxf(1.0f,k_day_length)*60);
world->time += (world->info.timezone/24.0);
/* process resources from pack */
+ u64 t4 = SDL_GetPerformanceCounter();
world_gen_load_surfaces( world );
+ u64 t5 = SDL_GetPerformanceCounter();
world_gen_routes_ent_init( world );
world_gen_entities_init( world );
+ u64 t6 = SDL_GetPerformanceCounter();
/* main bulk */
+ u64 t0 = SDL_GetPerformanceCounter();
world_gen_generate_meshes( world );
+ u64 t1 = SDL_GetPerformanceCounter();
world_gen_routes_generate( instance_id );
+ u64 t2 = SDL_GetPerformanceCounter();
world_gen_compute_light_indices( world );
+ u64 t3 = SDL_GetPerformanceCounter();
mdl_close( meta );
+ u64 utime_mesh = t1-t0,
+ utime_route = t2-t1,
+ utime_indices = t3-t2,
+ utime_tex = t5-t4,
+ utime_ent = t6-t5,
+ ufreq = SDL_GetPerformanceFrequency();
+
+ f64 ftime_mesh = ((f64)utime_mesh / (f64)ufreq)*1000.0,
+ ftime_route = ((f64)utime_route / (f64)ufreq)*1000.0,
+ ftime_ind = ((f64)utime_route / (f64)ufreq)*1000.0,
+ ftime_tex = ((f64)utime_tex / (f64)ufreq)*1000.0,
+ ftime_ent = ((f64)utime_ent / (f64)ufreq)*1000.0;
+
+ vg_info( "wtime:mesh %.2fms route %.2fms ind %.2fms tex %.2fms ent %.2fms\n",
+ ftime_mesh, ftime_route, ftime_ind, ftime_tex, ftime_ent );
+
/* 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 );
- }
+ world_default_spawn_pos( world, 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; i<mdl_arrcount( &world->ent_route ); i ++ ){
+ for( u32 i=0; i<mdl_arrcount( &world->ent_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;
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 );
+ vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f,
+ world->player_co, NULL );
}
}
world_static.load_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_load_thread( void *_args ){
+void skaterift_world_load_thread( void *_args )
+{
struct world_load_args args = *((struct world_load_args *)_args);
addon_reg *reg = args.reg;
vg_str path;
vg_strnull( &path, path_buf, 4096 );
- assert( reg );
addon_get_content_folder( reg, &path, 1 );
vg_str folder = path;
/* holding pattern before we can start loading the new world, since we might be
* waiting for audio to stop */
-static void skaterift_change_client_world_preupdate(void){
+void skaterift_change_client_world_preupdate(void)
+{
for( u32 i=1; i<k_world_max; i++ ){
world_instance *inst = &world_static.instances[i];
}
/* places all loaded worlds into unloading state */
-static void skaterift_change_world_start( addon_reg *reg ){
+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{
}
/* console command for the above function */
-static int skaterift_load_world_command( int argc, const char *argv[] ){
- if( !vg_loader_availible() ) return 0; /* FIXME */
+int skaterift_load_world_command( int argc, const char *argv[] )
+{
+ if( !vg_loader_availible() )
+ {
+ vg_error( "Loading thread is currently unavailible\n" );
+ return 0;
+ }
if( argc == 1 ){
addon_alias q;
* 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 ){
+int world_freeable( world_instance *world )
+{
if( world->status != k_world_status_unloading ) return 0;
u8 world_id = (world - world_static.instances) + 1;
/*
* Free all resources for world instance
*/
-static void world_free( world_instance *world ){
+void world_free( world_instance *world )
+{
vg_info( "Free world @%p\n", world );
/* free meshes */
glDeleteTextures( 1, &world->tex_light_cubes );
/* delete textures and meshes */
- glDeleteTextures( world->texture_count, world->textures );
+ glDeleteTextures( world->texture_count-1, world->textures+1 );
u32 world_index = world - world_static.instances;
if( world_index ){
* reset the world structure without deallocating persistent buffers
* TODO: Make this a memset(0), and have persistent items live in a static loc
*/
-static void world_init_blank( world_instance *world ){
+void world_init_blank( world_instance *world )
+{
memset( &world->meta, 0, sizeof(mdl_context) );
world->textures = NULL;
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff