X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.c;h=25e4b774b8528627704c656378330addb42ef0a2;hb=9eb3de757a997becb8406417a4bf613f4cb04900;hp=6c610aeda2114a73047a1d46984742405b4db70f;hpb=b8d9653b23cc9d09608e05f08020fb923b3305ac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.c b/player.c index 6c610ae..25e4b77 100644 --- a/player.c +++ b/player.c @@ -38,12 +38,19 @@ VG_STATIC void player_init(void) VG_VAR_F32( k_cam_damp ); VG_VAR_F32( k_cam_spring ); 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 ); + vg_console_reg_var( "invert_y", &k_invert_y, + k_var_dtype_i32, VG_VAR_PERSISTENT ); } PLAYER_API void player__debugtext( int size, const char *fmt, ... ) { -#if 0 char buffer[ 1024 ]; va_list args; @@ -51,9 +58,8 @@ void player__debugtext( int size, const char *fmt, ... ) 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; } /* @@ -72,12 +78,6 @@ void player__create( player_instance *inst ) 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 ); - } /* @@ -91,9 +91,10 @@ void player__use_avatar( player_instance *player, struct player_avatar *av ) } PLAYER_API -void player__use_model( player_instance *player, struct player_model *mdl ) -{ - player->playermodel = mdl; +void player__use_model( player_instance *player, u16 reg_id ){ + addon_cache_unwatch( k_addon_type_player, player->playermodel_view_slot ); + player->playermodel_view_slot = + addon_cache_create_viewer( k_addon_type_player, reg_id ); } PLAYER_API @@ -110,79 +111,25 @@ void player__bind( player_instance *player ) * ---------------------------------------------------------------------------- */ -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; - } - +void player__pre_update( player_instance *player ){ 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 ); + if( player->subsystem == k_player_subsystem_dead ){ + localplayer_cmd_respawn( 0, NULL ); } 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(); - } + /* cant do that */ + audio_lock(); + audio_oneshot( &audio_rewind[4], 1.0f, 0.0f ); + audio_unlock(); } } 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 ] ) @@ -190,32 +137,15 @@ void player__pre_update( player_instance *player ) } 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 ); - } - } } /* @@ -230,10 +160,10 @@ void player__pass_gate( player_instance *player, ent_gate *gate ) 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; @@ -243,16 +173,7 @@ void player__pass_gate( player_instance *player, ent_gate *gate ) 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; @@ -298,17 +219,22 @@ VG_STATIC void gate_rotate_angles( ent_gate *gate, v3f angles, v3f d ) 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; +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 + }; - struct ui_vert *b = ui_fill_rect( vg_uictx.cursor, 0x70000000 ); + ui_fill( box, (ui_colour(k_ui_bg)&0x00ffffff)|0x50000000 ); - vg_uictx.cursor[0] = vg.window_x; + g_player_debugger[0] = box[0]; + g_player_debugger[1] = 0; + g_player_debugger[2] = 300; + g_player_debugger[3] = 16; player__debugtext( 1, "angles: " PRINTF_v3f( player->cam.angles ) ); player__debugtext( 1, "basis: " PRINTF_v4f( player->qbasis ) ); @@ -316,17 +242,19 @@ PLAYER_API void player__im_gui( player_instance *player ) 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 + replay_debug_info( player ); } 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 ){ + player__setpos( player, rp->transform.co ); v3_zero( player->rb.w ); q_identity( player->rb.q ); rb_update_transform( &player->rb ); @@ -338,10 +266,6 @@ PLAYER_API void player__spawn( player_instance *player, 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(); @@ -351,8 +275,7 @@ PLAYER_API void player__spawn( player_instance *player, } -PLAYER_API void player__kill( player_instance *player ) -{ +PLAYER_API void player__kill( player_instance *player ){ } @@ -364,5 +287,6 @@ PLAYER_API void player__kill( player_instance *player ) #include "player_drive.c" #include "player_render.c" #include "player_ragdoll.c" +#include "player_replay.c" #endif /* PLAYER_C */