X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=11c66e9d203ccc2c4493613cf289664eae8328e2;hb=b1557496a922904b7abcd47d5a59a6da44d70fe8;hp=f0efcf8ac3df169f6d911648c110968620980cba;hpb=06e5d59a9b7fdd96a2e46f49be85089b43df75ae;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index f0efcf8..11c66e9 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -3,6 +3,8 @@
 
 #include "player_api.h"
 
+#define SKATE_CCD
+
 struct player_skate
 {
    struct
@@ -16,20 +18,30 @@ struct player_skate
       activity,
       activity_prev;
 
-      float steery,
+      float /* steery,
             steerx,
             steery_s,
-            steerx_s,
+            steerx_s, */
             reverse,
             slip;
 
+      int manual_direction;
+
+      /* tricks */
       v3f   flip_axis;
       float flip_time,
             flip_rate;
 
+      v3f   trick_vel,     /* measured in units of TAU/s */
+            trick_euler;   /* measured in units of TAU */
+      float trick_time;
+
       m3x3f velocity_bias,
             velocity_bias_pstep;
       v3f apex;
+      v3f up_dir;
+
+      v3f head_position;
 
       int lift_frames;
 
@@ -81,8 +93,9 @@ struct player_skate
                         *anim_push,  *anim_push_reverse,
                         *anim_ollie, *anim_ollie_reverse,
                         *anim_grabs, *anim_stop;
-   rb_sphere sphere_front, sphere_back;
-   v3f board_offset;
+   v3f board_offset,
+       board_trick_residualv,
+       board_trick_residuald;
    v4f board_rotation;
 
    float blend_slide,
@@ -94,6 +107,9 @@ struct player_skate
          blend_jump,
          blend_airdir;
 
+   float substep,
+         substep_delta;
+
    v2f wobble;
 
    float debug_normal_pressure;