end of an era

[carveJwlIkooP6JGAAIwe30JlM.git] / player_skate.h

diff --git a/player_skate.h b/player_skate.h
index e3f639a7360c6ef7577c8093043d88c73ed786f5..915d2aa5a7750b7885df0eebe60f912c85695ba2 100644 (file)
--- a/player_skate.h
+++ b/player_skate.h
@@ -43,9 +43,12 @@ struct player_skate
             trick_euler;   /* measured in units of TAU */
       float trick_time;
 
+#if 0
       m3x3f velocity_bias,
             velocity_bias_pstep;
       v3f apex;
+#endif
+
       v3f up_dir;
 
       v3f head_position;
@@ -60,12 +63,17 @@ struct player_skate
 
       int charging_jump, jump_dir;
       float jump_charge;
-      double jump_time;
 
+      double jump_time;
       double start_push,
              cur_push;
 
       v3f prev_pos;
+
+      /* initial launch conditions */
+      double air_start;
+      v3f    air_init_v,
+             air_init_co;
    }
    state,
    state_gate_storage;
@@ -88,7 +96,8 @@ struct player_skate
          blend_stand,
          blend_push,
          blend_jump,
-         blend_airdir;
+         blend_airdir,
+         blend_weight;
 
    v2f wobble;
 
@@ -105,7 +114,9 @@ struct player_skate
       v3f   log[50];
       v3f   n;
       v3f   apex;
-      u32   log_length;
+      v3f   v;
+
+      int   log_length;
       float score,
             land_dist;
 
@@ -126,7 +137,10 @@ struct player_skate
 
    v3f surface_picture,
        weight_distribution,
-       grind_vec;
+       grind_vec,
+       grind_dir;
+
+   u32 frames_since_activity_change;
 
    float grind_strength;