X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=1c23b5845395c3dc62f5942059259e949cf7e441;hb=9d5997f1e611b66c7220f7eb388f427032d8da79;hp=37c90dc796326d06bedd9bdeead4cd25965b6107;hpb=fc1d543772607ab0643e54ebd2db9ec9dce614d1;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index 37c90dc..1c23b58 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -5,6 +5,8 @@
 
 #define SKATE_CCD
 
+typedef struct jump_info jump_info;
+
 struct player_skate
 {
    struct
@@ -12,6 +14,7 @@ struct player_skate
       enum skate_activity
       {
          k_skate_activity_air,
+         k_skate_activity_air_to_grind,
          k_skate_activity_ground,
          k_skate_activity_undefined,
          k_skate_activity_grind_any,
@@ -42,12 +45,9 @@ struct player_skate
       v3f   trick_vel,     /* measured in units of TAU/s */
             trick_euler;   /* measured in units of TAU */
       float trick_time;
+      float gravity_bias;
 
-      m3x3f velocity_bias,
-            velocity_bias_pstep;
-      v3f apex;
       v3f up_dir;
-
       v3f head_position;
 
       int lift_frames;
@@ -59,13 +59,21 @@ struct player_skate
       v2f grab_mouse_delta;
 
       int charging_jump, jump_dir;
-      float jump_charge;
-      double jump_time;
+      float jump_charge,
+            slap;
 
+      double jump_time;
       double start_push,
              cur_push;
 
       v3f prev_pos;
+
+      /* initial launch conditions */
+      double air_start;
+      v3f    air_init_v,
+             air_init_co;
+
+      v4f smoothed_rotation;
    }
    state,
    state_gate_storage;
@@ -88,10 +96,16 @@ struct player_skate
          blend_stand,
          blend_push,
          blend_jump,
-         blend_airdir;
+         blend_airdir,
+         blend_weight;
 
+   /* vectors representing the direction of the axels in localspace */
+   v3f truckv0[2];
    v2f wobble;
 
+   audio_channel *aud_main, *aud_slide, *aud_air;
+   enum mdl_surface_prop surface, audio_surface;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -100,11 +114,15 @@ struct player_skate
    float substep,
          substep_delta;
 
-   struct land_prediction
+   struct jump_info
    {
       v3f   log[50];
       v3f   n;
       v3f   apex;
+      v3f   v;
+
+      float gravity;
+
       int   log_length;
       float score,
             land_dist;
@@ -112,6 +130,7 @@ struct player_skate
       enum prediction_type
       {
          k_prediction_none,
+         k_prediction_unset,
          k_prediction_land,
          k_prediction_grind
       }
@@ -119,8 +138,9 @@ struct player_skate
 
       u32   colour;
    }
-   predictions[22];
-   u32 prediction_count;
+   possible_jumps[36];
+   u32 possible_jump_count;
+
    float land_dist;
    v3f land_normal;
 
@@ -129,6 +149,8 @@ struct player_skate
        grind_vec,
        grind_dir;
 
+   u32 grind_cooldown;
+
    float grind_strength;
 
    struct grind_limit
@@ -149,7 +171,7 @@ VG_STATIC void player__skate_animate      ( player_instance *player,
                                             player_animation *anim );
 VG_STATIC void player__skate_post_animate ( player_instance *player );
 VG_STATIC void player__skate_reset        ( player_instance *player,
-                                            struct respawn_point *rp );
+                                            ent_spawn *rp );
 
 VG_STATIC void player__skate_clear_mechanics( player_instance *player );
 VG_STATIC void player__skate_reset_animator( player_instance *player );