#include "input.h"
#include "world.h"
#include "audio.h"
+#include "player_replay.h"
VG_STATIC int localplayer_cmd_respawn( int argc, const char *argv[] )
{
VG_VAR_F32( k_cam_punch );
VG_VAR_F32( k_cam_shake_strength );
VG_VAR_F32( k_cam_shake_trackspeed );
+ VG_VAR_I32( k_player_debug_info, flags=VG_VAR_PERSISTENT );
vg_console_reg_var( "cinema", &k_cinema, k_var_dtype_f32, 0 );
vg_console_reg_var( "cinema_fixed", &k_cinema_fixed, k_var_dtype_i32, 0 );
PLAYER_API
void player__debugtext( int size, const char *fmt, ... )
{
-#if 0
char buffer[ 1024 ];
va_list args;
vsnprintf( buffer, 1024, fmt, args );
va_end( args );
- ui_text( vg_uictx.cursor, buffer, size, k_text_align_right );
- vg_uictx.cursor[1] += 14*size;
-#endif
+ ui_text( g_player_debugger, buffer, size, k_ui_align_left, 0 );
+ g_player_debugger[1] += size*16;
}
/*
q_identity( inst->rb.q );
m4x3_identity( inst->rb.to_world );
m4x3_identity( inst->rb.to_local );
-
- inst->rewind_length = 0;
- inst->rewind_buffer =
- vg_linear_alloc( vg_mem.rtmemory,
- sizeof(struct rewind_frame) * PLAYER_REWIND_FRAMES );
-
}
/*
* ----------------------------------------------------------------------------
*/
-VG_STATIC void player_save_rewind_frame( player_instance *player )
-{
- if( player->rewind_length < PLAYER_REWIND_FRAMES ){
- struct rewind_frame *fr =
- &player->rewind_buffer[ player->rewind_length ++ ];
-
- v2_copy( player->cam.angles, fr->ang );
- v3_copy( player->cam.pos, fr->pos );
-
- if( player->rewind_length >= 2 ){
- player->rewind_total_length +=
- v3_dist( player->rewind_buffer[player->rewind_length-1].pos,
- player->rewind_buffer[player->rewind_length-2].pos );
- }
- }
-}
-
PLAYER_API
-void player__pre_update( player_instance *player )
-{
- if( player->rewinding ){
- return;
- }
-
- if( button_down( k_srbind_reset ) && !player->immobile ){
- f64 delta = world_static.time - world_static.last_use;
-
- if( (delta <= RESET_MAX_TIME) && (world_static.last_use != 0.0) ){
- player->rewinding = 1;
- player->rewind_sound_wait = 1;
- player->rewind_time = (double)player->rewind_length - 0.0001;
- player_save_rewind_frame( player );
-
- audio_lock();
- audio_oneshot( &audio_rewind[0], 1.0f, 0.0f );
- audio_unlock();
-
- /* based on testing. DONT CHANGE!
- *
- * time taken: y = (x^(4/5)) * 74.5
- * inverse : x = (2/149)^(4/5) * y^(4/5)
- */
-
- float constant = powf( 2.0f/149.0f, 4.0f/5.0f ),
- curve = powf( player->rewind_total_length, 4.0f/5.0f );
-
- player->rewind_predicted_time = constant * curve;
- player->rewind_start = vg.time;
- player->subsystem = player->subsystem_gate;
- player->rb = player->rb_gate_storage;
- v3_copy( player->angles_storage, player->angles );
-
- if( _player_restore[ player->subsystem ] )
- _player_restore[ player->subsystem ]( player );
- }
- else{
- if( player->subsystem == k_player_subsystem_dead ){
- localplayer_cmd_respawn( 0, NULL );
- }
- else{
- /* cant do that */
- audio_lock();
- audio_oneshot( &audio_rewind[4], 1.0f, 0.0f );
- audio_unlock();
- }
- }
- }
-
+void player__pre_update( player_instance *player ){
if( button_down( k_srbind_camera ) && !player->immobile ){
- if( player->camera_mode == k_cam_firstperson )
- player->camera_mode = k_cam_thirdperson;
+ if( player->cam_control.camera_mode == k_cam_firstperson )
+ player->cam_control.camera_mode = k_cam_thirdperson;
else
- player->camera_mode = k_cam_firstperson;
+ player->cam_control.camera_mode = k_cam_firstperson;
}
if( _player_pre_update[ player->subsystem ] )
}
PLAYER_API
-void player__update( player_instance *player )
-{
- if( player->rewinding )
- return;
-
+void player__update( player_instance *player ){
if( _player_update[ player->subsystem ] )
_player_update[ player->subsystem ]( player );
}
PLAYER_API
-void player__post_update( player_instance *player )
-{
- if( player->rewinding )
- return;
-
+void player__post_update( player_instance *player ){
if( _player_post_update[ player->subsystem ] )
_player_post_update[ player->subsystem ]( player );
-
- if((player->subsystem != k_player_subsystem_dead) && !player->gate_waiting){
- player->rewind_accum += vg.time_frame_delta;
-
- if( player->rewind_accum > 0.25f ){
- player->rewind_accum -= 0.25f;
- player_save_rewind_frame( player );
- }
- }
}
/*
player->gate_waiting = gate;
world_routes_activate_entry_gate( world_current_instance(), gate );
- m4x3_mulv( gate->transport, player->tpv_lpf, player->tpv_lpf );
- m3x3_mulv( gate->transport, player->cam_velocity_smooth,
- player->cam_velocity_smooth );
-
+ struct player_cam_controller *cc = &player->cam_control;
+ m4x3_mulv( gate->transport, cc->tpv_lpf, cc->tpv_lpf );
+ m3x3_mulv( gate->transport, cc->cam_velocity_smooth,
+ cc->cam_velocity_smooth );
m3x3_copy( player->basis, player->basis_gate );
v4f q;
q_m3x3( player->qbasis, player->basis );
m3x3_transpose( player->basis, player->invbasis );
- player->subsystem_gate = player->subsystem;
- player->rb_gate_storage = player->rb;
- v3_copy( player->angles, player->angles_storage );
- player->rewind_length = 0;
- player->rewind_total_length = 0.0f;
- player->rewind_gate = gate;
- player->rewind_accum = 0.0f;
-
m4x3_mulv( gate->transport, player->cam.pos, player->cam.pos );
- player_save_rewind_frame( player );
-
- if( gate->type == k_gate_type_nonlocel )
- world_static.active_world = gate->target;
- world_volumes.inside = 0;
+ if( gate->flags & k_ent_gate_nonlocal )
+ world_set_active_instance( gate->target );
audio_lock();
audio_oneshot( &audio_gate_pass, 1.0f, 0.0f );
audio_unlock();
+
+ replay_clear( &skaterift.replay );
}
VG_STATIC void player_apply_transport_to_cam( m4x3f transport )
{
- /* FIXME: Applies to main_camera directly! */
+ /* FIXME: Applies to skaterift.cam directly! */
/* Pre-emptively edit the camera matrices so that the motion vectors
* are correct */
m4x4f transport_4;
m4x3_invert_affine( transport, transport_i );
m4x3_expand( transport_i, transport_4 );
- m4x4_mul( main_camera.mtx.pv, transport_4, main_camera.mtx.pv );
- m4x4_mul( main_camera.mtx.v, transport_4, main_camera.mtx.v );
+ m4x4_mul( skaterift.cam.mtx.pv, transport_4, skaterift.cam.mtx.pv );
+ m4x4_mul( skaterift.cam.mtx.v, transport_4, skaterift.cam.mtx.v );
/* we want the regular transform here no the inversion */
m4x3_expand( transport, transport_4 );
- m4x4_mul( gate_camera.mtx.pv, transport_4, gate_camera.mtx.pv );
- m4x4_mul( gate_camera.mtx.v, transport_4, gate_camera.mtx.v );
+ m4x4_mul( world_gates.cam.mtx.pv, transport_4, world_gates.cam.mtx.pv );
+ m4x4_mul( world_gates.cam.mtx.v, transport_4, world_gates.cam.mtx.v );
}
__attribute__ ((deprecated))
d[0] = atan2f( fwd_dir[2], fwd_dir[0] );
}
-PLAYER_API void player__im_gui( player_instance *player )
-{
-#if 0
- vg_uictx.cursor[0] = vg.window_x - 200;
- vg_uictx.cursor[1] = 0;
- vg_uictx.cursor[2] = 200;
- vg_uictx.cursor[3] = 200;
-
- struct ui_vert *b = ui_fill_rect( vg_uictx.cursor, 0x70000000 );
-
- vg_uictx.cursor[0] = vg.window_x;
-
+PLAYER_API void player__im_gui( player_instance *player ){
+ if( !k_player_debug_info ) return;
+
+ ui_rect box = {
+ vg.window_x - 300,
+ 0,
+ 300,
+ vg.window_y
+ };
+
+ ui_fill( box, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 );
+
+ g_player_debugger[0] = box[0];
+ g_player_debugger[1] = 0;
+ g_player_debugger[2] = 300;
+ g_player_debugger[3] = 32;
+
+ player__debugtext( 2, "instance #%u", world_static.active_instance );
+
+ char buf_hub[96],
+ buf_client[96];
+ if( world_static.addon_client )
+ addon_alias_uid( &world_static.addon_client->alias, buf_client );
+ else
+ strcpy( buf_client, "none" );
+
+ if( world_static.addon_hub )
+ addon_alias_uid( &world_static.addon_hub->alias, buf_hub );
+ else
+ strcpy( buf_hub, "none" );
+
+ player__debugtext( 1, "hub uid: %s", buf_hub );
+ player__debugtext( 1, "client uid: %s", buf_client );
+ player__debugtext( 2, "director" );
+ player__debugtext( 1, "activity: %s",
+ (const char *[]){ [k_skaterift_menu] = "menu",
+ [k_skaterift_replay] = "replay",
+ [k_skaterift_ent_focus] = "ent_focus",
+ [k_skaterift_default] = "default"
+ } [skaterift.activity] );
+ player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
+
+ player__debugtext( 2, "player_instance[%p]", player );
player__debugtext( 1, "angles: " PRINTF_v3f( player->cam.angles ) );
player__debugtext( 1, "basis: " PRINTF_v4f( player->qbasis ) );
if( _player_im_gui[ player->subsystem ] )
_player_im_gui[ player->subsystem ]( player );
- b[2].co[1] = vg_uictx.cursor[1];
- b[3].co[1] = vg_uictx.cursor[1];
-#endif
+ skaterift_replay_debug_info();
}
-VG_STATIC void global_skateshop_exit(void);
-PLAYER_API void player__spawn( player_instance *player,
- ent_spawn *rp )
-{
- v3_copy( rp->transform.co, player->rb.co );
+
+PLAYER_API void player__setpos( player_instance *player, v3f pos ){
+ v3_copy( pos, player->rb.co );
v3_zero( player->rb.v );
+ rb_update_transform( &player->rb );
+}
+
+PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp ){
+ replay_clear( &skaterift.replay );
+ player__setpos( player, rp->transform.co );
v3_zero( player->rb.w );
q_identity( player->rb.q );
rb_update_transform( &player->rb );
player->subsystem = k_player_subsystem_walk;
player->immobile = 0;
player->gate_waiting = NULL;
- player->rewind_length = 0;
- player->rewind_accum = 0.0f;
- player->rewind_gate = NULL;
- player->rewinding = 0;
world_static.last_use = 0.0;
-
- global_skateshop_exit();
+ world_static.focused_entity = 0;
+ world_static.challenge_target = NULL;
+ world_static.challenge_timer = 0.0f;
+ world_entity_unfocus();
if( _player_reset[ player->subsystem ] )
_player_reset[ player->subsystem ]( player, rp );
}
-PLAYER_API void player__kill( player_instance *player )
-{
+PLAYER_API void player__kill( player_instance *player ){
}
+PLAYER_API void player__begin_holdout( player_instance *player ){
+ memcpy( &player->holdout_pose, &player->pose, sizeof(player->pose) );
+ player->holdout_time = 1.0f;
+}
+
/* implementation */
#include "player_common.c"
#include "player_walk.c"
#include "player_drive.c"
#include "player_render.c"
#include "player_ragdoll.c"
+#include "player_replay.c"
#endif /* PLAYER_C */
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff