X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player_skate.c;h=986be2d92f3fc27b6941b30521cd85eb7e847463;hb=53b534974303043efaf1d887711fcd349f6a2885;hp=215c1c7f678091d8f97184aa98ddbf10ccd424c0;hpb=cbf074c021e1de4ee88505ee758b85ccaf2e8a55;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index 215c1c7..986be2d 100644 --- a/player_skate.c +++ b/player_skate.c @@ -225,7 +225,7 @@ too_many_samples: v3_copy( sj->normal3, n1 ); v3_cross( n0, n1, dir ); - if( v3_length2( dir ) <= 0.001f ) + if( v3_length2( dir ) <= 0.000001f ) continue; v3_normalize( dir ); @@ -715,7 +715,7 @@ static void skate_apply_trick_model(void){ if( v3_length2( state->trick_vel ) < 0.0001f ) return; - int carry_on = player_skate_trick_input(); + int carry_on = state->trick_type == player_skate_trick_input(); /* we assume velocities share a common divisor, in which case the * interval is the minimum value (if not zero) */ @@ -729,31 +729,36 @@ static void skate_apply_trick_model(void){ } float interval = 1.0f / min_rate, - current = floorf( state->trick_time / interval ), - next_end = (current+1.0f) * interval; + current = floorf( state->trick_time ), + next_end = current+1.0f; /* integrate trick velocities */ v3_muladds( state->trick_euler, state->trick_vel, k_rb_delta, state->trick_euler ); - if( !carry_on && (state->trick_time + k_rb_delta >= next_end) ){ + if( !carry_on && (state->trick_time + k_rb_delta/interval >= next_end) ){ state->trick_time = 0.0f; state->trick_euler[0] = roundf( state->trick_euler[0] ); state->trick_euler[1] = roundf( state->trick_euler[1] ); state->trick_euler[2] = roundf( state->trick_euler[2] ); v3_copy( state->trick_vel, state->trick_residualv ); v3_zero( state->trick_vel ); - } - state->trick_time += k_rb_delta; + audio_lock(); + audio_oneshot_3d( &audio_flips[vg_randu32(&vg.rand)%4], + localplayer.rb.co, 40.0f, 1.0f ); + audio_unlock(); + } + else + state->trick_time += k_rb_delta / interval; } else{ if( (v3_length2(state->trick_vel) >= 0.0001f ) && state->trick_time > 0.2f) { player__skate_kill_audio(); - player__dead_transition(); + player__dead_transition( k_player_die_type_feet ); } state->trick_euler[0] = roundf( state->trick_euler[0] ); @@ -799,6 +804,8 @@ static void skate_apply_steering_model(void){ float rate = 26.0f, top = 1.0f; + f32 skid_target = 0.0f; + if( state->activity <= k_skate_activity_air_to_grind ){ rate = 6.0f * fabsf(steer); top = 1.5f; @@ -828,12 +835,35 @@ static void skate_apply_steering_model(void){ rate = 35.0f; top = 1.5f; } - + else { + f32 skid = axis_state(k_sraxis_skid); + + /* skids on keyboard lock to the first direction pressed */ + if( vg_input.display_input_method == k_input_method_kbm ){ + if( button_down(k_srbind_skid) && (fabsf(state->skid)<0.01f) ){ + state->skid = vg_signf( steer ) * 0.01f; + } + + if( button_press(k_srbind_skid) ){ + skid_target = vg_signf( state->skid ); + } + } + else { + if( fabsf(skid) > 0.1f ){ + skid_target = skid; + } + } + } + if( grab < 0.5f ){ top *= 1.0f+v3_length( state->throw_v )*k_mmthrow_steer; } } + vg_slewf( &state->skid, skid_target, k_rb_delta*(1.0f/0.1f) ); + steer = vg_lerpf( steer, state->skid*k_steer_ground*0.5f, + fabsf(state->skid*0.8f) ); + float current = v3_dot( localplayer.rb.to_world[1], localplayer.rb.w ), addspeed = (steer * -top) - current, maxaccel = rate * k_rb_delta, @@ -867,14 +897,19 @@ static void skate_apply_friction_model(void){ state->slip = slip; state->reverse = -vg_signf(vel[2]); + f32 lat = k_friction_lat; + + if( fabsf(axis_state(k_sraxis_skid)) > 0.1f ){ + lat = k_friction_lat * 2.0f; + } + vel[0] += vg_cfrictf( vel[0], k_friction_lat * k_rb_delta ); vel[2] += vg_cfrictf( vel[2], k_friction_resistance * k_rb_delta ); /* Pushing additive force */ - if( !button_press( k_srbind_jump ) ){ - if( button_press( k_srbind_push ) || (vg.time-state->start_push<0.75) ) - { + if( !button_press( k_srbind_jump ) && (fabsf(state->skid)<0.1f) ){ + if( button_press( k_srbind_push ) || (vg.time-state->start_push<0.75) ){ if( (vg.time - state->cur_push) > 0.25 ) state->start_push = vg.time; @@ -952,6 +987,7 @@ static void skate_apply_jump_model(void){ q_mulv( qtilt, jumpdir, jumpdir ); } state->surface_cooldown = 10; + state->trick_input_collect = 0.0f; float force = k_jump_force*state->jump_charge; v3_muladds( localplayer.rb.v, jumpdir, force, localplayer.rb.v ); @@ -1095,12 +1131,23 @@ static void player__skate_pre_update(void){ return; } + enum trick_type trick = player_skate_trick_input(); + if( trick ) + state->trick_input_collect += vg.time_frame_delta; + else + state->trick_input_collect = 0.0f; + if( state->activity <= k_skate_activity_air_to_grind ){ - enum trick_type trick = k_trick_type_none; - if( (trick = player_skate_trick_input()) ){ - if( (vg.time - state->jump_time) < 0.1f ){ + if( trick && (state->trick_input_collect < 0.1f) ){ + if( state->trick_time == 0.0f ){ + audio_lock(); + audio_oneshot_3d( &audio_flips[vg_randu32(&vg.rand)%4], + localplayer.rb.co, 40.0f, 1.0f ); + audio_unlock(); + } + + if( state->trick_time < 0.1f ){ v3_zero( state->trick_vel ); - state->trick_time = 0.0f; if( trick == k_trick_type_kickflip ){ state->trick_vel[0] = 3.0f; @@ -2031,7 +2078,7 @@ static void player__skate_update(void){ k_player_walk_soundeffect_splash, localplayer.rb.co, 1.0f ); player__skate_kill_audio(); - player__dead_transition(); + player__dead_transition( k_player_die_type_generic ); return; } } @@ -2306,7 +2353,7 @@ begin_collision:; rb_update_transform( &localplayer.rb ); player__skate_kill_audio(); - player__dead_transition(); + player__dead_transition( k_player_die_type_head ); return; } @@ -2474,7 +2521,7 @@ begin_collision:; if( nforce > 4.0f ){ if( nforce > 17.6f ){ v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v ); - player__dead_transition(); + player__dead_transition( k_player_die_type_feet ); player__skate_kill_audio(); return; } @@ -2572,7 +2619,7 @@ begin_collision:; if( (state->activity_prev < k_skate_activity_grind_any) && (state->activity >= k_skate_activity_grind_any) ){ - state->velocity_limit = v3_length( localplayer.rb.v ); + state->velocity_limit = v3_length( localplayer.rb.v )*1.0f; state->grind_y_start = localplayer.rb.co[1]; } @@ -2629,7 +2676,8 @@ static void player__skate_im_gui(void){ state->trick_vel[0], state->trick_vel[1], state->trick_vel[2] ); - player__debugtext( 1, "tricke: %.2f %.2f %.2f", + player__debugtext( 1, "tricke: %.2fs %.2f %.2f %.2f", + state->trick_time, state->trick_euler[0], state->trick_euler[1], state->trick_euler[2] ); @@ -2659,7 +2707,7 @@ static void player__skate_animate(void){ float curspeed = v3_length( localplayer.rb.v ), kickspeed = vg_clampf( curspeed*(1.0f/40.0f), 0.0f, 1.0f ), - kicks = (vg_randf64()-0.5f)*2.0f*kickspeed, + kicks = (vg_randf64(&vg.rand)-0.5f)*2.0f*kickspeed, sign = vg_signf( kicks ); animator->wobble[0] = vg_lerpf( animator->wobble[0], kicks*kicks*sign, @@ -2679,7 +2727,6 @@ static void player__skate_animate(void){ v3f cam_offset; v3_mul( animator->offset, (v3f){1.0f,0.3f,1.0f}, cam_offset ); - v3_copy( cam_offset, localplayer.cam_control.tpv_offset_extra ); /* localized vectors */ m4x3_mulv( localplayer.rb.to_local, state->cog, animator->local_cog ); @@ -2693,24 +2740,34 @@ static void player__skate_animate(void){ { float desired = 0.0f; if( state->activity == k_skate_activity_ground ) - desired = vg_clampf( fabsf( state->slip ), 0.0f, 1.0f ); + desired = vg_clampf( vg_maxf(fabsf( state->slip ), + fabsf( state->skid ) ), 0.0f, 1.0f ); animator->slide = vg_lerpf( animator->slide, desired, 2.4f*vg.time_delta); + + f32 dirx = 0.0f; + if( fabsf(state->slip) > fabsf(dirx) ) dirx = state->slip; + if( fabsf(state->skid) > fabsf(dirx) ) dirx = state->skid; + if( fabsf( dirx ) > 0.025f ) dirx = vg_signf( dirx ); + dirx = vg_signf( state->slip ); + vg_slewf( &animator->x, dirx, 2.6f*vg.time_delta ); } + + cam_offset[0] += animator->slide * -animator->x; + v3_copy( cam_offset, localplayer.cam_control.tpv_offset_extra ); /* movement information */ int iair = state->activity <= k_skate_activity_air_to_grind; float dirz = state->reverse > 0.0f? 0.0f: 1.0f, - dirx = state->slip < 0.0f? 0.0f: 1.0f, - fly = iair? 1.0f: 0.0f, + fly = iair? 1.0f: 0.0f, wdist= player_skate.weight_distribution[2] / k_board_length; if( state->activity >= k_skate_activity_grind_any ) wdist = 0.0f; animator->z = vg_lerpf( animator->z, dirz, 2.4f*vg.time_delta ); - animator->x = vg_lerpf( animator->x, dirx, 0.6f*vg.time_delta ); + animator->skid = state->skid; animator->fly = vg_lerpf( animator->fly, fly, 3.4f*vg.time_delta ); animator->weight = vg_lerpf( animator->weight, wdist, 9.0f*vg.time_delta ); @@ -2805,10 +2862,14 @@ static void player__skate_animate(void){ animator->subslap = vg_lerpf( animator->subslap, slapm, vg.time_delta*10.0f ); +#if 0 f32 l = ((state->activity < k_skate_activity_ground) && v3_length2(state->trick_vel) > 0.1f )? 1: 0; animator->trick_foot = vg_lerpf( animator->trick_foot, l, 8.4f*vg.time_delta ); +#endif + + animator->trick_foot = vg_exp_impulse( state->trick_time, 5.0f ); /* grab */ v2f grab_input; @@ -2821,10 +2882,14 @@ static void player__skate_animate(void){ animator->grabbing = state->grabbing; /* steer */ - joystick_state( k_srjoystick_steer, animator->steer ); + v2f steer; + joystick_state( k_srjoystick_steer, steer ); + animator->airdir = vg_lerpf( animator->airdir, + -steer[0], 2.4f*vg.time_delta ); - animator->airdir = vg_lerpf( animator->airdir, -animator->steer[0], - 2.4f*vg.time_delta ); + animator->steer[0] = steer[0]; + animator->steer[1] = vg_lerpf( animator->steer[1], + steer[0], 4.0f*vg.time_delta ); /* flip angle */ @@ -2940,8 +3005,28 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ skeleton_lerp_pose( sk, apose, bpose, stand_blend, apose ); /* sliding */ - skeleton_sample_anim( sk, player_skate.anim_slide, animator->x * 0.5f, - bpose ); + f32 slide_frame = animator->x * 0.25f + 0.25f; + skeleton_sample_anim( sk, player_skate.anim_slide, slide_frame, bpose ); + + mdl_keyframe mirrored[32]; + for( u32 i=1; ibone_count; i ++ ){ + + mdl_keyframe *dest = &mirrored[i-1]; + u8 mapping = localplayer.skeleton_mirror[i]; + + if( mapping ) *dest = bpose[mapping-1]; /* R */ + else *dest = bpose[i-1]; /* L */ + + dest->co[2] *= -1.0f; + dest->q[0] *= -1.0f; + dest->q[1] *= -1.0f; + } + skeleton_lerp_pose( sk, bpose, mirrored, animator->z, bpose ); + + + + + skeleton_lerp_pose( sk, apose, bpose, animator->slide, apose ); if( animator->reverse > 0.0f ){ @@ -3052,15 +3137,18 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ kf_board->co[1] += animator->slap * animator->subslap; kf_hip->co[1] += animator->slap * 0.25f; + /* kickflip and shuvit are in the wrong order for some reason */ if( animator->trick_type == k_trick_type_kickflip ){ - kf_foot_l->co[0] += animator->trick_foot * 0.2f; + kf_foot_l->co[0] += animator->trick_foot * 0.15f; + kf_foot_r->co[0] -= animator->trick_foot * 0.15f; kf_foot_l->co[1] -= animator->trick_foot * 0.18f; + kf_foot_r->co[1] -= animator->trick_foot * 0.18f; } else if( animator->trick_type == k_trick_type_shuvit ){ - kf_foot_l->co[0] += animator->trick_foot * 0.1f; - kf_foot_r->co[0] -= animator->trick_foot * 0.15f; + kf_foot_l->co[0] += animator->trick_foot * 0.2f; kf_foot_l->co[1] -= animator->trick_foot * 0.18f; - kf_foot_r->co[1] -= animator->trick_foot * 0.18f; + kf_foot_r->co[0] -= animator->trick_foot * 0.1f; + kf_foot_r->co[1] += animator->trick_foot * 0.09f; } else if( animator->trick_type == k_trick_type_treflip ){ kf_foot_l->co[0] += animator->trick_foot * 0.2f; @@ -3093,7 +3181,8 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ *kf_elbow_l = &pose->keyframes[localplayer.id_ik_elbow_l-1], *kf_elbow_r = &pose->keyframes[localplayer.id_ik_elbow_r-1], *kf_hand_l = &pose->keyframes[localplayer.id_ik_hand_l-1], - *kf_hand_r = &pose->keyframes[localplayer.id_ik_hand_r-1]; + *kf_hand_r = &pose->keyframes[localplayer.id_ik_hand_r-1], + *kf_hip = &pose->keyframes[localplayer.id_hip-1]; float warble = perlin1d( vg.time, 2.0f, 2, 300 ); warble *= vg_maxf(animator->grind, fabsf(animator->weight)) * 0.3f; @@ -3116,6 +3205,52 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ q_inv( qrot, qrot ); q_mul( qrot, kf_head->q, kf_head->q ); q_normalize( kf_head->q ); + + + /* hand placement */ + + u32 hand_id = animator->z < 0.5f? + localplayer.id_ik_hand_l: localplayer.id_ik_hand_r; + + v3f sample_co; + m4x3f mmdl; + q_m3x3( pose->root_q, mmdl ); + q_mulv( pose->root_q, pose->keyframes[hand_id-1].co, mmdl[3] ); + v3_add( mmdl[3], pose->root_co, mmdl[3] ); + m4x3_mulv( mmdl, sk->bones[hand_id].co, sample_co ); + + v3_muladds( sample_co, mmdl[1], 0.3f, sample_co ); + vg_line_point( sample_co, 0.04f, 0xff0000ff ); + + v3f dir; + v3_muls( mmdl[1], -1.0f, dir ); + ray_hit hit = { .dist = 1.5f }; + if(ray_world( world_current_instance(), sample_co, dir, &hit, 0 )){ + vg_line_cross( hit.pos, 0xff0000ff, 0.05f ); + vg_line( sample_co, hit.pos, 0xffffffff ); + + f32 amt = vg_maxf( 0.0f, animator->slide-0.5f ) * + 2.0f * fabsf(animator->z*2.0f-1.0f); + + f32 d = (hit.dist - 0.3f) * amt; + pose->keyframes[hand_id-1].co[1] -= d; + kf_hip->co[1] -= d*0.4f; + } + + /* skid */ + f32 amt = vg_maxf(0.0f, (animator->slide - 0.5f) * 2.0f); + u8 skidders[] = { localplayer.id_ik_foot_l, + localplayer.id_ik_foot_r, + localplayer.id_board }; + v4f qskid; + q_axis_angle( qskid, (v3f){0,1,0}, -animator->steer[1]*0.2f ); + + for( u32 i=0; ikeyframes[ skidders[i]-1 ]; + keyframe_rotate_around( kf, + (v3f){0,0,0.4f*(animator->z*2.0f-1.0f)*amt}, + sk->bones[skidders[i]].co, qskid ); + } } } @@ -3246,7 +3381,7 @@ static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){ bitpack_qv3f( ctx, 8, -1.0f, 1.0f, animator->offset ); bitpack_qv3f( ctx, 8, -1.0f, 1.0f, animator->local_cog ); bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->slide ); - bitpack_qf32( ctx, 8, -1.0f, 1.0f, &animator->z ); + bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->z ); bitpack_qf32( ctx, 8, -1.0f, 1.0f, &animator->x ); /* these could likely be pressed down into single bits if needed */ @@ -3292,16 +3427,20 @@ static void player__skate_sfx_oneshot( u8 id, v3f pos, f32 volume ){ audio_lock(); if( id == k_player_skate_soundeffect_jump ){ - audio_oneshot_3d( &audio_jumps[vg_randu32()%2], pos, 40.0f, volume ); + audio_oneshot_3d( &audio_jumps[vg_randu32(&vg.rand)%2], + pos, 40.0f, volume ); } else if( id == k_player_skate_soundeffect_tap ){ - audio_oneshot_3d( &audio_taps[vg_randu32()%4], pos, 40.0f, volume ); + audio_oneshot_3d( &audio_taps[vg_randu32(&vg.rand)%4], + pos, 40.0f, volume ); } else if( id == k_player_skate_soundeffect_land_good ){ - audio_oneshot_3d( &audio_lands[vg_randu32()%3], pos, 40.0f, volume ); + audio_oneshot_3d( &audio_lands[vg_randu32(&vg.rand)%3], + pos, 40.0f, volume ); } else if( id == k_player_skate_soundeffect_land_bad ){ - audio_oneshot_3d( &audio_lands[vg_randu32()%2+3], pos, 40.0f, volume ); + audio_oneshot_3d( &audio_lands[vg_randu32(&vg.rand)%2+3], + pos, 40.0f, volume ); } else if( id == k_player_skate_soundeffect_grind_metal ){ audio_oneshot_3d( &audio_board[3], pos, 40.0f, volume );