X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=53016cd68884f2a6c32a085d745f844c8ab4c44b;hb=72c40f1bc7a732f6a628dbf8a4135ac0bf3efa4e;hp=137a1ad056896fb33289b2f24a4aa2f408847bf4;hpb=b06394c241991d85211af98ed0a7f4d730fa13d4;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 137a1ad..53016cd 100644 --- a/player.h +++ b/player.h @@ -6,29 +6,34 @@ #include "player_common.h" #include "player_walk.h" #include "player_skate.h" -//#include "player_dead.h" +#include "player_dead.h" + +#define PLAYER_REWIND_FRAMES 60*4 struct player_instance { /* transform definition */ - rigidbody rb; - v3f angles; + rigidbody rb, rb_gate_storage; + v3f angles, angles_storage; + + v4f qbasis; + m3x3f basis, invbasis, basis_gate; + world_instance *viewable_world; /* * Camera management * --------------------------- */ - camera cam; /* output final camera */ + camera cam; enum camera_mode { - k_cam_firstperson = 0, - k_cam_thirdperson = 1 + k_cam_firstperson = 1, + k_cam_thirdperson = 0 } camera_mode; float camera_type_blend; - v3f fpv_offset, /* expressed relative to rigidbody */ tpv_offset, fpv_viewpoint, /* expressed relative to neck bone inverse final */ @@ -38,6 +43,10 @@ struct player_instance tpv_lpf, cam_velocity_smooth; + v3f cam_override_pos; + v2f cam_override_angles; + float cam_override_strength; + float cam_velocity_influence, cam_velocity_coefficient, cam_velocity_constant, @@ -47,7 +56,7 @@ struct player_instance cam_land_punch, cam_land_punch_v; - teleport_gate *gate_waiting; + ent_gate *gate_waiting; /* * Input @@ -59,6 +68,9 @@ struct player_instance *input_js2v, *input_jump, *input_push, + *input_trick0, + *input_trick1, + *input_trick2, *input_walk, *input_walkh, *input_walkv, @@ -80,6 +92,25 @@ struct player_instance player_pose holdout_pose; float holdout_time; + /* + * Rewind + * ---------------------------------------------------- + */ + int rewinding, rewind_sound_wait; + + struct rewind_frame{ + v3f pos; + v3f ang; + } + *rewind_buffer; + u32 rewind_length; + float rewind_accum; + ent_gate *rewind_gate; + + float rewind_total_length, rewind_predicted_time, + dist_accum; + double rewind_start, rewind_time; + /* * Subsystems * ------------------------------------------------- @@ -91,11 +122,12 @@ struct player_instance k_player_subsystem_skate = 1, k_player_subsystem_dead = 2 } - subsystem; + subsystem, + subsystem_gate; struct player_skate _skate; struct player_walk _walk; - //struct player_dead _dead; + struct player_dead _dead; }; /* @@ -112,9 +144,9 @@ void (*_player_bind[])( player_instance *player ) = }; VG_STATIC -void (*_player_reset[])( player_instance *player, struct respawn_point *rp ) = +void (*_player_reset[])( player_instance *player, ent_spawn *rp ) = { - NULL, + player__walk_reset, player__skate_reset, NULL }; @@ -132,7 +164,7 @@ void( *_player_update[])( player_instance *player ) = { player__walk_update, player__skate_update, - NULL + player__dead_update, }; VG_STATIC @@ -156,7 +188,7 @@ void( *_player_animate[])( player_instance *player, player_animation *dest ) = { player__walk_animate, player__skate_animate, - NULL + player__dead_animate }; VG_STATIC @@ -164,6 +196,14 @@ void( *_player_post_animate[])( player_instance *player ) = { player__walk_post_animate, player__skate_post_animate, + player__dead_post_animate +}; + +VG_STATIC +void( *_player_restore[] )( player_instance *player ) = +{ + player__walk_restore, + player__skate_restore, NULL }; @@ -173,7 +213,7 @@ void( *_player_post_animate[])( player_instance *player ) = #include "player_common.c" #include "player_walk.c" #include "player_skate.c" -//#include "player_dead.c" +#include "player_dead.c" #endif /* PLAYER_H */ @@ -394,68 +434,6 @@ VG_STATIC void reset_player_poll( int argc, char const *argv[] ); VG_STATIC void player_init(void) /* 1 */ { -#if 0 - player.input_js1h = vg_create_named_input( "steer-h", k_input_type_axis ); - player.input_js1v = vg_create_named_input( "steer-v", k_input_type_axis ); - player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm ); - player.input_js2h = vg_create_named_input( "grab-h", k_input_type_axis ); - player.input_js2v = vg_create_named_input( "grab-v", k_input_type_axis ); - player.input_jump = vg_create_named_input( "jump", k_input_type_button ); - player.input_push = vg_create_named_input( "push", k_input_type_button ); - player.input_walk = vg_create_named_input( "walk", k_input_type_button ); - - player.input_walkh = vg_create_named_input( "walk-h", - k_input_type_axis ); - player.input_walkv = vg_create_named_input( "walk-v", - k_input_type_axis ); - - - player.input_switch_mode = vg_create_named_input( "switch-mode", - k_input_type_button ); - player.input_reset = vg_create_named_input( "reset", k_input_type_button ); - - const char *default_cfg[] = - { - "bind steer-h gp-ls-h", - "bind -steer-h a", - "bind +steer-h d", - - "bind steer-v gp-ls-v", - "bind -steer-v w", - "bind +steer-v s", - - "bind grab gp-rt", - "bind +grab shift", - "bind grab-h gp-rs-h", - "bind grab-v gp-rs-v", - - "bind jump space", - "bind jump gp-a", - - "bind push gp-b", - "bind push w", - - "bind walk shift", - "bind walk gp-ls", - - "bind walk-h gp-ls-h", - "bind walk-v -gp-ls-v", - "bind +walk-h d", - "bind -walk-h a", - "bind +walk-v w", - "bind -walk-v s", - - "bind reset gp-lb", - "bind reset r", - - "bind switch-mode gp-y", - "bind switch-mode e", - }; - - for( int i=0; i