X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=common.h;h=74200096cc329ec697a63285c845994397e378be;hb=791f807111a1f740f745c67db642aa7a8bee56e8;hp=f9bcafa93a7c0fe34496c51365c6c48ba40609d0;hpb=b1557496a922904b7abcd47d5a59a6da44d70fe8;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/common.h b/common.h
index f9bcafa..7420009 100644
--- a/common.h
+++ b/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
 
 #ifndef COMMON_H
@@ -36,89 +36,23 @@ struct ray_hit
    v3f pos, normal;
 };
 
-VG_STATIC int network_scores_updated = 0;
-
-VG_STATIC u32 utf8_byte0_byte_count( u8 char0 )
-{
-   for( u32 k=2; k<4; k++ )
-   {
-      if( !(char0 & (0x80 >> k)) )
-         return k;
-   }
-
-   return 0;
-}
-
-VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
-{
-   u8 *ustr = (u8 *)str;
-   u32 utf32_code = 0x00000000;
-   u32 i=0, j=0, utf32_byte_ct=0;
-
-   for(;i < length-1;)
-   {
-      if( ustr[i] == 0x00 )
-         break;
-      
-      if( ustr[i] & 0x80 )
-      {
-         if( utf32_byte_ct )
-         {
-            utf32_byte_ct --;
-            utf32_code |= (ustr[i] & 0x3F) << (utf32_byte_ct*6);
-
-            if( !utf32_byte_ct )
-            {
-               const char *match;
-               size_t chars = anyascii( utf32_code, &match );
-
-               for( u32 k=0; k<VG_MIN(chars, length-1-j); k++ )
-               {
-                  buf[ j++ ] = (u8)match[k];
-               }
-            }
-         }
-         else
-         {
-            utf32_byte_ct = utf8_byte0_byte_count( ustr[i] )-1;
-            utf32_code = ustr[i] & (0x3F >> utf32_byte_ct);
-            utf32_code <<= utf32_byte_ct*6;
-         }
-      }
-      else
-      {
-         utf32_byte_ct = 0x00;
-         buf[j ++] = str[i];
-      }
-
-      i++;
-   }
-
-   buf[j] = 0x00;
-}
-
 VG_STATIC float 
-   k_runspeed              = 20.0f,    /* depr */
-   k_board_allowance       = 0.04f,
    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_steer_air_lerp        = 0.3f,
-   k_pump_force            = 0.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            = 4.20f,
-
    k_cog_spring            = 0.2f,
    k_cog_damp              = 0.02f,
    k_cog_mass_ratio        = 0.9f,
@@ -129,22 +63,30 @@ VG_STATIC float
    k_mmdecay               = 12.0f,
    k_spring_angular        = 1.0f,
 
-   k_spring_force          = 15.0f,
+   k_spring_force          = 300.0f,
    k_spring_dampener       = 5.0f,
 
-   k_grind_spring          = 100.0f,
-   k_grind_dampener        = 6.0f,
-   k_board_spring          = 100.0f,
-   k_board_dampener        = 40.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    = 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.07f;
-
+   k_board_radius          = 0.14f;    /* 0.07 */
 
 VG_STATIC float
    k_walkspeed             = 10.0f,
@@ -160,6 +102,9 @@ VG_STATIC float
    k_cam_spring            = 20.0f,
    k_cam_damp              = 6.7f;
 
+VG_STATIC float
+   k_day_length            = 30.0f; /* minutes */
+
 VG_STATIC float k_ragdoll_floatyiness = 20.0f,
                 k_ragdoll_floatydrag  = 1.0f,
                 k_ragdoll_limit_scale = 1.0f;
@@ -169,6 +114,8 @@ VG_STATIC int   k_ragdoll_div = 1,
                 k_ragdoll_debug_collider = 1,
                 k_ragdoll_debug_constraints = 0;
 
+VG_STATIC int   k_debug_light_indices = 0,
+                k_debug_light_complexity = 0;
 
 VG_STATIC int freecam = 0;
 VG_STATIC int walk_grid_iterations = 1;
@@ -177,22 +124,28 @@ VG_STATIC int cl_thirdperson = 0;
 
 VG_STATIC void common_var_temp(void)
 {
+   VG_VAR_F32( k_day_length );
+
    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_board_spring );
-   VG_VAR_F32( k_board_dampener );
+   VG_VAR_F32( k_grind_aligment );
+   VG_VAR_F32( k_surface_spring );
+   VG_VAR_F32( k_surface_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 );
    VG_VAR_F32( k_walk_friction );
    VG_VAR_F32( k_walk_air_accel );
-   VG_VAR_F32( k_runspeed );
    VG_VAR_F32( k_walk_accel );
 
    VG_VAR_I32( freecam );
@@ -204,15 +157,14 @@ VG_STATIC void common_var_temp(void)
    VG_VAR_I32( k_ragdoll_div );
    VG_VAR_I32( k_ragdoll_debug_collider );
    VG_VAR_I32( k_ragdoll_debug_constraints );
+   VG_VAR_I32( k_debug_light_indices );
+   VG_VAR_I32( k_debug_light_complexity );
 
    VG_VAR_F32( k_friction_lat );
 
    VG_VAR_F32( k_cog_spring );
    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 );
    VG_VAR_F32( k_spring_dampener );