X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player.h;h=137a1ad056896fb33289b2f24a4aa2f408847bf4;hb=f38069d2c55cd4b3b4c76a4b72321dfa4dd30439;hp=85bca0a8258a5f13aa067d14d3de5fba4ad5fb3c;hpb=5a6199fecf8afcff4b4ef2d341a0dfd0e220420d;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player.h b/player.h
index 85bca0a..137a1ad 100644
--- a/player.h
+++ b/player.h
@@ -28,25 +28,24 @@ struct player_instance
    camera_mode;
    float camera_type_blend;
 
-#if 0
-   struct
-   {
-      v3f co, angles;
-   }
-   cam1, cam3;
-#endif
-
-   v3f follow_pos,
-       follow_angles,
-       follow_pos_target,
-       follow_angles_target,
-       override_pos,
-       override_angles,
-       fpv_pos,
-       fpv_angles;
 
-   float cam_position_override_strength,
-         cam_angles_override_strength;
+   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;
+
+   float cam_velocity_influence,
+         cam_velocity_coefficient,
+         cam_velocity_constant,
+         cam_velocity_coefficient_smooth,
+         cam_velocity_constant_smooth,
+         cam_velocity_influence_smooth,
+         cam_land_punch,
+         cam_land_punch_v;
 
    teleport_gate *gate_waiting;
 
@@ -78,6 +77,9 @@ struct player_instance
    struct player_ragdoll  ragdoll;
    vg_tex2d              *playertex;
 
+   player_pose            holdout_pose;
+   float                  holdout_time;
+
    /*
     * Subsystems
     * -------------------------------------------------