even more collision filtering

[carveJwlIkooP6JGAAIwe30JlM.git] / common.h

diff --git a/common.h b/common.h
index 0abe4469fd27b97d2107de2ee54834f289b3d9a6..2e254f9d22adb6849840618bf706aa1ffbc86696 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_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;
+VG_STATIC float g_fov_option = 0.86f;
 
 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,14 +48,8 @@ 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 )
 {
-   if( length == 0 )
-   {
-      strncpy( buf, "User", length );
-      return;
-   }
-
    u8 *ustr = (u8 *)str;
    u32 utf32_code = 0x00000000;
    u32 i=0, j=0, utf32_byte_ct=0;