X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.h;h=b529a4811cb31fb151fdc531abf3db2e4f76c7f0;hb=00d08b1e801d6b14fbfc07243271404cc7252e35;hp=9f21115eee71e0f4318873f47eb77f925571ef67;hpb=6e29d444f89478d5965fc652373272e5d70e84e4;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_skate.h b/player_skate.h
index 9f21115..b529a48 100644
--- a/player_skate.h
+++ b/player_skate.h
@@ -7,18 +7,16 @@
 
 typedef struct jump_info jump_info;
 
-struct player_skate
-{
-   struct
-   {
-      enum skate_activity
-      {
+struct player_skate{
+   struct player_skate_state{
+      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_metallic,
          k_skate_activity_grind_back50,
          k_skate_activity_grind_front50,
          k_skate_activity_grind_5050
@@ -26,11 +24,7 @@ struct player_skate
       activity,
       activity_prev;
 
-      float /* steery,
-            steerx,
-            steery_s,
-            steerx_s, */
-            reverse,
+      float reverse,
             slip;
 
       int manual_direction;
@@ -74,7 +68,6 @@ struct player_skate
    state,
    state_gate_storage;
 
-
    /* animation /audio */
    struct skeleton_anim *anim_stand, *anim_highg, *anim_slide,
                         *anim_air, *anim_grind, *anim_grind_jump,
@@ -95,7 +88,8 @@ struct player_skate
          blend_push,
          blend_jump,
          blend_airdir,
-         blend_weight;
+         blend_weight,
+         subslap;
 
    /* vectors representing the direction of the axels in localspace */
    v3f truckv0[2];
@@ -116,6 +110,8 @@ struct player_skate
    }
    main_sample_type;
 
+   player_pose holdout;
+
    /*
     * Physics 
     * ----------------------------------------------------
@@ -124,8 +120,7 @@ struct player_skate
    float substep,
          substep_delta;
 
-   struct jump_info
-   {
+   struct jump_info{
       v3f   log[50];
       v3f   n;
       v3f   apex;
@@ -137,8 +132,7 @@ struct player_skate
       float score,
             land_dist;
 
-      enum prediction_type
-      {
+      enum prediction_type{
          k_prediction_none,
          k_prediction_unset,
          k_prediction_land,
@@ -164,8 +158,7 @@ struct player_skate
 
    float grind_strength;
 
-   struct grind_limit
-   {
+   struct grind_limit{
       v3f ra, n;
       float p;
    }
@@ -173,6 +166,88 @@ struct player_skate
    u32 limit_count;
 };
 
+VG_STATIC float 
+   k_friction_lat          = 12.0f,
+   k_friction_resistance   = 0.01f,
+
+   k_max_push_speed        = 16.0f,
+   k_push_accel            = 10.0f,
+   k_push_cycle_rate       = 8.0f,
+
+   k_steer_ground          = 2.5f,
+   k_steer_air             = 3.6f,
+
+   k_jump_charge_speed     = (1.0f/0.4f),
+   k_jump_force            = 5.0f,
+
+   k_cog_spring            = 0.2f,
+   k_cog_damp              = 0.02f,
+   k_cog_mass_ratio        = 0.9f,
+
+   k_mmthrow_steer         = 1.0f,
+   k_mmthrow_scale         = 6.0f,
+   k_mmcollect_lat         = 2.0f,
+   k_mmcollect_vert        = 0.0f,
+   k_mmdecay               = 12.0f,
+   k_spring_angular        = 1.0f,
+
+   k_spring_force          = 300.0f,
+   k_spring_dampener       = 5.0f,
+
+   k_grind_spring          = 50.0f,
+   k_grind_aligment        = 10.0f,
+   k_grind_dampener        = 5.0f,
+
+   k_surface_spring        = 100.0f,
+   k_surface_dampener      = 40.0f,
+   k_manul_spring          = 200.0f,
+   k_manul_dampener        = 30.0f,
+   k_board_interia         = 8.0f,
+
+   k_grind_decayxy         = 30.0f,
+   k_grind_axel_min_vel    = 1.0f,
+   k_grind_axel_max_angle  = 0.95f, /* cosine(|a|) */
+   k_grind_axel_max_vangle = 0.4f,
+   k_grind_max_friction    = 3.0f,
+   k_grind_max_edge_angle  = 0.97f,
+
+   k_board_length          = 0.45f,
+   k_board_width           = 0.13f,
+   k_board_end_radius      = 0.1f,
+   k_board_radius          = 0.14f,    /* 0.07 */
+   
+   k_grind_balance         = -40.0f;
+
+VG_STATIC void player__skate_register(void)
+{
+   VG_VAR_F32( k_grind_dampener,       flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_spring,         flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_aligment,       flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_surface_spring,       flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_surface_dampener,     flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_board_interia,        flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_decayxy,        flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_axel_min_vel,   flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_axel_max_angle, flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_max_friction,   flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_grind_balance,        flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_friction_lat,         flags=VG_VAR_CHEAT );
+
+   VG_VAR_F32( k_cog_spring,           flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_cog_damp,             flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_cog_mass_ratio,       flags=VG_VAR_CHEAT );
+
+   VG_VAR_F32( k_spring_force,         flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_spring_dampener,      flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_spring_angular,       flags=VG_VAR_CHEAT );
+
+   VG_VAR_F32( k_mmthrow_scale,        flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_mmcollect_lat,        flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_mmcollect_vert,       flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_mmdecay,              flags=VG_VAR_CHEAT );
+   VG_VAR_F32( k_mmthrow_steer,        flags=VG_VAR_CHEAT );
+}
+
 VG_STATIC void player__skate_bind         ( player_instance *player );
 VG_STATIC void player__skate_pre_update   ( player_instance *player );
 VG_STATIC void player__skate_update       ( player_instance *player );
@@ -183,6 +258,7 @@ VG_STATIC void player__skate_animate      ( player_instance *player,
 VG_STATIC void player__skate_post_animate ( player_instance *player );
 VG_STATIC void player__skate_reset        ( player_instance *player,
                                             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 );