X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=common.h;h=0621e7caba99232342d78aec4bd628f8190bac2b;hb=343d594b37f42a94f220a5089c9db36da9da3ab4;hp=3d60978f2da5d64f23145acec6392f96a97041d0;hpb=0de25596501d8aba67b08c92bdab417d6947cd13;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/common.h b/common.h
index 3d60978..0621e7c 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,
@@ -136,8 +70,8 @@ VG_STATIC float
    k_grind_aligment        = 10.0f,
    k_grind_dampener        = 5.0f,
 
-   k_board_spring          = 100.0f,
-   k_board_dampener        = 40.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,
@@ -192,8 +126,8 @@ VG_STATIC void common_var_temp(void)
    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_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 );
@@ -205,7 +139,6 @@ VG_STATIC void common_var_temp(void)
    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 );
@@ -222,10 +155,7 @@ VG_STATIC void common_var_temp(void)
 
    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 );