X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=common.h;h=a568d188fc73b6be5805a569d3d1811ddb6d191b;hb=fc1d543772607ab0643e54ebd2db9ec9dce614d1;hp=ff522676c82083b4b1de77a19333bebbe95d57af;hpb=23ef4d7f6bfe6a5a91c78822b081a9ea63cb74a6;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/common.h b/common.h
index ff52267..a568d18 100644
--- a/common.h
+++ b/common.h
@@ -99,8 +99,6 @@ VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
 
 VG_STATIC float 
    k_runspeed              = 20.0f,    /* depr */
-   k_board_radius          = 0.3f,
-   k_board_length          = 0.45f,
    k_board_allowance       = 0.04f,
    k_friction_lat          = 12.0f,
    k_friction_resistance   = 0.01f,
@@ -111,14 +109,15 @@ VG_STATIC float
    k_steer_air             = 3.6f,
    k_steer_air_lerp        = 0.3f,
    k_pump_force            = 0.0f,
-   k_downforce             = 5.0f,
+   k_downforce             = 0.0f,
+   k_escape_velocity       = 1.0f,
    k_walk_downforce        = 8.0f,
    k_jump_charge_speed     = (1.0f/1.0f),
    k_jump_force            = 5.0f,
    k_pitch_limit           = 1.5f,
    k_look_speed            = 2.0f,
 
-   k_spin_boost            = 2.2f,
+   k_spin_boost            = 4.20f,
 
    k_cog_spring            = 0.2f,
    k_cog_damp              = 0.02f,
@@ -130,19 +129,45 @@ VG_STATIC float
    k_mmdecay               = 12.0f,
    k_spring_angular        = 1.0f,
 
-   k_spring_force          = 15.0f,
-   k_spring_dampener       = 5.0f;
+   k_spring_force          = 300.0f,
+   k_spring_dampener       = 5.0f,
+
+   k_grind_spring          = 150.0f,
+   k_grind_aligment        = 10.0f,
+   k_grind_dampener        = 10.0f,
+
+   k_board_spring          = 100.0f,
+   k_board_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    = 3.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 */
 
 VG_STATIC float
    k_walkspeed             = 10.0f,
-   k_airspeed              = 2.0f,
+   k_airspeed              = 1.2f,
    k_stopspeed             = 4.0f,
    k_walk_accel            = 10.0f,
    k_walk_air_accel        = 7.0f,
    k_walk_friction         = 10.0f,
    k_walk_step_height      = 0.2f;
 
+VG_STATIC float
+   k_cam_punch             = -0.1f,
+   k_cam_spring            = 20.0f,
+   k_cam_damp              = 6.7f;
+
 VG_STATIC float k_ragdoll_floatyiness = 20.0f,
                 k_ragdoll_floatydrag  = 1.0f,
                 k_ragdoll_limit_scale = 1.0f;
@@ -160,6 +185,21 @@ VG_STATIC int cl_thirdperson = 0;
 
 VG_STATIC void common_var_temp(void)
 {
+   VG_VAR_F32( k_cam_punch );
+   VG_VAR_F32( k_cam_damp );
+   VG_VAR_F32( k_cam_spring );
+
+   VG_VAR_F32( k_grind_dampener );
+   VG_VAR_F32( k_grind_spring );
+   VG_VAR_F32( k_grind_aligment );
+   VG_VAR_F32( k_board_spring );
+   VG_VAR_F32( k_board_dampener );
+   VG_VAR_F32( k_board_interia );
+   VG_VAR_F32( k_grind_decayxy );
+   VG_VAR_F32( k_grind_axel_min_vel );
+   VG_VAR_F32( k_grind_axel_max_angle );
+   VG_VAR_F32( k_grind_max_friction );
+
    VG_VAR_F32( k_walkspeed );
    VG_VAR_F32( k_stopspeed );
    VG_VAR_F32( k_airspeed );
@@ -184,6 +224,7 @@ VG_STATIC void common_var_temp(void)
    VG_VAR_F32( k_cog_damp );
 
    VG_VAR_F32( k_cog_mass_ratio );
+   VG_VAR_F32( k_escape_velocity );
    VG_VAR_F32( k_downforce );
 
    VG_VAR_F32( k_spring_force );