X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=69be37e75411da8af5af97fbc3b3dccc6e8ef836;hb=eb203257efcfe324217de9e733cc6c1371b99de6;hp=c26e8459f08858b5b25d950fbf1281909a2852d1;hpb=0de25596501d8aba67b08c92bdab417d6947cd13;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index c26e845..69be37e 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,12 +14,12 @@ 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,
          k_skate_activity_grind_boardslide,
-         k_skate_activity_grind_noseslide,
-         k_skate_activity_grind_tailslide,
+         k_skate_activity_grind_metallic,
          k_skate_activity_grind_back50,
          k_skate_activity_grind_front50,
          k_skate_activity_grind_5050
@@ -25,11 +27,7 @@ struct player_skate
       activity,
       activity_prev;
 
-      float /* steery,
-            steerx,
-            steery_s,
-            steerx_s, */
-            reverse,
+      float reverse,
             slip;
 
       int manual_direction;
@@ -42,19 +40,11 @@ struct player_skate
       v3f   trick_vel,     /* measured in units of TAU/s */
             trick_euler;   /* measured in units of TAU */
       float trick_time;
-
-#if 0
-      m3x3f velocity_bias,
-            velocity_bias_pstep;
-      v3f apex;
-#endif
+      float gravity_bias;
 
       v3f up_dir;
-
       v3f head_position;
 
-      int lift_frames;
-
       v3f throw_v;
       v3f cog_v, cog;
 
@@ -62,7 +52,8 @@ struct player_skate
       v2f grab_mouse_delta;
 
       int charging_jump, jump_dir;
-      float jump_charge;
+      float jump_charge,
+            slap;
 
       double jump_time;
       double start_push,
@@ -74,14 +65,15 @@ struct player_skate
       double air_start;
       v3f    air_init_v,
              air_init_co;
+
+      v4f smoothed_rotation;
    }
    state,
    state_gate_storage;
 
-
-   /* animation */
+   /* animation /audio */
    struct skeleton_anim *anim_stand, *anim_highg, *anim_slide,
-                        *anim_air,
+                        *anim_air, *anim_grind, *anim_grind_jump,
                         *anim_push,  *anim_push_reverse,
                         *anim_ollie, *anim_ollie_reverse,
                         *anim_grabs, *anim_stop;
@@ -93,13 +85,36 @@ struct player_skate
          blend_z,
          blend_x,
          blend_fly,
+         blend_grind,
+         blend_grind_balance,
          blend_stand,
          blend_push,
          blend_jump,
-         blend_airdir;
+         blend_airdir,
+         blend_weight,
+         subslap;
 
+   /* 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;
+
+   int wheel_contacts[2];
+   float sample_change_cooldown;
+
+   enum {
+      k_skate_sample_concrete,
+      k_skate_sample_wood,
+      k_skate_sample_concrete_scrape_metal,
+      k_skate_sample_concrete_scrape_wood,
+      k_skate_sample_metal_scrape_generic
+   }
+   main_sample_type;
+
+   player_pose holdout;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -108,13 +123,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;
@@ -122,6 +139,7 @@ struct player_skate
       enum prediction_type
       {
          k_prediction_none,
+         k_prediction_unset,
          k_prediction_land,
          k_prediction_grind
       }
@@ -129,8 +147,9 @@ struct player_skate
 
       u32   colour;
    }
-   predictions[22];
-   u32 prediction_count;
+   possible_jumps[36];
+   u32 possible_jump_count;
+
    float land_dist;
    v3f land_normal;
 
@@ -139,7 +158,8 @@ struct player_skate
        grind_vec,
        grind_dir;
 
-   u32 frames_since_activity_change;
+   u32 grind_cooldown,
+       surface_cooldown;
 
    float grind_strength;
 
@@ -161,7 +181,8 @@ 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_restore( player_instance *player );
 
 VG_STATIC void player__skate_clear_mechanics( player_instance *player );
 VG_STATIC void player__skate_reset_animator( player_instance *player );