fix some errors

[carveJwlIkooP6JGAAIwe30JlM.git] / common.h

diff --git a/common.h b/common.h
index c0a5f3599187fa39904489082b25954c1f13d847..a8d0e868e9dfafa729a4c748f7e41e1ae1baabff 100644 (file)
--- a/common.h
+++ b/common.h
@@ -7,9 +7,25 @@
 
 #define VG_TIMESTEP_FIXED (1.0/60.0)
 #define VG_3D
+#define VG_GAME
+//#define VG_STATIC static
+#define VG_STATIC
 #define VG_FRAMEBUFFER_RESIZE 1
 #include "vg/vg.h"
-#include "anyascii/anyascii.h"
+#include "submodules/anyascii/impl/c/anyascii.c"
+
+#define RESET_MAX_TIME 45.0
+
+enum menu_controller_type
+{
+   k_menu_controller_type_keyboard,
+   k_menu_controller_type_xbox,
+   k_menu_controller_type_playstation,
+   k_menu_controller_type_steam,
+   k_menu_controller_type_steam_deck
+};
+
+VG_STATIC enum menu_controller_type menu_display_controller;
 
 typedef struct ray_hit ray_hit;
 struct ray_hit
@@ -19,9 +35,9 @@ struct ray_hit
    v3f pos, normal;
 };
 
-static int network_scores_updated = 0;
+VG_STATIC int network_scores_updated = 0;
 
-static u32 utf8_byte0_byte_count( u8 char0 )
+VG_STATIC u32 utf8_byte0_byte_count( u8 char0 )
 {
    for( u32 k=2; k<4; k++ )
    {
@@ -32,7 +48,7 @@ static u32 utf8_byte0_byte_count( u8 char0 )
    return 0;
 }
 
-static void str_utf8_collapse( const char *str, char *buf, u32 length )
+VG_STATIC void str_utf8_collapse( const char *str, char *buf, u32 length )
 {
    u8 *ustr = (u8 *)str;
    u32 utf32_code = 0x00000000;
@@ -80,4 +96,41 @@ static void str_utf8_collapse( const char *str, char *buf, u32 length )
    buf[j] = 0x00;
 }
 
+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,
+   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             = 5.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_cog_spring            = 0.2f,
+   k_cog_damp              = 0.02f,
+   k_cog_mass_ratio        = 0.9f,
+
+   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          = 15.0f,
+   k_spring_dampener       = 5.0f;
+
+
 #endif /* COMMON_H */