X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player.h;h=c8c9abc54b8932ecd480838014a44001ca9c4dfb;hb=6294ef64d948eab2365e39a2645c9843aa96fba8;hp=3d42096d2f420296566a897ebe2f77e5d0079ede;hpb=5f4eb3866525724188461589485ac1aa50d08870;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 3d42096..c8c9abc 100644 --- a/player.h +++ b/player.h @@ -1,24 +1,26 @@ +/* + * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + */ + #ifndef PLAYER_H #define PLAYER_H +#define PLAYER_REWIND_FRAMES 60*4 + #include "audio.h" #include "common.h" #include "world.h" -//#include "character.h" -#include "player_model.h" +#include "skeleton.h" #include "bvh.h" -/* - * Constants - */ - -static float - k_walkspeed = 7.0f, /* no longer used */ - k_runspeed = 14.0f, +VG_STATIC float + k_walkspeed = 12.0f, /* no longer used */ + k_runspeed = 20.0f, k_board_radius = 0.3f, k_board_length = 0.45f, k_board_allowance = 0.04f, - k_friction_lat = 8.8f, + //k_friction_lat = 8.8f, + k_friction_lat = 12.0f, k_friction_resistance = 0.01f, k_max_push_speed = 16.0f, k_push_accel = 10.0f, @@ -28,58 +30,98 @@ static float 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_walk_accel = 5.0f, + k_walk_accel = 150.0f, k_walk_friction = 8.0f; -static int freecam = 0; -static int walk_grid_iterations = 1; -static float fc_speed = 10.0f; +VG_STATIC int cl_playermdl_id = 0; +VG_STATIC int freecam = 0; +VG_STATIC int walk_grid_iterations = 1; +VG_STATIC float fc_speed = 10.0f; + +/* + * ----------------------------------------------------------------------------- + * Memory + * ----------------------------------------------------------------------------- + */ -static struct gplayer +VG_STATIC struct gplayer { /* Physics */ - rigidbody rb, collide_front, collide_back, rb_gate_frame; + rigidbody collide_front, collide_back; - /* TODO: eugh */ - m3x3f gate_vr_frame, gate_vr_pstep_frame; + struct player_phys + { + rigidbody rb, rb_gate_frame; + float iY, siY; /* Yaw inertia */ - v3f a, v_last, m, bob, vl; + v3f a, v_last, m, bob, vl; - /* Utility */ - float vswitch, slip, slip_last, - reverse; + /* Utility */ + float vswitch, slip, slip_last, + reverse; - float iY; /* Yaw inertia */ - int in_air, is_dead, on_board; + float grab, jump, pushing, push_time; + double start_push; + int in_air, on_board, jump_charge, jump_dir; + + m3x3f vr,vr_pstep; + } + phys, + phys_gate_frame; + + m4x3f visual_transform, + inv_visual_transform; + + int is_dead, death_tick_allowance, rewinding; + int rewind_sound_wait; - v2f board_xy; - float grab; - float pitch; - float pushing, push_time; - float jump; - int jump_charge, jump_dir; - v3f land_target; v3f land_target_log[22]; u32 land_target_colours[22]; int land_log_count; - m3x3f vr,vr_pstep; - - struct character mdl; v3f handl_target, handr_target, handl, handr; + + /* Input */ + struct input_binding *input_js1h, + *input_js1v, + *input_js2h, + *input_js2v, + *input_emjs2h, + *input_emjs2v, + *input_jump, + *input_push, + *input_walkh, + *input_walkv, + *input_switch_mode, + *input_reset, + *input_grab; /* Camera */ float air_blend; + float air_time; v3f camera_pos, smooth_localcam; v2f angles; - m4x3f camera, camera_inverse; + + struct rewind_frame + { + v3f pos; + v2f ang; + } + *rewind_buffer; + u32 rewind_incrementer, + rewind_length; + + float rewind_time, rewind_total_length, rewind_predicted_time; + double diag_rewind_start, diag_rewind_time; + float dist_accum; /* animation */ double jump_time; @@ -91,1258 +133,572 @@ static struct gplayer fairdir, fsetup, walk_timer, - fonboard; + fjump, + fonboard, + frun; + + float walk; + int step_phase; + enum mdl_surface_prop surface_prop; + + /* player model */ + struct player_model + { + glmesh player_meshes[3]; + + mdl_context meta; + struct skeleton sk; + struct skeleton_anim *anim_stand, + *anim_highg, + *anim_slide, + *anim_air, + *anim_push, *anim_push_reverse, + *anim_ollie, *anim_ollie_reverse, + *anim_grabs, *anim_stop, + *anim_walk, *anim_run, *anim_idle, + *anim_jump; + + u32 id_hip, + id_ik_hand_l, + id_ik_hand_r, + id_ik_elbow_l, + id_ik_elbow_r, + id_head; + + v3f cam_pos; + + struct ragdoll_part + { + u32 bone_id; + v3f offset; + + u32 use_limits; + v3f limits[2]; + + rigidbody rb; + u32 parent; + } + ragdoll[32]; + u32 ragdoll_count; + + int shoes[2]; + } + mdl; } player = { - .on_board = 0, - .collide_front = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f }, .collide_back = { .type = k_rb_shape_sphere, .inf.sphere.radius = 0.3f } }; /* - * Player API + * API */ +VG_STATIC float *player_get_pos(void); +VG_STATIC void player_kill(void); +VG_STATIC float *player_cam_pos(void); +VG_STATIC void player_save_frame(void); +VG_STATIC void player_restore_frame(void); +VG_STATIC void player_save_rewind_frame(void); +/* + * Submodules + */ +VG_STATIC void player_mouseview(void); -/* - * Free camera movement +#include "player_physics.h" +#include "player_ragdoll.h" +#include "player_model.h" +#include "player_animation.h" +#include "player_audio.h" + +/* + * ----------------------------------------------------------------------------- + * Events + * ----------------------------------------------------------------------------- */ -static void player_mouseview(void) +VG_STATIC void player_init(void) /* 1 */ { - if( gui_want_mouse() ) - return; + player.input_js1h = vg_create_named_input( "steer-h", k_input_type_axis ); + player.input_js1v = vg_create_named_input( "steer-v", k_input_type_axis ); + player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm ); + player.input_js2h = vg_create_named_input( "grab-h", k_input_type_axis ); + player.input_js2v = vg_create_named_input( "grab-v", k_input_type_axis ); + player.input_emjs2h = vg_create_named_input( "kbgrab-h", k_input_type_axis ); + player.input_emjs2v = vg_create_named_input( "kbgrab-v", k_input_type_axis ); + player.input_jump = vg_create_named_input( "jump", k_input_type_button ); + player.input_push = vg_create_named_input( "push", k_input_type_axis_norm ); + + player.input_walkh = vg_create_named_input( "walk-h", + k_input_type_axis ); + player.input_walkv = vg_create_named_input( "walk-v", + k_input_type_axis ); + + + player.input_switch_mode = vg_create_named_input( "switch-mode", + k_input_type_button ); + player.input_reset = vg_create_named_input( "reset", k_input_type_button ); + + const char *default_cfg[] = + { + "bind steer-h gp-ls-h", + "bind -steer-h a", + "bind +steer-h d", + + "bind steer-v gp-ls-v", + "bind -steer-v w", + "bind +steer-v s", + + "bind grab gp-rt", + "bind grab-h gp-rs-h", + "bind grab-v gp-rs-v", + + "bind -kbgrab-h left", + "bind +kbgrab-h right", + "bind -kbgrab-v down", + "bind +kbgrab-v up", + + "bind jump space", + "bind jump gp-a", + + "bind push gp-lt", + "bind +push shift", + + "bind walk-h gp-ls-h", + "bind walk-v gp-ls-v", + "bind +walk-h d", + "bind -walk-h a", + "bind +walk-v w", + "bind -walk-v s", - static v2f mouse_last, - view_vel = { 0.0f, 0.0f }; + "bind reset gp-lb", + "bind reset r", - if( vg_get_button_down( "primary" ) ) - v2_copy( vg_mouse, mouse_last ); + "bind switch-mode gp-y", + "bind switch-mode e", + }; - else if( vg_get_button( "primary" ) ) - { - v2f delta; - v2_sub( vg_mouse, mouse_last, delta ); - v2_copy( vg_mouse, mouse_last ); + for( int i=0; iang ); + v3_copy( player.camera_pos, fr->pos ); - m3x3_mulv( vr, pv, pv ); - v3_muladds( pco, pv, pstep, pco ); + player.rewind_incrementer = 0; - for( int i=0; i<50; i++ ) + if( player.rewind_length > 1 ) { - v3_copy( pco, pco1 ); - apply_gravity( pv, pstep ); - - m3x3_mulv( vr, pv, pv ); - v3_muladds( pco, pv, pstep, pco ); - - ray_hit contact; - v3f vdir; - - v3_sub( pco, pco1, vdir ); - contact.dist = v3_length( vdir ); - v3_divs( vdir, contact.dist, vdir); - - if( ray_world( pco1, vdir, &contact )) - { - float land_delta = v3_dot( pv, contact.normal ); - u32 scolour = (u8)(vg_minf(-land_delta * 2.0f, 255.0f)); - - /* Bias prediction towords ramps */ - if( ray_hit_is_ramp( &contact ) ) - { - land_delta *= 0.1f; - scolour |= 0x0000a000; - } - - if( (land_delta < 0.0f) && (land_delta > best_velocity_delta) ) - { - best_velocity_delta = land_delta; - - v3_copy( contact.pos, player.land_target ); - - m3x3_copy( vr, player.vr_pstep ); - q_axis_angle( vr_q, axis, vmod*0.1f ); - q_m3x3( vr_q, player.vr ); - } - - v3_copy( contact.pos, - player.land_target_log[player.land_log_count] ); - player.land_target_colours[player.land_log_count] = - 0xff000000 | scolour; - - player.land_log_count ++; - - break; - } + player.rewind_total_length += + v3_dist( player.rewind_buffer[player.rewind_length-1].pos, + player.rewind_buffer[player.rewind_length-2].pos ); } } } -static void draw_cross(v3f pos,u32 colour, float scale) +/* + * Free camera movement + */ +VG_STATIC void player_mouseview(void) { - v3f p0, p1; - v3_add( (v3f){ scale,0.0f,0.0f}, pos, p0 ); - v3_add( (v3f){-scale,0.0f,0.0f}, pos, p1 ); - vg_line( p0, p1, colour ); - v3_add( (v3f){0.0f, scale,0.0f}, pos, p0 ); - v3_add( (v3f){0.0f,-scale,0.0f}, pos, p1 ); - vg_line( p0, p1, colour ); - v3_add( (v3f){0.0f,0.0f, scale}, pos, p0 ); - v3_add( (v3f){0.0f,0.0f,-scale}, pos, p1 ); - vg_line( p0, p1, colour ); + if( ui_want_mouse() ) + return; + + v2_muladds( player.angles, vg.mouse_delta, 0.0025f, player.angles ); + player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); } -static void player_physics_control(void) +/* Deal with input etc */ +VG_STATIC void player_update_pre(void) { - /* - * Computing localized friction forces for controlling the character - * Friction across X is significantly more than Z - */ - - v3f vel; - m3x3_mulv( player.rb.to_local, player.rb.v, vel ); - float slip = 0.0f; - - if( fabsf(vel[2]) > 0.01f ) - slip = fabsf(-vel[0] / vel[2]) * vg_signf(vel[0]); - - if( fabsf( slip ) > 1.2f ) - slip = vg_signf( slip ) * 1.2f; - player.slip = slip; - player.reverse = -vg_signf(vel[2]); + struct player_phys *phys = &player.phys; - float substep = ktimestep * 0.2f; - float fwd_resistance = (vg_get_button( "break" )? 5.0f: 0.02f) * -substep; - - for( int i=0; i<5; i++ ) + if( player.rewinding ) { - vel[2] = stable_force( vel[2], vg_signf( vel[2] ) * fwd_resistance ); - vel[0] = stable_force( vel[0], - vg_signf( vel[0] ) * -k_friction_lat*substep ); - } - - static double start_push = 0.0; - if( vg_get_button_down( "push" ) ) - start_push = vg_time; - - if( vg_get_button( "jump" ) ) - { - player.jump += ktimestep * k_jump_charge_speed; - - if( !player.jump_charge ) - player.jump_dir = player.reverse > 0.0f? 1: 0; - - player.jump_charge = 1; + return; } - if( !vg_get_button("break") && vg_get_button( "push" ) ) + if( vg_input_button_down( player.input_reset ) ) { - player.pushing = 1.0f; - player.push_time = vg_time-start_push; - - float cycle_time = player.push_time*k_push_cycle_rate, - amt = k_push_accel * (sinf(cycle_time)*0.5f+0.5f)*ktimestep, - current = v3_length( vel ), - new_vel = vg_minf( current + amt, k_max_push_speed ); - - new_vel -= vg_minf(current, k_max_push_speed); - vel[2] -= new_vel * player.reverse; - } - - /* Pumping */ - static float previous = 0.0f; - float delta = previous - player.grab, - pump = delta * k_pump_force*ktimestep; - previous = player.grab; - - v3f p1; - v3_muladds( player.rb.co, player.rb.up, pump, p1 ); - vg_line( player.rb.co, p1, 0xff0000ff ); - - vel[1] += pump; - - - m3x3_mulv( player.rb.to_world, vel, player.rb.v ); - - float steer = vg_get_axis( "horizontal" ); - player.iY -= vg_signf(steer)*powf(steer,2.0f) * k_steer_ground * ktimestep; - - v2_lerp( player.board_xy, (v2f){ slip*0.25f, 0.0f }, - ktimestep*5.0f, player.board_xy); -} - -static void player_physics_control_air(void) -{ - m3x3_mulv( player.vr, player.rb.v, player.rb.v ); - draw_cross( player.land_target, 0xff0000ff, 0.25f ); - - ray_hit hit; - - /* - * Prediction - */ - float pstep = ktimestep*10.0f; - - v3f pco, pco1, pv; - v3_copy( player.rb.co, pco ); - v3_copy( player.rb.v, pv ); - - float time_to_impact = 0.0f; - float limiter = 1.0f; - - for( int i=0; i<50; i++ ) - { - v3_copy( pco, pco1 ); - m3x3_mulv( player.vr_pstep, pv, pv ); - apply_gravity( pv, pstep ); - v3_muladds( pco, pv, pstep, pco ); - - //vg_line( pco, pco1, i&0x1?0xff000000:0xffffffff ); - - ray_hit contact; - v3f vdir; - - v3_sub( pco, pco1, vdir ); - contact.dist = v3_length( vdir ); - v3_divs( vdir, contact.dist, vdir); - - float orig_dist = contact.dist; - if( ray_world( pco1, vdir, &contact )) + if( player.is_dead ) { - float angle = v3_dot( player.rb.up, contact.normal ); - v3f axis; - v3_cross( player.rb.up, contact.normal, axis ); - - time_to_impact += (contact.dist/orig_dist)*pstep; - limiter = vg_minf( 5.0f, time_to_impact )/5.0f; - limiter = 1.0f-limiter; - limiter *= limiter; - limiter = 1.0f-limiter; - - if( angle < 0.99f ) - { - v4f correction; - q_axis_angle( correction, axis, acosf(angle)*0.05f*(1.0f-limiter) ); - q_mul( correction, player.rb.q, player.rb.q ); - } - - draw_cross( contact.pos, 0xffff0000, 0.25f ); - break; + reset_player( 0, NULL ); + audio_lock(); + audio_play_oneshot( &audio_ui[0], 1.0f ); + audio_unlock(); } - time_to_impact += pstep; - } - - player.iY -= vg_get_axis( "horizontal" ) * k_steer_air * ktimestep; - { - float iX = vg_get_axis( "vertical" ) * - player.reverse * k_steer_air * limiter * ktimestep; - - static float siX = 0.0f; - siX = vg_lerpf( siX, iX, k_steer_air_lerp ); - - v4f rotate; - q_axis_angle( rotate, player.rb.right, siX ); - q_mul( rotate, player.rb.q, player.rb.q ); - } - - v2f target = {0.0f,0.0f}; - v2_muladds( target, (v2f){ vg_get_axis("h1"), vg_get_axis("v1") }, - player.grab, target ); - v2_lerp( player.board_xy, target, ktimestep*3.0f, player.board_xy ); -} - -static void player_init(void) -{ - rb_init( &player.collide_front ); - rb_init( &player.collide_back ); -} - -static void player_walk_physics(void) -{ - rigidbody *rbf = &player.collide_front, - *rbb = &player.collide_back; - - m3x3_copy( player.rb.to_world, player.collide_front.to_world ); - m3x3_copy( player.rb.to_world, player.collide_back.to_world ); - - float h0 = 0.3f, - h1 = 0.9f; - - m4x3_mulv( player.rb.to_world, (v3f){0.0f,h0,0.0f}, rbf->co ); - v3_copy( rbf->co, rbf->to_world[3] ); - m4x3_mulv( player.rb.to_world, (v3f){0.0f,h1,0.0f}, rbb->co ); - v3_copy( rbb->co, rbb->to_world[3] ); - - m4x3_invert_affine( rbf->to_world, rbf->to_local ); - m4x3_invert_affine( rbb->to_world, rbb->to_local ); - - rb_update_bounds( rbf ); - rb_update_bounds( rbb ); - - rb_debug( rbf, 0xff0000ff ); - rb_debug( rbb, 0xff0000ff ); - - rb_ct manifold[64]; - int len = 0; - - len += rb_sphere_scene( rbf, &world.rb_geo, manifold+len ); - len += rb_sphere_scene( rbb, &world.rb_geo, manifold+len ); - - rb_presolve_contacts( manifold, len ); - - for( int j=0; j<5; j++ ) - { - for( int i=0; in ); - vn += ct->bias; - - float temp = ct->norm_impulse; - ct->norm_impulse = vg_maxf( temp + vn, 0.0f ); - vn = ct->norm_impulse - temp; - - v3f impulse; - v3_muls( ct->n, vn, impulse ); + double delta = world.time - world.last_use; - v3_add( impulse, player.rb.v, player.rb.v ); - - /* friction */ - for( int j=0; j<2; j++ ) + if( (delta <= RESET_MAX_TIME) && (world.last_use != 0.0) ) { - float f = k_friction * ct->norm_impulse, - vt = v3_dot( player.rb.v, ct->t[j] ), - lambda = -vt; + player.rewinding = 1; + player.rewind_sound_wait = 1; + player.rewind_time = (float)player.rewind_length - 0.0001f; + player_save_rewind_frame(); + audio_lock(); + audio_play_oneshot( &audio_rewind[0], 1.0f ); + audio_unlock(); + + /* based on analytical testing. DONT CHANGE! + * + * time taken: y = (x^(4/5)) * 74.5 + * inverse : x = (2/149)^(4/5) * y^(4/5) + */ + + float constant = powf( 2.0f/149.0f, 4.0f/5.0f ), + curve = powf( player.rewind_total_length, 4.0f/5.0f ); - float temp = ct->tangent_impulse[j]; - ct->tangent_impulse[j] = vg_clampf( temp + lambda, -f, f ); - lambda = ct->tangent_impulse[j] - temp; + player.rewind_predicted_time = constant * curve; + player.diag_rewind_start = vg.time; + player.diag_rewind_time = player.rewind_time; - v3_muladds( player.rb.v, ct->t[j], lambda, player.rb.v ); - } - } - } - - v3_zero( player.rb.w ); - q_axis_angle( player.rb.q, (v3f){0.0f,1.0f,0.0f}, -player.angles[0] ); - - v3f forward_dir = { sinf(player.angles[0]),0.0f,-cosf(player.angles[0]) }; + player.is_dead = 0; + player.death_tick_allowance = 30; + player_restore_frame(); - v3f p1; - v3_muladds( player.rb.co, forward_dir, 2.0f, p1 ); - vg_line( player.rb.co, p1, 0xff0000ff ); - - float move_dead = 0.1f, - move = vg_get_axis("grabr")*0.5f + 0.5f - move_dead; - - if( move > 0.0f ) - { - float move_norm = move * (1.0f/(1.0f-move_dead)), - speed = vg_lerpf( 0.1f*k_runspeed, k_runspeed, move_norm ), - amt = k_walk_accel * ktimestep, - zvel = v3_dot( player.rb.v, forward_dir ), - new_vel = vg_minf( zvel + amt, speed ), - diff = new_vel - vg_minf( zvel, speed ); - - v3_muladds( player.rb.v, forward_dir, diff, player.rb.v ); - - /* TODO move */ - float walk_norm = (float)player.mdl.anim_walk->length / 30.0f, - run_norm = (float)player.mdl.anim_run->length / 30.0f; - - player.walk_timer += ktimestep * vg_lerpf( walk_norm,run_norm,move_norm ); - } - else - { - player.walk_timer = 0.0f; - } - - player.rb.v[0] *= 1.0f - (ktimestep*k_walk_friction); - player.rb.v[2] *= 1.0f - (ktimestep*k_walk_friction); -} - -static void player_physics(void) -{ - /* - * Update collision fronts - */ - - rigidbody *rbf = &player.collide_front, - *rbb = &player.collide_back; - - m3x3_copy( player.rb.to_world, player.collide_front.to_world ); - m3x3_copy( player.rb.to_world, player.collide_back.to_world ); - - player.air_blend = vg_lerpf( player.air_blend, player.in_air, 0.1f ); - float h = player.air_blend*0.2f; - - m4x3_mulv( player.rb.to_world, (v3f){0.0f,h,-k_board_length}, rbf->co ); - v3_copy( rbf->co, rbf->to_world[3] ); - m4x3_mulv( player.rb.to_world, (v3f){0.0f,h, k_board_length}, rbb->co ); - v3_copy( rbb->co, rbb->to_world[3] ); - - m4x3_invert_affine( rbf->to_world, rbf->to_local ); - m4x3_invert_affine( rbb->to_world, rbb->to_local ); - - rb_update_bounds( rbf ); - rb_update_bounds( rbb ); - - rb_debug( rbf, 0xff00ffff ); - rb_debug( rbb, 0xffffff00 ); - - rb_ct manifold[64]; - int len = 0; - - len += rb_sphere_scene( rbf, &world.rb_geo, manifold+len ); - len += rb_sphere_scene( rbb, &world.rb_geo, manifold+len ); + if( !phys->on_board ) + { + player.angles[0] = atan2f( -phys->rb.forward[2], + -phys->rb.forward[0] ); + } - rb_presolve_contacts( manifold, len ); - v3f surface_avg = {0.0f, 0.0f, 0.0f}; + player.mdl.shoes[0] = 1; + player.mdl.shoes[1] = 1; - if( !len ) - { - player_start_air(); - } - else - { - for( int i=0; i 0.5f ) - { - player_start_air(); - } - else - player.in_air = 0; - } - - for( int j=0; j<5; j++ ) - { - for( int i=0; ico, player.rb.co, delta ); - v3_cross( player.rb.w, delta, dv ); - v3_add( player.rb.v, dv, dv ); - - float vn = -v3_dot( dv, ct->n ); - vn += ct->bias; - - float temp = ct->norm_impulse; - ct->norm_impulse = vg_maxf( temp + vn, 0.0f ); - vn = ct->norm_impulse - temp; - - v3f impulse; - v3_muls( ct->n, vn, impulse ); - - if( fabsf(v3_dot( impulse, player.rb.forward )) > 10.0f || - fabsf(v3_dot( impulse, player.rb.up )) > 50.0f ) + else { - player.is_dead = 1; - character_ragdoll_copypose( &player.mdl, player.rb.v ); - return; + /* cant do that */ + audio_lock(); + audio_play_oneshot( &audio_rewind[4], 1.0f ); + audio_unlock(); } - - v3_add( impulse, player.rb.v, player.rb.v ); - v3_cross( delta, impulse, impulse ); - - /* - * W Impulses are limited to the Y and X axises, we don't really want - * roll angular velocities being included. - * - * Can also tweak the resistance of each axis here by scaling the wx,wy - * components. - */ - - float wy = v3_dot( player.rb.up, impulse ), - wx = v3_dot( player.rb.right, impulse )*1.5f; - - v3_muladds( player.rb.w, player.rb.up, wy, player.rb.w ); - v3_muladds( player.rb.w, player.rb.right, wx, player.rb.w ); } } - float grabt = vg_get_axis( "grabr" )*0.5f+0.5f; - player.grab = vg_lerpf( player.grab, grabt, 0.14f ); - player.pushing = 0.0f; - - if( !player.in_air ) + if( vg_input_button_down( player.input_switch_mode ) ) { - v3f axis; - float angle = v3_dot( player.rb.up, surface_avg ); - v3_cross( player.rb.up, surface_avg, axis ); + phys->on_board ^= 0x1; - //float cz = v3_dot( player.rb.forward, axis ); - //v3_muls( player.rb.forward, cz, axis ); - - if( angle < 0.999f ) + audio_lock(); + if( phys->on_board ) { - v4f correction; - q_axis_angle( correction, axis, acosf(angle)*0.3f ); - q_mul( correction, player.rb.q, player.rb.q ); + v3_muladds( phys->rb.v, phys->rb.forward, 0.2f, phys->rb.v ); + audio_play_oneshot( &audio_lands[6], 1.0f ); } - - v3_muladds( player.rb.v, player.rb.up, - -k_downforce*ktimestep, player.rb.v ); - - player_physics_control(); - - if( !player.jump_charge && player.jump > 0.2f ) + else { - v3f jumpdir; - - /* Launch more up if alignment is up else improve velocity */ - float aup = fabsf(v3_dot( (v3f){0.0f,1.0f,0.0f}, player.rb.up )), - mod = 0.5f, - dir = mod + aup*(1.0f-mod); - - v3_copy( player.rb.v, jumpdir ); - v3_normalize( jumpdir ); - v3_muls( jumpdir, 1.0f-dir, jumpdir ); - v3_muladds( jumpdir, player.rb.up, dir, jumpdir ); - v3_normalize( jumpdir ); - - float force = k_jump_force*player.jump; - v3_muladds( player.rb.v, jumpdir, force, player.rb.v ); - player.jump = 0.0f; - - player.jump_time = vg_time; + audio_play_oneshot( &audio_lands[5], 1.0f ); } - } - else - { - player_physics_control_air(); - } - - if( !player.jump_charge ) - { - player.jump -= k_jump_charge_speed * ktimestep; - } - player.jump_charge = 0; - player.jump = vg_clampf( player.jump, 0.0f, 1.0f ); -} - -static void player_do_motion(void) -{ - float horizontal = vg_get_axis("horizontal"), - vertical = vg_get_axis("vertical"); - - if( player.on_board ) - player_physics(); - else - player_walk_physics(); - - /* Integrate velocity */ - v3f prevco; - v3_copy( player.rb.co, prevco ); - - apply_gravity( player.rb.v, ktimestep ); - v3_muladds( player.rb.co, player.rb.v, ktimestep, player.rb.co ); - /* Real angular velocity integration */ - v3_lerp( player.rb.w, (v3f){0.0f,0.0f,0.0f}, 0.125f, player.rb.w ); - if( v3_length2( player.rb.w ) > 0.0f ) - { - v4f rotation; - v3f axis; - v3_copy( player.rb.w, axis ); - - float mag = v3_length( axis ); - v3_divs( axis, mag, axis ); - q_axis_angle( rotation, axis, mag*k_rb_delta ); - q_mul( rotation, player.rb.q, player.rb.q ); + audio_unlock(); } - /* Faux angular velocity */ - v4f rotate; - - static float siY = 0.0f; - float lerpq = player.in_air? 0.04f: 0.3f; - siY = vg_lerpf( siY, player.iY, lerpq ); - - q_axis_angle( rotate, player.rb.up, siY ); - q_mul( rotate, player.rb.q, player.rb.q ); - player.iY = 0.0f; - - /* - * Gate intersection, by tracing a line over the gate planes - */ - for( int i=0; igate; - - if( gate_intersect( gate, player.rb.co, prevco ) ) - { - m4x3_mulv( gate->transport, player.rb.co, player.rb.co ); - m3x3_mulv( gate->transport, player.rb.v, player.rb.v ); - m3x3_mulv( gate->transport, player.vl, player.vl ); - m3x3_mulv( gate->transport, player.v_last, player.v_last ); - m3x3_mulv( gate->transport, player.m, player.m ); - m3x3_mulv( gate->transport, player.bob, player.bob ); - - v4f transport_rotation; - m3x3_q( gate->transport, transport_rotation ); - q_mul( transport_rotation, player.rb.q, player.rb.q ); - - world_routes_activate_gate( i ); - player.rb_gate_frame = player.rb; - - m3x3_copy( player.vr, player.gate_vr_frame ); - m3x3_copy( player.vr_pstep, player.gate_vr_pstep_frame ); - break; - } - } - - rb_update_transform( &player.rb ); + if( !phys->on_board ) + player_mouseview(); } -/* - * Animation - */ - -static void player_animate_offboard(void) +VG_STATIC void player_update_fixed(void) /* 2 */ { - mdl_keyframe apose[32], bpose[32]; - struct skeleton *sk = &player.mdl.sk; - - float walk_norm = 30.0f/(float)player.mdl.anim_walk->length, - run_norm = 30.0f/(float)player.mdl.anim_run->length, - t = player.walk_timer, - l = vg_get_axis("grabr") * 0.5f + 0.5f; - - skeleton_sample_anim( sk, player.mdl.anim_walk, t*walk_norm, apose ); - skeleton_sample_anim( sk, player.mdl.anim_run, t*run_norm, bpose ); - - skeleton_lerp_pose( sk, apose, bpose, l, apose ); - - float idle_walk = vg_minf( l * 10.0f, 1.0f); - - skeleton_sample_anim( sk, player.mdl.anim_idle, vg_time*0.1f, bpose ); - skeleton_lerp_pose( sk, apose, bpose, 1.0f-idle_walk, apose ); - - skeleton_apply_pose( &player.mdl.sk, apose, k_anim_apply_defer_ik ); - skeleton_apply_ik_pass( &player.mdl.sk ); - skeleton_apply_pose( &player.mdl.sk, apose, k_anim_apply_deffered_only ); - - v3_copy( player.mdl.sk.final_mtx[player.mdl.id_head-1][3], - player.mdl.cam_pos ); - - skeleton_apply_inverses( &player.mdl.sk ); - - m4x3f mtx; - v4f rot; - q_axis_angle( rot, (v3f){0.0f,1.0f,0.0f}, -player.angles[0] - VG_PIf*0.5f ); - q_m3x3( rot, mtx ); - v3_copy( player.rb.to_world[3], mtx[3] ); - - skeleton_apply_transform( &player.mdl.sk, mtx ); - skeleton_debug( &player.mdl.sk ); -} - -static void player_animate(void) -{ - if( !player.on_board ) - { - player_animate_offboard(); + if( player.rewinding ) return; - } - - /* Camera position */ - v3_sub( player.rb.v, player.v_last, player.a ); - v3_copy( player.rb.v, player.v_last ); - - v3_add( player.m, player.a, player.m ); - v3_lerp( player.m, (v3f){0.0f,0.0f,0.0f}, 0.1f, player.m ); - - player.m[0] = vg_clampf( player.m[0], -2.0f, 2.0f ); - player.m[1] = vg_clampf( player.m[1], -2.0f, 2.0f ); - player.m[2] = vg_clampf( player.m[2], -2.0f, 2.0f ); - v3_lerp( player.bob, player.m, 0.2f, player.bob ); - - /* Head */ - float lslip = fabsf(player.slip); - - float kheight = 2.0f, - kleg = 0.6f; - - v3f offset; - v3_zero( offset ); - m3x3_mulv( player.rb.to_local, player.bob, offset ); - - static float speed_wobble = 0.0f, speed_wobble_2 = 0.0f; - - float kickspeed = vg_clampf(v3_length(player.rb.v)*(1.0f/40.0f), 0.0f, 1.0f); - float kicks = (vg_randf()-0.5f)*2.0f*kickspeed; - float sign = vg_signf( kicks ); - speed_wobble = vg_lerpf( speed_wobble, kicks*kicks*sign, 0.1f ); - speed_wobble_2 = vg_lerpf( speed_wobble_2, speed_wobble, 0.04f ); - - offset[0] *= 0.26f; - offset[0] += speed_wobble_2*3.0f; - - offset[1] *= -0.3f; - offset[2] *= 0.01f; - - offset[0] = vg_clampf( offset[0], -0.8f, 0.8f ); - offset[1] = vg_clampf( offset[1], -0.5f, 0.0f ); - offset[1] = 0.0f; - - /* - * Animation blending - * =========================================== - */ - - /* scalar blending information */ - float speed = v3_length( player.rb.v ); - - /* sliding */ - { - float desired = vg_clampf( lslip, 0.0f, 1.0f ); - player.fslide = vg_lerpf( player.fslide, desired, 0.04f ); - } - - /* movement information */ - { - float dirz = player.reverse > 0.0f? 0.0f: 1.0f, - dirx = player.slip < 0.0f? 0.0f: 1.0f, - fly = player.in_air? 1.0f: 0.0f; - - player.fdirz = vg_lerpf( player.fdirz, dirz, 0.04f ); - player.fdirx = vg_lerpf( player.fdirx, dirx, 0.01f ); - player.ffly = vg_lerpf( player.ffly, fly, 0.04f ); - } - - struct skeleton *sk = &player.mdl.sk; - - mdl_keyframe apose[32], bpose[32]; - mdl_keyframe ground_pose[32]; - { - /* when the player is moving fast he will crouch down a little bit */ - float stand = 1.0f - vg_clampf( speed * 0.03f, 0.0f, 1.0f ); - player.fstand = vg_lerpf( player.fstand, stand, 0.1f ); - - /* stand/crouch */ - float dir_frame = player.fdirz * (15.0f/30.0f), - stand_blend = offset[1]*-2.0f; - - skeleton_sample_anim( sk, player.mdl.anim_stand, dir_frame, apose ); - skeleton_sample_anim( sk, player.mdl.anim_highg, dir_frame, bpose ); - skeleton_lerp_pose( sk, apose, bpose, stand_blend, apose ); - - /* sliding */ - float slide_frame = player.fdirx * (15.0f/30.0f); - skeleton_sample_anim( sk, player.mdl.anim_slide, slide_frame, bpose ); - skeleton_lerp_pose( sk, apose, bpose, player.fslide, apose ); - - /* pushing */ - player.fpush = vg_lerpf( player.fpush, player.pushing, 0.1f ); - - float pt = player.push_time; - if( player.reverse > 0.0f ) - skeleton_sample_anim( sk, player.mdl.anim_push, pt, bpose ); - else - skeleton_sample_anim( sk, player.mdl.anim_push_reverse, pt, bpose ); - - skeleton_lerp_pose( sk, apose, bpose, player.fpush, apose ); - - /* trick setup */ - float jump_start_frame = 14.0f/30.0f; - float setup_frame = player.jump * jump_start_frame, - setup_blend = vg_minf( player.jump*5.0f, 1.0f ); - - float jump_frame = (vg_time - player.jump_time) + jump_start_frame; - if( jump_frame >= jump_start_frame && jump_frame <= (40.0f/30.0f) ) - setup_frame = jump_frame; - - struct skeleton_anim *jump_anim = player.jump_dir? - player.mdl.anim_ollie: - player.mdl.anim_ollie_reverse; - - skeleton_sample_anim_clamped( sk, jump_anim, setup_frame, bpose ); - skeleton_lerp_pose( sk, apose, bpose, setup_blend, ground_pose ); - } - - mdl_keyframe air_pose[32]; - { - float target = -vg_get_axis("horizontal"); - player.fairdir = vg_lerpf( player.fairdir, target, 0.04f ); - - float air_frame = (player.fairdir*0.5f+0.5f) * (15.0f/30.0f); - - skeleton_sample_anim( sk, player.mdl.anim_air, air_frame, apose ); - - static v2f grab_choice; - v2_lerp( grab_choice, (v2f){ vg_get_axis("h1"), vg_get_axis("v1") }, - 0.04f, grab_choice ); - - float ang = atan2f( grab_choice[0], grab_choice[1] ), - ang_unit = (ang+VG_PIf) * (1.0f/VG_TAUf), - grab_frame = ang_unit * (15.0f/30.0f); - - skeleton_sample_anim( sk, player.mdl.anim_grabs, grab_frame, bpose ); - skeleton_lerp_pose( sk, apose, bpose, player.grab, air_pose ); - } - - skeleton_lerp_pose( sk, ground_pose, air_pose, player.ffly, apose ); - - float add_grab_mod = player.ffly * player.grab; - - /* additive effects */ - apose[player.mdl.id_hip-1].co[0] += offset[0]*add_grab_mod; - apose[player.mdl.id_hip-1].co[2] += offset[2]*add_grab_mod; - apose[player.mdl.id_ik_hand_l-1].co[0] += offset[0]*add_grab_mod; - apose[player.mdl.id_ik_hand_l-1].co[2] += offset[2]*add_grab_mod; - apose[player.mdl.id_ik_hand_r-1].co[0] += offset[0]*add_grab_mod; - apose[player.mdl.id_ik_hand_r-1].co[2] += offset[2]*add_grab_mod; - apose[player.mdl.id_ik_elbow_l-1].co[0] += offset[0]*add_grab_mod; - apose[player.mdl.id_ik_elbow_l-1].co[2] += offset[2]*add_grab_mod; - apose[player.mdl.id_ik_elbow_r-1].co[0] += offset[0]*add_grab_mod; - apose[player.mdl.id_ik_elbow_r-1].co[2] += offset[2]*add_grab_mod; - - skeleton_apply_pose( &player.mdl.sk, apose, k_anim_apply_defer_ik ); - skeleton_apply_ik_pass( &player.mdl.sk ); - skeleton_apply_pose( &player.mdl.sk, apose, k_anim_apply_deffered_only ); - - v3_copy( player.mdl.sk.final_mtx[player.mdl.id_head-1][3], - player.mdl.cam_pos ); - skeleton_apply_inverses( &player.mdl.sk ); - skeleton_apply_transform( &player.mdl.sk, player.rb.to_world ); - - skeleton_debug( &player.mdl.sk ); -} - -static void player_camera_update(void) -{ - /* Update camera matrices */ - m4x3_identity( player.camera ); - m4x3_rotate_y( player.camera, -player.angles[0] ); - m4x3_rotate_x( player.camera, -player.angles[1] ); - v3_copy( player.camera_pos, player.camera[3] ); - m4x3_invert_affine( player.camera, player.camera_inverse ); -} - -static void player_animate_death_cam(void) -{ - v3f delta; - v3f head_pos; - v3_copy( player.mdl.ragdoll[0].rb.co, head_pos ); - - v3_sub( head_pos, player.camera_pos, delta ); - v3_normalize( delta ); - - v3f follow_pos; - v3_muladds( head_pos, delta, -2.5f, follow_pos ); - v3_lerp( player.camera_pos, follow_pos, 0.1f, player.camera_pos ); - - /* - * Make sure the camera stays above the ground - */ - v3f min_height = {0.0f,1.0f,0.0f}; - - v3f sample; - v3_add( player.camera_pos, min_height, sample ); - ray_hit hit; - hit.dist = min_height[1]*2.0f; - - if( ray_world( sample, (v3f){0.0f,-1.0f,0.0f}, &hit )) - v3_add( hit.pos, min_height, player.camera_pos ); - - player.camera_pos[1] = - vg_maxf( wrender.height + 2.0f, player.camera_pos[1] ); - - player.angles[0] = atan2f( delta[0], -delta[2] ); - player.angles[1] = -asinf( delta[1] ); -} -static void player_animate_camera(void) -{ - static v3f lerp_cam = {0.0f,0.0f,0.0f}; - v3f cam_pos; + if( player.death_tick_allowance ) + player.death_tick_allowance --; - player.fonboard = vg_lerpf(player.fonboard, player.on_board, ktimestep*1.0f); + struct player_phys *phys = &player.phys; - if( player.on_board ) + if( player.is_dead ) { - v3f offs = { -0.4f, 0.15f, 0.0f }; - v3_lerp( lerp_cam, player.mdl.cam_pos, 0.8f, lerp_cam ); - v3_add( lerp_cam, offs, cam_pos ); - - /* Look angles */ - v3_lerp( player.vl, player.rb.v, 0.05f, player.vl ); - - float yaw = atan2f( player.vl[0], -player.vl[2] ), - pitch = atan2f( -player.vl[1], - sqrtf( - player.vl[0]*player.vl[0] + player.vl[2]*player.vl[2] - )) * 0.7f; - - player.angles[0] = yaw; - player.angles[1] = vg_lerpf( player.angles[1], pitch + 0.30f, - player.fonboard ); - - /* Camera shake */ - static v2f shake_damp = {0.0f,0.0f}; - v2f shake = { vg_randf()-0.5f, vg_randf()-0.5f }; - v2_muls( shake, v3_length(player.rb.v)*0.3f - * (1.0f+fabsf(player.slip)), shake); - - v2_lerp( shake_damp, shake, 0.01f, shake_damp ); - shake_damp[0] *= 0.2f; - - v2_muladds( player.angles, shake_damp, 0.1f, player.angles ); - m4x3_mulv( player.rb.to_world, cam_pos, player.camera_pos ); + player_ragdoll_iter(); } else { - float speed = ktimestep * k_look_speed; - player.angles[0] += vg_get_axis( "horizontal" ) * speed; - player.angles[1] += vg_get_axis( "vertical" ) * speed; - - player.angles[1] = vg_clampf( player.angles[1], - -k_pitch_limit, k_pitch_limit ); - - float s = sinf(player.angles[0]) * 0.2f, - c = -cosf(player.angles[0]) * 0.2f; - v3f forward_dir = { s,0.15f,c }; + player.rewind_incrementer ++; - - m4x3f mtx; - v4f rot; - q_axis_angle( rot, (v3f){0.0f,1.0f,0.0f}, - -player.angles[0] -VG_PIf*0.5f ); - q_m3x3( rot, mtx ); - v3_copy( player.rb.to_world[3], mtx[3] ); - - m4x3_mulv( mtx, player.mdl.cam_pos, cam_pos ); - v3_add( cam_pos, forward_dir, player.camera_pos ); - v3_lerp( player.vl, player.rb.v, 0.3f, player.vl ); + if( player.rewind_incrementer > (u32)(0.25/VG_TIMESTEP_FIXED) ) + { + player_save_rewind_frame(); + } + + player_do_motion(); } } -/* - * Audio - */ -static void player_audio(void) +VG_STATIC void player_update_post(void) { - sfx_lock(); - - static float air = 0.0f; - air = vg_lerpf(air, player.in_air? 1.0f: 0.0f, 5.0f*ktimestep); - - /* Spacial info */ - v3f ears = { 1.0f,0.0f,0.0f }; - v3f delta; - - float *cam = player.camera[3], - *pos = player.rb.co; + for( int i=0; iname, argv[0] ) ) - { - rp = r; - break; - } + double taken = vg.time - player.diag_rewind_start; + vg_success( "Rewind took (rt, pl, tl): %f, %f, %f\n", + taken, player.diag_rewind_time, + player.rewind_total_length ); + + player.rewinding = 0; + player.rewind_length = 1; + player.rewind_total_length = 0.0f; + player.rewind_incrementer = 0; + world.sky_target_rate = 1.0; } - - if( !rp ) - vg_warn( "No spawn named '%s'\n", argv[0] ); - } - - if( !rp ) - { - float min_dist = INFINITY; - - for( int i=0; ico, player.rb.co ); - - vg_info( "Dist %s : %f\n", r->name, d ); - if( d < min_dist ) - { - min_dist = d; - rp = r; - } - } - } + world.sky_target_rate = -100.0; + assert( player.rewind_length > 0 ); - if( !rp ) - { - vg_error( "No spawn found\n" ); - if( !world.spawn_count ) - return 0; + v2f override_angles; + v3f override_pos; - rp = &world.spawns[0]; - } + float budget = vg.time_delta, + overall_length = player.rewind_length; - v4_copy( rp->q, player.rb.q ); - v3_copy( rp->co, player.rb.co ); + world_routes_rollback_time( player.rewind_time / overall_length ); - player.vswitch = 1.0f; - player.slip_last = 0.0f; - player.is_dead = 0; - player.in_air = 1; - m3x3_identity( player.vr ); + for( int i=0; (i<10)&&(player.rewind_time>0.0f)&&(budget>0.0f); i ++ ) + { + /* Interpolate frames */ + int i0 = floorf( player.rewind_time ), + i1 = VG_MIN( i0+1, player.rewind_length-1 ); + + struct rewind_frame *fr = &player.rewind_buffer[i0], + *fr1 = &player.rewind_buffer[i1]; - player.mdl.shoes[0] = 1; - player.mdl.shoes[1] = 1; - - rb_update_transform( &player.rb ); - m3x3_mulv( player.rb.to_world, (v3f){ 0.0f, 0.0f, -1.2f }, player.rb.v ); - m3x3_identity( player.gate_vr_frame ); - m3x3_identity( player.gate_vr_pstep_frame ); + float dist = vg_maxf( v3_dist( fr->pos, fr1->pos ), 0.001f ), + subl = vg_fractf( player.rewind_time ) + 0.001f, - player.rb_gate_frame = player.rb; - return 1; -} + sramp= 3.0f-(1.0f/(0.4f+0.4f*player.rewind_time)), + speed = sramp*28.0f + 0.5f*player.rewind_time, + mod = speed * (budget / dist), -static void player_update(void) -{ - for( int i=0; i0.0f) - { - player.rb = player.rb_gate_frame; - m3x3_copy( player.gate_vr_frame, player.vr ); - m3x3_copy( player.gate_vr_pstep_frame, player.vr_pstep ); - player.is_dead = 0; - player.in_air = 1; - m3x3_identity( player.vr ); + player.rewind_time = vg_maxf( 0.0f, player.rewind_time ); - player.mdl.shoes[0] = 1; - player.mdl.shoes[1] = 1; + float current_time = vg.time - player.diag_rewind_start, + remaining = player.rewind_predicted_time - current_time; - world_routes_notify_reset(); - } + if( player.rewind_sound_wait ) + { + if( player.rewind_predicted_time >= 6.5f ) + { + if( remaining <= 6.5f ) + { + audio_lock(); + audio_play_oneshot( &audio_rewind[3], 1.0f ); + audio_unlock(); + player.rewind_sound_wait = 0; + } + } + else if( player.rewind_predicted_time >= 2.5f ) + { + if( remaining <= 2.5f ) + { + audio_lock(); + audio_play_oneshot( &audio_rewind[2], 1.0f ); + audio_unlock(); + player.rewind_sound_wait = 0; + } + } + else if( player.rewind_predicted_time >= 1.5f ) + { + if( remaining <= 1.5f ) + { + audio_lock(); + audio_play_oneshot( &audio_rewind[1], 1.0f ); + audio_unlock(); + player.rewind_sound_wait = 0; + } + } - if( vg_get_button_down( "switchmode" ) ) - { - player.on_board ^= 0x1; - } - if( (glfwGetKey( vg_window, GLFW_KEY_O ) || (player.rb.co[1] < 0.0f)) && - !player.is_dead) - { - character_ragdoll_copypose( &player.mdl, player.rb.v ); - player.is_dead = 1; - } + } + + int i0 = floorf( player.rewind_time ), + i1 = VG_MIN( i0+1, player.rewind_length-1 ); + + struct rewind_frame *fr = &player.rewind_buffer[i0], + *fr1 = &player.rewind_buffer[i1]; + + float sub = vg_fractf(player.rewind_time); - if( player.is_dead ) - { - character_ragdoll_iter( &player.mdl ); - character_debug_ragdoll( &player.mdl ); + v3_lerp( fr->pos, fr1->pos, sub, override_pos ); + override_angles[0] = vg_alerpf( fr->ang[0], fr1->ang[0], sub ); + override_angles[1] = vg_lerpf ( fr->ang[1], fr1->ang[1], sub ); - if( !freecam ) - player_animate_death_cam(); - } - else - { - player_do_motion(); - player_animate(); + /* CAMERA POSITIONING: LAYER 1 */ + float blend = (4.0f-player.rewind_time) * 0.25f, + c = vg_clampf( blend, 0.0f, 1.0f ); - if( !freecam ) - player_animate_camera(); + camera_angles[0] = vg_alerpf(override_angles[0], player.angles[0], c); + camera_angles[1] = vg_lerpf (override_angles[1], player.angles[1], c); + v3_lerp( override_pos, player.camera_pos, c, camera_pos ); + } } - if( freecam ) - player_freecam(); - - player_camera_update(); + camera_update(); player_audio(); } -static void draw_player(void) +VG_STATIC void draw_player( m4x3f cam ) { if( player.is_dead ) - character_mimic_ragdoll( &player.mdl ); + player_model_copy_ragdoll(); shader_viewchar_use(); vg_tex2d_bind( &tex_characters, 0 ); shader_viewchar_uTexMain( 0 ); - shader_viewchar_uCamera( player.camera[3] ); - shader_viewchar_uPv( vg_pv ); + shader_viewchar_uCamera( cam[3] ); + shader_viewchar_uPv( vg.pv ); shader_link_standard_ub( _shader_viewchar.id, 2 ); glUniformMatrix4x3fv( _uniform_viewchar_uTransforms, player.mdl.sk.bone_count, 0, (float *)player.mdl.sk.final_mtx ); - mesh_bind( &player.mdl.mesh ); - mesh_draw( &player.mdl.mesh ); + mesh_bind( &player.mdl.player_meshes[cl_playermdl_id] ); + mesh_draw( &player.mdl.player_meshes[cl_playermdl_id] ); } +/* + * ----------------------------------------------------------------------------- + * API implementation + * ----------------------------------------------------------------------------- + */ + +VG_STATIC float *player_get_pos(void) +{ + return player.phys.rb.co; +} + +VG_STATIC void player_kill(void) +{ + if( player.death_tick_allowance == 0 ) + { + player.is_dead = 1; + player_ragdoll_copy_model( player.phys.rb.v ); + world_routes_clear(); + } +} + +VG_STATIC float *player_cam_pos(void) +{ + return player.camera_pos; +} + + #endif /* PLAYER_H */