X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=2ae0485307b8f056e5dd51911c6d2d1ac2e64106;hb=0399d5a0a2e1818c3d4951f42abc1132f7e26421;hp=aba87e0da6600be41ad55d401e0c1ccad737f92d;hpb=02e009ae6e20938675277e9ce2f467e17b170cc7;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index aba87e0..2ae0485 100644
--- a/player.h
+++ b/player.h
@@ -1,6 +1,34 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "skaterift.h"
+
+enum player_subsystem{
+   k_player_subsystem_walk = 0,
+   k_player_subsystem_skate = 1,
+   k_player_subsystem_dead = 2,
+   k_player_subsystem_drive = 3
+};
+
+struct player_cam_controller {
+   enum camera_mode{
+      k_cam_firstperson = 1,
+      k_cam_thirdperson = 0
+   }
+   camera_mode;
+   f32 camera_type_blend;
+
+   v3f fpv_offset,         /* expressed relative to rigidbody */
+       tpv_offset,
+       tpv_offset_extra,
+       fpv_viewpoint,      /* expressed relative to neck bone inverse final*/
+       fpv_offset_smooth,
+       fpv_viewpoint_smooth,
+       tpv_offset_smooth,
+       tpv_lpf,
+       cam_velocity_smooth;
+};
+
 #include "player_ragdoll.h"
 #include "player_render.h"
 #include "player_model.h"
@@ -9,6 +37,7 @@
 #include "player_skate.h"
 #include "player_dead.h"
 #include "player_drive.h"
+#include "player_replay.h"
 
 #define PLAYER_REWIND_FRAMES 60*4
 #define RESET_MAX_TIME 45.0
@@ -17,11 +46,10 @@ static i32 k_cinema_fixed = 0;
 static f32 k_cinema       = 0.0f;
 static i32 k_invert_y     = 0;
 
-struct player_instance
-{
+struct player_instance{
    /* transform definition */
-   rigidbody rb, rb_gate_storage;
-   v3f angles, angles_storage;
+   rigidbody rb;
+   v3f angles;
 
    v4f   qbasis;
    m3x3f basis, invbasis, basis_gate;
@@ -32,27 +60,7 @@ struct player_instance
     * ---------------------------
     */
    camera cam;
-
-   enum camera_mode{
-      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 */
-       fpv_offset_smooth,
-       fpv_viewpoint_smooth,
-       tpv_offset_smooth,
-       tpv_lpf,
-       cam_velocity_smooth;
-
-   v3f cam_override_pos;
-   v3f cam_override_angles;
-   float cam_override_fov;
-   float cam_override_strength;
+   struct player_cam_controller cam_control;
    f32 cam_trackshake;
 
    float cam_velocity_influence,
@@ -63,7 +71,6 @@ struct player_instance
          cam_velocity_influence_smooth;
 
    v3f cam_land_punch, cam_land_punch_v;
-
    ent_gate *gate_waiting;
 
    int immobile;
@@ -82,38 +89,14 @@ 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;
+   struct board_pose      board_pose;
 
    /*
     * Subsystems
     * -------------------------------------------------
     */
 
-   enum player_subsystem{
-      k_player_subsystem_walk = 0,
-      k_player_subsystem_skate = 1,
-      k_player_subsystem_dead = 2,
-      k_player_subsystem_drive = 3
-   }
-   subsystem,
-   subsystem_gate;
+   enum player_subsystem subsystem; /* .. prev */
 
    struct player_skate  _skate;
    struct player_walk   _walk;
@@ -128,8 +111,7 @@ static localplayer;
  */
 
 VG_STATIC
-void (*_player_system_register[])(void) =
-{
+void (*_player_system_register[])(void) = {
    player__walk_register,
    player__skate_register,
    NULL,
@@ -137,8 +119,7 @@ void (*_player_system_register[])(void) =
 };
 
 VG_STATIC
-void (*_player_bind[])( player_instance *player ) =
-{
+void (*_player_bind[])( player_instance *player ) = {
    player__walk_bind,
    player__skate_bind,
    NULL,
@@ -146,8 +127,7 @@ void (*_player_bind[])( player_instance *player ) =
 };
 
 VG_STATIC
-void (*_player_reset[])( player_instance *player, ent_spawn *rp ) =
-{
+void (*_player_reset[])( player_instance *player, ent_spawn *rp ) = {
    player__walk_reset,
    player__skate_reset,
    NULL,
@@ -155,8 +135,7 @@ void (*_player_reset[])( player_instance *player, ent_spawn *rp ) =
 };
 
 VG_STATIC
-void (*_player_pre_update[])( player_instance *player ) = 
-{
+void (*_player_pre_update[])( player_instance *player ) = {
    player__walk_pre_update,
    player__skate_pre_update,
    NULL,
@@ -164,8 +143,7 @@ void (*_player_pre_update[])( player_instance *player ) =
 };
 
 VG_STATIC
-void( *_player_update[])( player_instance *player ) =
-{
+void( *_player_update[])( player_instance *player ) = {
    player__walk_update,
    player__skate_update,
    player__dead_update,
@@ -173,8 +151,7 @@ void( *_player_update[])( player_instance *player ) =
 };
 
 VG_STATIC 
-void( *_player_post_update[])( player_instance *player ) =
-{
+void( *_player_post_update[])( player_instance *player ) = {
    player__walk_post_update,
    player__skate_post_update,
    NULL,
@@ -182,8 +159,7 @@ void( *_player_post_update[])( player_instance *player ) =
 };
 
 VG_STATIC
-void( *_player_im_gui[])( player_instance *player ) =
-{
+void( *_player_im_gui[])( player_instance *player ) = {
    player__walk_im_gui,
    player__skate_im_gui,
    NULL,
@@ -191,8 +167,7 @@ void( *_player_im_gui[])( player_instance *player ) =
 };
 
 VG_STATIC
-void( *_player_animate[])( player_instance *player, player_animation *dest ) =
-{
+void( *_player_animate[])( player_instance *player, player_animation *dest ) = {
    player__walk_animate,
    player__skate_animate,
    player__dead_animate,
@@ -200,23 +175,13 @@ void( *_player_animate[])( player_instance *player, player_animation *dest ) =
 };
 
 VG_STATIC
-void( *_player_post_animate[])( player_instance *player ) =
-{
+void( *_player_post_animate[])( player_instance *player ) = {
    player__walk_post_animate,
    player__skate_post_animate,
    player__dead_post_animate,
    player__drive_post_animate
 };
 
-VG_STATIC
-void( *_player_restore[] )( player_instance *player ) =
-{
-   player__walk_restore,
-   player__skate_restore,
-   NULL,
-   NULL
-};
-
 PLAYER_API void player__debugtext( int size, const char *fmt, ... );
 PLAYER_API void player__create( player_instance *inst );
 PLAYER_API void player__use_avatar( player_instance *player, 
@@ -232,6 +197,7 @@ PLAYER_API void player__post_update( player_instance *player );
 
 PLAYER_API void player__pass_gate( player_instance *player, ent_gate *gate );
 PLAYER_API void player__im_gui( player_instance *player );
+PLAYER_API void player__setpos( player_instance *player, v3f pos );
 PLAYER_API void player__spawn( player_instance *player, ent_spawn *rp );
 PLAYER_API void player__kill( player_instance *player );