* =============================================================================
*/
-#if 1
+#if 0
#define SR_NETWORKED
#include "addon.c"
#include "highscores.c"
#include "save.c"
+#include "respawn.c"
static struct player_avatar localplayer_avatar;
}
static void skaterift_restore_state(void){
- struct savedata sav;
- skaterift_read_main_savedata( &sav );
+ savedata_file sav;
+ strcpy( sav.path, str_skaterift_main_save );
+ savedata_file_read( &sav );
+
vg_msg kvsav = {0};
kvsav.buf = sav.buf;
kvsav.len = sav.len;
kvsav.max = sizeof(sav.buf);
+ u32 board_reg_id = 0,
+ player_reg_id = 0;
+
vg_msg player = kvsav;
if( vg_msg_seekframe( &player, "player", 0 ) ){
addon_alias q;
/* board */
skaterift_read_addon_alias( &player, "board", k_addon_type_board, &q );
u32 reg_id = addon_match( &q );
- if( reg_id != 0xffffffff ){
- localplayer.board_view_slot =
- addon_cache_create_viewer( k_addon_type_board, reg_id );
- }
+ if( reg_id != 0xffffffff )
+ board_reg_id = reg_id;
+
/* playermodel */
skaterift_read_addon_alias( &player, "playermodel",
k_addon_type_player, &q );
reg_id = addon_match( &q );
-
- if( reg_id == 0xffffffff ) reg_id = 0;
- localplayer.playermodel_view_slot =
- addon_cache_create_viewer( k_addon_type_player, reg_id );
+ if( reg_id != 0xffffffff )
+ player_reg_id = reg_id;
}
+ localplayer.board_view_slot =
+ addon_cache_create_viewer( k_addon_type_board, board_reg_id );
+ localplayer.playermodel_view_slot =
+ addon_cache_create_viewer( k_addon_type_player, player_reg_id );
+
vg_msg world = kvsav;
if( vg_msg_seekframe( &world, "world", 0 ) ){
addon_alias q;
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_set_active_instance( vg_msg_seekkvu32( &world, "index", 0 ) );
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
+ }
- vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
- v3f pos;
- vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+ vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+ v3f pos;
+ vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+
+ if( v3_length2(pos) > 1.0f )
player__setpos( &localplayer, pos );
- }
}
}
}
/* 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();
/* and now */
skaterift_restore_state();
- vg_loader_step( NULL, skaterift_write_main_savedata );
+ vg_loader_step( NULL, skaterift_autosave_synchronous );
board_processview_thread(NULL);
vg_async_call( async_call_ready, NULL, 0 );
/* time rate */
f32 target = 1;
- if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) )
+ if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
+ k_skaterift_respawning) ) {
target = 0;
+ }
vg_slewf( &skaterift.time_rate, target, vg.time_frame_delta * (1.0f/0.3f) );
vg.time_rate = vg_smoothstepf( skaterift.time_rate );
player__pre_update( &localplayer );
- global_skateshop_preupdate();
+ world_entity_focus_preupdate();
skaterift_replay_pre_update();
world_update( world_current_instance(), localplayer.rb.co );
audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
+ respawn_chooser_pre_update();
}
VG_STATIC void vg_fixed_update(void){
audio_unlock();
vehicle_update_post();
+
+ if( vg.time - skaterift.last_autosave > 20.0 ){
+ if( skaterift_autosave(1) ){
+ skaterift.last_autosave = vg.time;
+ }
+ }
}
/*
}
}
- render_world( view_world, &skaterift.cam, 0 );
-
- render_water_texture( view_world, &skaterift.cam, 0 );
- render_fb_bind( gpipeline.fb_main, 1 );
- render_water_surface( view_world, &skaterift.cam );
+ if( skaterift.activity == k_skaterift_respawning ){
+ glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
+ glClearColor( 0.624f, 0.659f, 0.769f, 0.0f );
+ glClear( GL_COLOR_BUFFER_BIT );
+ glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0,
+ GL_COLOR_ATTACHMENT1 } );
+ view_world = &world_static.instances[respawn_chooser.world_id];
+ render_world_override( view_world );
+ }
+ else{
+ render_world( view_world, &skaterift.cam, 0 );
+ render_water_texture( view_world, &skaterift.cam, 0 );
+ render_fb_bind( gpipeline.fb_main, 1 );
+ render_water_surface( view_world, &skaterift.cam );
+ }
}
VG_STATIC void render_scene_gate_subview(void){
render_fb_bind( gpipeline.fb_main, 1 );
world_instance *view_world = localplayer.viewable_world;
if( !view_world ) return; /* ??? */
+ if( skaterift.activity == k_skaterift_respawning ) return;
int depth = 1;
if( localplayer.gate_waiting ) depth = 0;
}
VG_STATIC void skaterift_composite_maincamera(void){
- camera_lerp( &localplayer.cam, &global_skateshop.cam,
- vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
+ camera_lerp( &localplayer.cam, &world_static.focus_cam,
+ vg_smoothstepf(world_static.focus_strength), &skaterift.cam );
if( skaterift.activity == k_skaterift_replay ){
skaterift_get_replay_camera( &skaterift.cam );
skaterift.cam.nearz = 0.1f;
skaterift.cam.farz = 2100.0f;
+ if( skaterift.activity == k_skaterift_respawning ){
+ camera_copy( &respawn_chooser.cam, &skaterift.cam );
+ skaterift.cam.nearz = 4.0f;
+ skaterift.cam.farz = 3100.0f;
+ }
+
camera_update_transform( &skaterift.cam );
- if( localplayer.gate_waiting ){
- m3x3_mul( localplayer.basis_gate, skaterift.cam.transform,
- skaterift.cam.transform );
- }
- else{
- m3x3_mul( localplayer.basis, skaterift.cam.transform,
- skaterift.cam.transform );
+ if( skaterift.activity != k_skaterift_respawning ){
+ if( localplayer.gate_waiting ){
+ m3x3_mul( localplayer.basis_gate, skaterift.cam.transform,
+ skaterift.cam.transform );
+ }
+ else{
+ m3x3_mul( localplayer.basis, skaterift.cam.transform,
+ skaterift.cam.transform );
+ }
}
camera_update_view( &skaterift.cam );
/* --------------------------------------------------------------------- */
+ world_instance *view_world = localplayer.viewable_world;
+ if( view_world != NULL ){
+ render_world_cubemaps( view_world );
+
+ ent_gate *gate = view_world->rendering_gate;
+ if( gate ){
+ if( gate->flags & k_ent_gate_nonlocal ){
+ world_instance *dest = &world_static.instances[ gate->target ];
+ render_world_cubemaps( dest );
+ }
+ }
+ }
+
/* variable res target */
render_fb_bind( gpipeline.fb_main, 1 );
glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff