X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=0d2ee03f1a80cc7e060c6b2e2d9f3fec56341ff8;hb=0124cd309a7db70cdd74b5661f2df8b862ca2f2f;hp=8e4ae82b99d0ff547c8aa61d874359d395e9b7e9;hpb=5b06975b35952497d771db4171c7454123edfea1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 8e4ae82..0d2ee03 100644 --- a/player.h +++ b/player.h @@ -21,7 +21,6 @@ VG_STATIC float k_walkspeed = 12.0f, k_air_accelerate = 20.0f, - k_runspeed = 20.0f, k_board_radius = 0.3f, k_board_length = 0.45f, @@ -36,18 +35,32 @@ VG_STATIC float k_steer_air = 3.6f, k_steer_air_lerp = 0.3f, k_pump_force = 0.0f, - k_downforce = 8.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_walk_accel = 150.0f, - k_walk_friction = 8.0f; + k_walk_friction = 8.0f, + + 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.7f, + + k_spring_force = 15.0f, + k_spring_dampener = 5.0f; VG_STATIC int freecam = 0; VG_STATIC int walk_grid_iterations = 1; VG_STATIC float fc_speed = 10.0f; +VG_STATIC int cl_thirdperson = 0; /* * ----------------------------------------------------------------------------- @@ -72,6 +85,10 @@ VG_STATIC struct gplayer float grab, jump, pushing, push_time, rise; v2f grab_mouse_delta; + v3f throw_v; + v3f cog, + cog_v; + int lift_frames; double start_push; @@ -82,6 +99,10 @@ VG_STATIC struct gplayer phys, phys_gate_frame; + float normal_pressure; + v3f debug_mmcollect_lat, + debug_mmcollect_vert; + m4x3f visual_transform, inv_visual_transform; @@ -160,6 +181,9 @@ VG_STATIC struct gplayer frun, fgrind; + v3f board_offset; + v4f board_rotation; + float walk; int step_phase; enum mdl_surface_prop surface_prop; @@ -186,24 +210,38 @@ VG_STATIC struct gplayer id_ik_hand_r, id_ik_elbow_l, id_ik_elbow_r, - id_head; + id_head, + id_ik_foot_l, + id_ik_foot_r, + id_board; v3f cam_pos; struct ragdoll_part { u32 bone_id; - v3f offset; + //v3f offset; + + /* Collider transform relative to bone */ + m4x3f collider_mtx, + inv_collider_mtx; u32 use_limits; v3f limits[2]; rigidbody rb; u32 parent; + u32 colour; } ragdoll[32]; u32 ragdoll_count; + rb_constr_pos position_constraints[32]; + u32 position_constraints_count; + + rb_constr_swingtwist cone_constraints[32]; + u32 cone_constraints_count; + int shoes[2]; } mdl; @@ -240,6 +278,9 @@ VG_STATIC void player_mouseview(void); * Events * ----------------------------------------------------------------------------- */ +VG_STATIC int kill_player( int argc, char const *argv[] ); +VG_STATIC int reset_player( int argc, char const *argv[] ); +VG_STATIC void reset_player_poll( int argc, char const *argv[] ); VG_STATIC void player_init(void) /* 1 */ { @@ -307,59 +348,52 @@ VG_STATIC void player_init(void) /* 1 */ rb_init( &player.collide_front ); rb_init( &player.collide_back ); - vg_convar_push( (struct vg_convar){ - .name = "gwalk_speed", - .data = &k_walkspeed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 0 - }); - - vg_convar_push( (struct vg_convar){ - .name = "air_accelerate", - .data = &k_air_accelerate, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 0 - }); - - vg_convar_push( (struct vg_convar){ - .name = "run_speed", - .data = &k_runspeed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "walk_accel", - .data = &k_walk_accel, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "fc", - .data = &freecam, - .data_type = k_convar_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 1 - }); - - vg_convar_push( (struct vg_convar){ - .name = "fcs", - .data = &fc_speed, - .data_type = k_convar_dtype_f32, - .opt_f32 = { .clamp = 0 }, - .persistent = 1 - }); + VG_VAR_F32( k_walkspeed ); + VG_VAR_F32( k_air_accelerate ); + VG_VAR_F32( k_runspeed ); + VG_VAR_F32( k_walk_accel ); + + VG_VAR_I32( freecam ); + VG_VAR_I32( cl_thirdperson ); + VG_VAR_F32_PERSISTENT( fc_speed ); + + /* TODO: NOT PERSISTENT */ + VG_VAR_F32_PERSISTENT( k_ragdoll_limit_scale ); + VG_VAR_I32_PERSISTENT( k_ragdoll_div ); + VG_VAR_I32_PERSISTENT( k_ragdoll_debug_collider ); + VG_VAR_I32_PERSISTENT( k_ragdoll_debug_constraints ); + + VG_VAR_F32_PERSISTENT( k_friction_lat ); + + VG_VAR_F32_PERSISTENT( k_cog_spring ); + VG_VAR_F32_PERSISTENT( k_cog_damp ); + + VG_VAR_F32_PERSISTENT( k_cog_mass_ratio ); + VG_VAR_F32_PERSISTENT( k_downforce ); + + VG_VAR_F32_PERSISTENT( k_spring_force ); + VG_VAR_F32_PERSISTENT( k_spring_dampener ); + VG_VAR_F32_PERSISTENT( k_spring_angular ); + + VG_VAR_F32_PERSISTENT( k_mmthrow_scale ); + VG_VAR_F32_PERSISTENT( k_mmcollect_lat ); + VG_VAR_F32_PERSISTENT( k_mmcollect_vert ); + VG_VAR_F32_PERSISTENT( k_mmdecay ); vg_function_push( (struct vg_cmd){ .name = "reset", - .function = reset_player + .function = reset_player, + .poll_suggest = reset_player_poll }); + vg_function_push( (struct vg_cmd){ + .name = "kill", + .function = kill_player + }); + + /* HACK */ + rb_register_cvar(); + player.rewind_length = 0; player.rewind_buffer = vg_linear_alloc( vg_mem.rtmemory, @@ -467,11 +501,20 @@ VG_STATIC void player_update_pre(void) } + vg_line_pt3( phys->cog, 0.10f, 0xffffffff ); + vg_line_pt3( phys->cog, 0.09f, 0xffffffff ); + vg_line_pt3( phys->cog, 0.08f, 0xffffffff ); + vg_line( phys->cog, phys->rb.co, 0xff000000 ); - - - - + v3f spring_end; + v3f throw_end, p0, p1; + v3_muladds( phys->rb.co, phys->rb.up, 1.0f, spring_end ); + v3_muladds( spring_end, phys->throw_v, 1.0f, throw_end ); + v3_muladds( spring_end, player.debug_mmcollect_lat, 1.0f, p0 ); + v3_muladds( spring_end, player.debug_mmcollect_vert, 1.0f, p1 ); + vg_line( spring_end, throw_end, VG__RED ); + vg_line( spring_end, p0, VG__GREEN ); + vg_line( spring_end, p1, VG__BLUE ); if( player.rewinding ) return; @@ -614,7 +657,12 @@ VG_STATIC void player_update_post(void) player_animate(); if( !freecam ) - player_animate_camera(); + { + if( cl_thirdperson ) + player_animate_camera_thirdperson(); + else + player_animate_camera(); + } } if( freecam )