X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=ef13865546431cb5d2af4047c698bff0b0555bdf;hb=1e62339d8fb24596eed19b75bde2ef452bd37938;hp=48d24bb6270c89f7eda120ba971cb374c57d40a7;hpb=02e009ae6e20938675277e9ce2f467e17b170cc7;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index 48d24bb..ef13865 100644 --- a/player_skate.c +++ b/player_skate.c @@ -262,7 +262,7 @@ too_many_samples: v3_copy( average_normal, inf->n ); v3_copy( average_direction, inf->dir ); - vg_line_pt3( inf->co, 0.02f, VG__GREEN ); + vg_line_point( inf->co, 0.02f, VG__GREEN ); vg_line_arrow( inf->co, average_direction, 0.3f, VG__GREEN ); vg_line_arrow( inf->co, inf->n, 0.2f, VG__CYAN ); @@ -714,7 +714,7 @@ VG_STATIC void skate_apply_air_model( player_instance *player ) q_mul( correction, player->rb.q, player->rb.q ); } -VG_STATIC int player_skate_trick_input( player_instance *player ); +VG_STATIC enum trick_type player_skate_trick_input( player_instance *player ); VG_STATIC void skate_apply_trick_model( player_instance *player ) { struct player_skate *s = &player->_skate; @@ -851,6 +851,10 @@ VG_STATIC void skate_apply_steering_model( player_instance *player ) rate = 35.0f; top = 1.5f; } + + if( grab < 0.5f ){ + top *= 1.0f+v3_length( s->state.throw_v )*k_mmthrow_steer; + } } float current = v3_dot( player->rb.to_world[1], player->rb.w ), @@ -978,7 +982,7 @@ VG_STATIC void skate_apply_jump_model( player_instance *player ) s->state.jump_time = vg.time; audio_lock(); - audio_oneshot_3d( &audio_jumps[vg_randu32()%2], player->rb.co, 40.0f, 1.0f ); + audio_oneshot_3d( &audio_jumps[vg_randu32()%2], player->rb.co,40.0f,1.0f); audio_unlock(); } } @@ -1104,7 +1108,7 @@ VG_STATIC void skate_copy_holdout( player_instance *player ) skeleton_copy_pose( sk, s->holdout, player->holdout_pose ); } -VG_STATIC int player_skate_trick_input( player_instance *player ) +VG_STATIC enum trick_type player_skate_trick_input( player_instance *player ) { return (button_press( k_srbind_trick0 ) ) | (button_press( k_srbind_trick1 ) << 1) | @@ -1130,24 +1134,25 @@ VG_STATIC void player__skate_pre_update( player_instance *player ) return; } - int trick_id; + enum trick_type trick = k_trick_type_none; if( (s->state.activity <= k_skate_activity_air_to_grind) && - (trick_id = player_skate_trick_input( player )) ) + (trick = player_skate_trick_input( player )) ) { if( (vg.time - s->state.jump_time) < 0.1f ){ v3_zero( s->state.trick_vel ); s->state.trick_time = 0.0f; - if( trick_id == 1 ){ + if( trick == k_trick_type_kickflip ){ s->state.trick_vel[0] = 3.0f; } - else if( trick_id == 2 ){ + else if( trick == k_trick_type_shuvit ){ s->state.trick_vel[2] = 3.0f; } - else if( trick_id == 3 ){ + else if( trick == k_trick_type_treflip ){ s->state.trick_vel[0] = 2.0f; s->state.trick_vel[2] = 2.0f; } + s->state.trick_type = trick; } } } @@ -1176,7 +1181,7 @@ VG_STATIC void player__skate_post_update( player_instance *player ) v3_add( jump->log[jump->log_length-1], jump->n, p1 ); vg_line( jump->log[jump->log_length-1], p1, 0xffffffff ); - vg_line_pt3( jump->apex, 0.02f, 0xffffffff ); + vg_line_point( jump->apex, 0.02f, 0xffffffff ); } audio_lock(); @@ -2343,8 +2348,7 @@ begin_collision:; s->substep -= s->substep_delta; rb_ct manifold[128]; - int manifold_len = 0; - + int manifold_len = 0; /* * Phase -1: head detection * -------------------------------------------------------------------------- @@ -2412,7 +2416,7 @@ begin_collision:; manifold_len += l; if( vg_lines.draw ) - debug_capsule( mtx, capsule.radius, capsule.height, VG__WHITE ); + vg_line_capsule( mtx, capsule.radius, capsule.height, VG__WHITE ); /* add limits */ if( s->state.activity >= k_skate_activity_grind_any ){ @@ -2434,7 +2438,7 @@ begin_collision:; v3f world_cog; m4x3_mulv( player->rb.to_world, s->weight_distribution, world_cog ); - vg_line_pt3( world_cog, 0.02f, VG__BLACK ); + vg_line_point( world_cog, 0.02f, VG__BLACK ); for( int i=0; isubstep_delta ); @@ -2555,13 +2559,13 @@ begin_collision:; m4x3f mtx; m3x3_copy( player->rb.to_world, mtx ); m4x3_mulv( player->rb.to_world, wheels[i].pos, mtx[3] ); - debug_sphere( mtx, wheels[i].radius, - (u32[]){ VG__WHITE, VG__BLACK, + vg_line_sphere( mtx, wheels[i].radius, + (u32[]){ VG__WHITE, VG__BLACK, wheels[i].colour }[ wheels[i].state ]); } skate_integrate( player ); - vg_line_pt3( s->state.cog, 0.02f, VG__WHITE ); + vg_line_point( s->state.cog, 0.02f, VG__WHITE ); ent_gate *gate = world_intersect_gates(world, player->rb.co, s->state.prev_pos ); @@ -2623,8 +2627,7 @@ begin_collision:; } } -VG_STATIC void player__skate_im_gui( player_instance *player ) -{ +VG_STATIC void player__skate_im_gui( player_instance *player ){ struct player_skate *s = &player->_skate; player__debugtext( 1, "V: %5.2f %5.2f %5.2f",player->rb.v[0], player->rb.v[1], @@ -2712,7 +2715,7 @@ VG_STATIC void player__skate_animate( player_instance *player, offset[0]=vg_clampf(offset[0],-0.8f,0.8f)*(1.0f-fabsf(s->blend_slide)*0.9f); offset[1]=vg_clampf(offset[1],-0.5f,0.0f); - v3_muls( offset, 0.3f, TEMP_TPV_EXTRA ); + v3_muls( offset, 0.3f, player->tpv_offset_extra ); /* * Animation blending @@ -3026,6 +3029,25 @@ VG_STATIC void player__skate_animate( player_instance *player, kf_board->co[1] += s->state.slap * s->subslap; kf_hip->co[1] += s->state.slap * 0.25f; + + f32 l = ((s->state.activity < k_skate_activity_ground) && + v3_length2(s->state.trick_vel) > 0.1f )? 1: 0; + s->blend_trick_foot = vg_lerpf( s->blend_trick_foot, l, + 8.4f*vg.time_delta ); + + if( s->state.trick_type == k_trick_type_kickflip ){ + kf_foot_l->co[0] += s->blend_trick_foot * 0.2f; + } + else if( s->state.trick_type == k_trick_type_shuvit ){ + kf_foot_l->co[0] += s->blend_trick_foot * 0.1f; + kf_foot_r->co[0] -= s->blend_trick_foot * 0.15f; + } + else if( s->state.trick_type == k_trick_type_treflip ){ + kf_foot_l->co[0] += s->blend_trick_foot * 0.2f; + kf_foot_r->co[0] -= s->blend_trick_foot * 0.15f; + } + + /* * animation wishlist: * boardslide/grind jump animations @@ -3034,8 +3056,7 @@ VG_STATIC void player__skate_animate( player_instance *player, */ /* truck rotation */ - for( int i=0; i<2; i++ ) - { + for( int i=0; i<2; i++ ){ float a = vg_minf( s->truckv0[i][0], 1.0f ); a = -acosf( a ) * vg_signf( s->truckv0[i][1] ); @@ -3128,8 +3149,6 @@ VG_STATIC void player__skate_post_animate( player_instance *player ) m4x3_mulv( av->sk.final_mtx[ av->id_head ], head, s->state.head_position ); m4x3_mulv( player->rb.to_local, s->state.head_position, s->state.head_position ); - - /* TODO: Extrapolate to_local matrix? */ } VG_STATIC void player__skate_reset_animator( player_instance *player )