projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whoopsie
[carveJwlIkooP6JGAAIwe30JlM.git]
/
common.h
diff --git
a/common.h
b/common.h
index c1f325e232f5d9f57b2f41f6cd71fc85d13f88f2..9eda6f67ae0e59dfcf76c8fd39b0f26d46d7d8ae 100644
(file)
--- a/
common.h
+++ b/
common.h
@@
-47,7
+47,7
@@
VG_STATIC float
k_steer_ground = 2.5f,
k_steer_air = 3.6f,
k_steer_ground = 2.5f,
k_steer_air = 3.6f,
- k_jump_charge_speed = (1.0f/
1.0
f),
+ k_jump_charge_speed = (1.0f/
0.4
f),
k_jump_force = 5.0f,
k_pitch_limit = 1.5f,
k_jump_force = 5.0f,
k_pitch_limit = 1.5f,
@@
-77,7
+77,7
@@
VG_STATIC float
k_board_interia = 8.0f,
k_grind_decayxy = 30.0f,
k_board_interia = 8.0f,
k_grind_decayxy = 30.0f,
- k_grind_axel_min_vel =
3
.0f,
+ k_grind_axel_min_vel =
1
.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_axel_max_angle = 0.95f, /* cosine(|a|) */
k_grind_axel_max_vangle = 0.4f,
k_grind_max_friction = 3.0f,
@@
-86,7
+86,9
@@
VG_STATIC float
k_board_length = 0.45f,
k_board_width = 0.13f,
k_board_end_radius = 0.1f,
k_board_length = 0.45f,
k_board_width = 0.13f,
k_board_end_radius = 0.1f,
- k_board_radius = 0.14f; /* 0.07 */
+ k_board_radius = 0.14f, /* 0.07 */
+
+ k_grind_balance = -40.0f;
VG_STATIC float
k_walkspeed = 10.0f,
VG_STATIC float
k_walkspeed = 10.0f,
@@
-114,7
+116,9
@@
VG_STATIC int k_ragdoll_div = 1,
k_ragdoll_debug_collider = 1,
k_ragdoll_debug_constraints = 0;
k_ragdoll_debug_collider = 1,
k_ragdoll_debug_constraints = 0;
-VG_STATIC int k_debug_light_index = 1;
+VG_STATIC int k_debug_light_indices = 0,
+ k_debug_light_complexity = 0,
+ k_light_preview = 0;
VG_STATIC int freecam = 0;
VG_STATIC int walk_grid_iterations = 1;
VG_STATIC int freecam = 0;
VG_STATIC int walk_grid_iterations = 1;
@@
-139,6
+143,7
@@
VG_STATIC void common_var_temp(void)
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_grind_axel_min_vel );
VG_VAR_F32( k_grind_axel_max_angle );
VG_VAR_F32( k_grind_max_friction );
+ VG_VAR_F32( k_grind_balance );
VG_VAR_F32( k_walkspeed );
VG_VAR_F32( k_stopspeed );
VG_VAR_F32( k_walkspeed );
VG_VAR_F32( k_stopspeed );
@@
-151,11
+156,13
@@
VG_STATIC void common_var_temp(void)
VG_VAR_I32( cl_thirdperson );
VG_VAR_F32_PERSISTENT( fc_speed );
VG_VAR_I32( cl_thirdperson );
VG_VAR_F32_PERSISTENT( fc_speed );
- /* TODO: NOT PERSISTENT */
VG_VAR_F32( k_ragdoll_limit_scale );
VG_VAR_I32( k_ragdoll_div );
VG_VAR_I32( k_ragdoll_debug_collider );
VG_VAR_I32( k_ragdoll_debug_constraints );
VG_VAR_F32( k_ragdoll_limit_scale );
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_I32( k_light_preview );
VG_VAR_F32( k_friction_lat );
VG_VAR_F32( k_friction_lat );