#if 1
-//#define SR_NETWORKED
+#define SR_NETWORKED
#ifndef VG_RELEASE
#define VG_DEVWINDOW
if( reg_id != 0xffffffff ){
addon_reg *reg = get_addon_from_index( k_addon_type_world, reg_id );
- world_loader.generate_point_cloud = 0;
- world_loader.reg = reg;
- world_loader.state = k_world_loader_load;
- skaterift_world_changer_thread(NULL);
+ world_static.addon_client = reg;
+ world_static.load_state = k_world_loader_load;
+ skaterift_client_world_changer_thread(NULL);
- world_static.active_world = vg_msg_seekkvu32( &world, "index", 0 );
+ world_static.active_instance = vg_msg_seekkvu32( &world, "index", 0 );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
vg_loader_step( audio_init, audio_free );
/* 'systems' are completely loaded now */
-
- /* load home/permanent world manually */
- world_loader.reg = NULL;
- strcpy( world_loader.override_name, "mp_spawn" );
- world_loader.generate_point_cloud = 1;
- world_loader.world_index = 0;
- world_load_mdl( "maps/mp_spawn/main.mdl" );
-
- vg_async_call( async_skaterift_player_start, NULL, 0 );
- vg_async_stall();
/* Completing addon registrations
* -------------------------------------
mtzero->metadata_len = msg.cur;
}
+ /* load home/permanent world manually */
+ world_static.addon_hub = spawn;
+ world_instance_load_mdl( 0, "maps/mp_spawn/main.mdl" );
+
+ vg_async_call( async_skaterift_player_start, NULL, 0 );
+ vg_async_stall();
+
+
global_skateshop.selected_world_id=1;
global_skateshop.pointcloud_world_id=1;
skateshop_world_preview_loader_thread( mtzero ); /* HACK */
vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 1.0f, 0.0f }, 0xff00ff00 );
vg_line( (v3f){ 0.0f, 0.0f, 0.0f }, (v3f){ 0.0f, 0.0f, 1.0f }, 0xff0000ff );
}
-static void skaterift_change_world_preupdate(void);
+static void skaterift_change_client_world_preupdate(void);
/*
* UPDATE LOOP
steam_update();
skaterift_preupdate_inputs();
if( skaterift.op == k_async_op_clientloading ) return;
- if( world_loader.state == k_world_loader_preload )
- skaterift_change_world_preupdate();
+ if( world_static.load_state == k_world_loader_preload )
+ skaterift_change_client_world_preupdate();
draw_origin_axis();
network_update();
return;
}
- for( u32 i=0; i<vg_list_size(world_static.worlds); i++ ){
- if( world_static.worlds[i].status == k_world_status_loaded ){
- world_prerender( &world_static.worlds[i] );
+ for( u32 i=0; i<vg_list_size(world_static.instances); i++ ){
+ if( world_static.instances[i].status == k_world_status_loaded ){
+ world_prerender( &world_static.instances[i] );
}
}
}
VG_STATIC void render_main_game(void){
- player__animate( &localplayer );
if( skaterift.activity == k_skaterift_replay ){
player__animate_from_replay( &localplayer, &skaterift.replay );
}
- else
+ else{
+ player__animate( &localplayer );
skaterift_record_frame( &skaterift.replay, 0 );
+ }
player__pre_render( &localplayer );
skaterift_composite_maincamera();
it up with the oblique rendering inside the
portals */
- //world_render_challenges( localplayer.viewable_world );
-
/* continue with variable rate */
render_scene_gate_subview();