X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=779ba7596f5f5126ae102443bdd416d02b4c406c;hb=76315944e5a98838163e0aba8601ed3522f0724d;hp=986be2d92f3fc27b6941b30521cd85eb7e847463;hpb=53b534974303043efaf1d887711fcd349f6a2885;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index 986be2d..779ba75 100644 --- a/player_skate.c +++ b/player_skate.c @@ -24,7 +24,8 @@ static void player__skate_bind(void){ { &player_skate.anim_push_reverse, "push_reverse" }, { &player_skate.anim_ollie, "ollie" }, { &player_skate.anim_ollie_reverse,"ollie_reverse" }, - { &player_skate.anim_grabs, "grabs" } + { &player_skate.anim_grabs, "grabs" }, + { &player_skate.anim_handplant, "handplant" }, }; for( u32 i=0; itrick_vel) >= 0.0001f ) && state->trick_time > 0.2f) { - player__skate_kill_audio(); player__dead_transition( k_player_die_type_feet ); } @@ -840,11 +840,12 @@ static void skate_apply_steering_model(void){ /* 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) && (fabsf(state->skid)<0.01f) && + (fabsf(steer) > 0.4f) ){ + state->skid = vg_signf( steer ) * 0.02f; } - if( button_press(k_srbind_skid) ){ + if( button_press(k_srbind_skid) && (fabsf(state->skid)>0.01f) ){ skid_target = vg_signf( state->skid ); } } @@ -999,6 +1000,38 @@ static void skate_apply_jump_model(void){ } } +static void skate_apply_handplant_model(void){ + struct player_skate_state *state = &player_skate.state; + if( localplayer.rb.to_world[1][1] < -0.1f ) return; + if( localplayer.rb.to_world[1][1] > 0.6f ) return; + if( !( button_press(k_srbind_skid) || (fabsf(state->skid)>0.1f)) ) return; + + v3f lco = { 0.0f, -0.2f, -state->reverse }, + co, dir; + m4x3_mulv( localplayer.rb.to_world, lco, co ); + v3_muls( localplayer.rb.to_world[2], state->reverse, dir ); + vg_line_arrow( co, dir, 0.13f, 0xff000000 ); + + ray_hit hit = { .dist = 2.0f }; + if( ray_world( world_current_instance(), co, dir, + &hit, k_material_flag_ghosts )) { + vg_line( co, hit.pos, 0xff000000 ); + vg_line_point( hit.pos, 0.1f, 0xff000000 ); + + if( hit.normal[1] < 0.7f ) return; + if( hit.dist < 0.95f ) return; + + state->activity = k_skate_activity_handplant; + state->handplant_t = 0.0f; + v3_copy( localplayer.rb.co, state->store_co ); + v3_copy( localplayer.rb.v, state->air_init_v ); + v4_copy( localplayer.rb.q, state->store_q ); + v3_copy( state->cog, state->store_cog ); + v3_copy( state->cog_v, state->store_cog_v ); + v4_copy( state->smoothed_rotation, state->store_smoothed ); + } +} + static void skate_apply_pump_model(void){ struct player_skate_state *state = &player_skate.state; @@ -1112,7 +1145,65 @@ static enum trick_type player_skate_trick_input(void){ static void player__skate_pre_update(void){ struct player_skate_state *state = &player_skate.state; - if( button_down( k_srbind_use ) ){ + if( state->activity == k_skate_activity_handplant ){ + state->handplant_t += vg.time_delta; + mdl_keyframe hpose[32]; + + struct skeleton_anim *anim = player_skate.anim_handplant; + + int end = !skeleton_sample_anim_clamped( + &localplayer.skeleton, anim, + state->handplant_t, hpose ); + + if( state->reverse < 0.0f ) + player_mirror_pose( hpose, hpose ); + + mdl_keyframe *kf_world = &hpose[ localplayer.id_world -1 ]; + m4x3f world, mmdl, world_view; + q_m3x3( kf_world->q, world ); + v3_copy( kf_world->co, world[3] ); + + /* original mtx */ + q_m3x3( state->store_q, mmdl ); + v3_copy( state->store_co, mmdl[3] ); + m4x3_mul( mmdl, world, world_view ); + + vg_line_arrow( world_view[3], world_view[0], 1.0f, 0xff0000ff ); + vg_line_arrow( world_view[3], world_view[1], 1.0f, 0xff00ff00 ); + vg_line_arrow( world_view[3], world_view[2], 1.0f, 0xffff0000 ); + + m4x3f invworld; + m4x3_invert_affine( world, invworld ); + m4x3_mul( mmdl, invworld, world_view ); + + v3_copy( world_view[3], localplayer.rb.co ); + m3x3_q( world_view, localplayer.rb.q ); + + /* new * old^-1 = transfer function */ + m4x3f transfer; + m4x3_invert_affine( mmdl, transfer ); + m4x3_mul( world_view, transfer, transfer ); + + m3x3_mulv( transfer, state->air_init_v, localplayer.rb.v ); + m3x3_mulv( transfer, state->store_cog_v, state->cog_v ); + + m4x3_mulv( transfer, state->store_cog, state->cog ); + v3_muladds( state->cog, localplayer.rb.to_world[1], + -state->handplant_t*0.5f, state->cog ); + + v4f qtransfer; + m3x3_q( transfer, qtransfer ); + q_mul( qtransfer, state->store_smoothed, state->smoothed_rotation ); + q_normalize( state->smoothed_rotation ); + rb_update_transform( &localplayer.rb ); + + if( end ){ + state->activity = k_skate_activity_air; + } + else return; + } + + if( button_down(k_srbind_use) && (v3_length2(state->trick_vel) < 0.01f) ){ localplayer.subsystem = k_player_subsystem_walk; v3f angles; @@ -1124,10 +1215,12 @@ static void player__skate_pre_update(void){ v3_add( newpos, (v3f){0.0f,-1.0f,0.0f}, newpos ); v3_sub( localplayer.rb.co, newpos, offset ); v3_copy( newpos, localplayer.rb.co ); + v3_muladds( localplayer.rb.co, localplayer.rb.to_world[1], -0.1f, + localplayer.rb.co ); player__begin_holdout( offset ); - player__skate_kill_audio(); - player__walk_transition(); + player__walk_transition( state->activity <= k_skate_activity_air_to_grind? + 0: 1, state->trick_euler[0] ); return; } @@ -1167,44 +1260,26 @@ static void player__skate_pre_update(void){ state->trick_type = k_trick_type_none; } -static void player__skate_post_update(void){ - struct player_skate_state *state = &player_skate.state; - - for( int i=0; ilog_length == 0 ){ - vg_fatal_error( "assert: jump->log_length == 0\n" ); - } - - for( int j=0; jlog_length - 1; j ++ ){ - float brightness = jump->score*jump->score*jump->score; - v3f p1; - v3_lerp( jump->log[j], jump->log[j+1], brightness, p1 ); - vg_line( jump->log[j], p1, jump->colour ); - } - - vg_line_cross( jump->log[jump->log_length-1], jump->colour, 0.25f ); - - v3f p1; - v3_add( jump->log[jump->log_length-1], jump->n, p1 ); - vg_line( jump->log[jump->log_length-1], p1, 0xffffffff ); - - vg_line_point( jump->apex, 0.02f, 0xffffffff ); - } - +static void player__skate_comp_audio( void *_animator ){ + struct player_skate_animator *animator = _animator; audio_lock(); - float air = state->activity <= k_skate_activity_air_to_grind? 1.0f: 0.0f, - speed = v3_length( localplayer.rb.v ), - attn = vg_minf( 1.0f, speed*0.1f ), - slide = vg_clampf( fabsf(state->slip), 0.0f, 1.0f ); + f32 air = ((animator->activity <= k_skate_activity_air_to_grind) || + (animator->activity == k_skate_activity_handplant))? 1.0f: 0.0f, + speed = v3_length( animator->root_v ), + attn = vg_minf( 1.0f, speed*0.1f ), + slide = animator->slide; - if( state->activity >= k_skate_activity_grind_any ){ + if( animator->activity >= k_skate_activity_grind_any ) slide = 0.0f; + + f32 gate = skaterift.time_rate; + + if( skaterift.activity == k_skaterift_replay ){ + gate = vg_minf( 1.0f, fabsf(skaterift.track_velocity) ); } - f32 gate = skaterift.time_rate, + f32 vol_main = sqrtf( (1.0f-air)*attn*(1.0f-slide) * 0.4f ) * gate, vol_air = sqrtf( air *attn * 0.5f ) * gate, vol_slide = sqrtf( (1.0f-air)*attn*slide * 0.25f ) * gate; @@ -1229,8 +1304,8 @@ static void player__skate_post_update(void){ float sidechain_amt = 0.0f, hz = vg_maxf( speed * 2.0f, 2.0f ); - if( (player_skate.surface == k_surface_prop_tiles) && - (state->activity < k_skate_activity_grind_any) ) + if( (animator->surface == k_surface_prop_tiles) && + (animator->activity < k_skate_activity_grind_any) ) sidechain_amt = 1.0f; else sidechain_amt = 0.0f; @@ -1245,29 +1320,33 @@ static void player__skate_post_update(void){ else{ int sample_type = k_skate_sample_concrete; - if( state->activity == k_skate_activity_grind_5050 ){ - if( player_skate.surface == k_surface_prop_metal ) + if( animator->activity == k_skate_activity_grind_5050 ){ + if( animator->surface == k_surface_prop_metal ) sample_type = k_skate_sample_metal_scrape_generic; else sample_type = k_skate_sample_concrete_scrape_metal; } - else if( (state->activity == k_skate_activity_grind_back50) || - (state->activity == k_skate_activity_grind_front50) ) + else if( (animator->activity == k_skate_activity_grind_back50) || + (animator->activity == k_skate_activity_grind_front50) ) { - if( player_skate.surface == k_surface_prop_metal ){ + if( animator->surface == k_surface_prop_metal ){ sample_type = k_skate_sample_metal_scrape_generic; } else{ +#if 0 float a = v3_dot( localplayer.rb.to_world[2], player_skate.grind_dir ); if( fabsf(a) > 0.70710678118654752f ) sample_type = k_skate_sample_concrete_scrape_wood; else sample_type = k_skate_sample_concrete_scrape_metal; +#endif + + sample_type = k_skate_sample_concrete_scrape_wood; } } - else if( state->activity == k_skate_activity_grind_boardslide ){ - if( player_skate.surface == k_surface_prop_metal ) + else if( animator->activity == k_skate_activity_grind_boardslide ){ + if( animator->surface == k_surface_prop_metal ) sample_type = k_skate_sample_metal_scrape_generic; else sample_type = k_skate_sample_concrete_scrape_wood; @@ -1296,7 +1375,7 @@ static void player__skate_post_update(void){ if( player_skate.aud_main ){ player_skate.aud_main->colour = 0x00103efe; audio_channel_set_spacial( player_skate.aud_main, - localplayer.rb.co, 40.0f ); + animator->root_co, 40.0f ); //audio_channel_slope_volume( player_skate.aud_main, 0.05f, vol_main ); audio_channel_edit_volume( player_skate.aud_main, vol_main, 1 ); audio_channel_sidechain_lfo( player_skate.aud_main, 0, sidechain_amt ); @@ -1308,7 +1387,7 @@ static void player__skate_post_update(void){ if( player_skate.aud_slide ){ player_skate.aud_slide->colour = 0x00103efe; audio_channel_set_spacial( player_skate.aud_slide, - localplayer.rb.co, 40.0f ); + animator->root_co, 40.0f ); //audio_channel_slope_volume( player_skate.aud_slide, 0.05f, vol_slide ); audio_channel_edit_volume( player_skate.aud_slide, vol_slide, 1 ); audio_channel_sidechain_lfo( player_skate.aud_slide, 0, sidechain_amt ); @@ -1317,7 +1396,7 @@ static void player__skate_post_update(void){ if( player_skate.aud_air ){ player_skate.aud_air->colour = 0x00103efe; audio_channel_set_spacial( player_skate.aud_air, - localplayer.rb.co, 40.0f ); + animator->root_co, 40.0f ); //audio_channel_slope_volume( player_skate.aud_air, 0.05f, vol_air ); audio_channel_edit_volume( player_skate.aud_air, vol_air, 1 ); } @@ -1325,6 +1404,33 @@ static void player__skate_post_update(void){ audio_unlock(); } +static void player__skate_post_update(void){ + struct player_skate_state *state = &player_skate.state; + + for( int i=0; ilog_length == 0 ){ + vg_fatal_error( "assert: jump->log_length == 0\n" ); + } + + for( int j=0; jlog_length - 1; j ++ ){ + float brightness = jump->score*jump->score*jump->score; + v3f p1; + v3_lerp( jump->log[j], jump->log[j+1], brightness, p1 ); + vg_line( jump->log[j], p1, jump->colour ); + } + + vg_line_cross( jump->log[jump->log_length-1], jump->colour, 0.25f ); + + v3f p1; + v3_add( jump->log[jump->log_length-1], jump->n, p1 ); + vg_line( jump->log[jump->log_length-1], p1, 0xffffffff ); + + vg_line_point( jump->apex, 0.02f, 0xffffffff ); + } +} + /* * truck alignment model at ra(local) * returns 1 if valid surface: @@ -2072,12 +2178,15 @@ static void player__skate_update(void){ struct player_skate_state *state = &player_skate.state; world_instance *world = world_current_instance(); + if( state->activity == k_skate_activity_handplant ){ + return; + } + if( world->water.enabled ){ if( localplayer.rb.co[1]+0.25f < world->water.height ){ player__networked_sfx( k_player_subsystem_walk, 32, k_player_walk_soundeffect_splash, localplayer.rb.co, 1.0f ); - player__skate_kill_audio(); player__dead_transition( k_player_die_type_generic ); return; } @@ -2238,6 +2347,7 @@ grinding:; skate_adjust_up_direction(); skate_apply_cog_model(); skate_apply_jump_model(); + skate_apply_handplant_model(); skate_apply_grab_model(); skate_apply_trick_model(); skate_apply_pump_model(); @@ -2352,7 +2462,6 @@ begin_collision:; v3_lerp( start_co, localplayer.rb.co, t, localplayer.rb.co ); rb_update_transform( &localplayer.rb ); - player__skate_kill_audio(); player__dead_transition( k_player_die_type_head ); return; } @@ -2522,7 +2631,6 @@ begin_collision:; if( nforce > 17.6f ){ v3_muladds( localplayer.rb.v, normal_total, -1.0f, localplayer.rb.v ); player__dead_transition( k_player_die_type_feet ); - player__skate_kill_audio(); return; } @@ -2655,6 +2763,7 @@ static void player__skate_im_gui(void){ "air", "air_to_grind", "ground", + "handplant", "undefined (INVALID)", "grind_any (INVALID)", "grind_boardslide", @@ -2794,6 +2903,7 @@ static void player__skate_animate(void){ animator->grind_balance = vg_lerpf( animator->grind_balance, grind_frame, 5.0f*vg.time_delta ); animator->activity = state->activity; + animator->surface = player_skate.surface; /* pushing */ animator->push_time = vg.time - state->start_push; @@ -2957,8 +3067,18 @@ static void player__skate_animate(void){ vg_line_arrow( localplayer.rb.co, p2, 0.5f, VG__PINK ); } else q_identity( animator->qfixuptotal ); - rb_extrapolate( &localplayer.rb, animator->root_co, animator->root_q ); - v3_copy( localplayer.rb.v, animator->root_v ); + + if( state->activity == k_skate_activity_handplant ){ + v3_copy( state->store_co, animator->root_co ); + v4_copy( state->store_q, animator->root_q ); + v3_zero( animator->root_v ); + } + else { + rb_extrapolate( &localplayer.rb, animator->root_co, animator->root_q ); + v3_copy( localplayer.rb.v, animator->root_v ); + } + + animator->handplant_t = state->handplant_t; } static void player__skate_pose( void *_animator, player_pose *pose ){ @@ -3009,24 +3129,8 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ 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; - } + player_mirror_pose( bpose, mirrored ); skeleton_lerp_pose( sk, bpose, mirrored, animator->z, bpose ); - - - - - skeleton_lerp_pose( sk, apose, bpose, animator->slide, apose ); if( animator->reverse > 0.0f ){ @@ -3104,6 +3208,7 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ pose->keyframes[apply_to[i]-1].co[2] += animator->offset[2]*add_grab_mod; } +#if 1 /* angle 'correction' */ v3f origin; v3_add( sk->bones[localplayer.id_hip].co, kf_hip->co, origin ); @@ -3113,6 +3218,49 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ keyframe_rotate_around( kf, origin, sk->bones[apply_to[i]].co, animator->qfixuptotal ); } +#endif + + + if( animator->activity == k_skate_activity_handplant ){ + struct skeleton_anim *anim = player_skate.anim_handplant; + + mdl_keyframe hpose[32]; + skeleton_sample_anim_clamped( sk, anim, animator->handplant_t, hpose ); + if( animator->reverse < 0.0f ) + player_mirror_pose( hpose, hpose ); + + mdl_keyframe *kf_world = &hpose[ localplayer.id_world -1 ]; + m4x3f world, mmdl, world_view; + q_m3x3( kf_world->q, world ); + v3_copy( kf_world->co, world[3] ); + + q_m3x3( pose->root_q, mmdl ); + v3_copy( pose->root_co, mmdl[3] ); + + m4x3_mul( mmdl, world, world_view ); + + vg_line_arrow( world_view[3], world_view[0], 1.0f, 0xff0000ff ); + vg_line_arrow( world_view[3], world_view[1], 1.0f, 0xff00ff00 ); + vg_line_arrow( world_view[3], world_view[2], 1.0f, 0xffff0000 ); + + m4x3f invworld; + m4x3_invert_affine( world, invworld ); + m4x3_mul( mmdl, invworld, world_view ); + + m3x3_q( world_view, pose->root_q ); + v3_copy( world_view[3], pose->root_co ); + + f32 t = animator->handplant_t, + frames = anim->length-1, + length = animator->activity == k_skate_activity_handplant? + frames / anim->rate: + 999999, + end_dist = vg_minf( t, length - t )/k_anim_transition, + blend = vg_smoothstepf( vg_minf(1,end_dist) ); + + skeleton_lerp_pose( sk, pose->keyframes, hpose, blend, pose->keyframes ); + } + /* trick rotation */ v4f qtrick, qyaw, qpitch, qroll; @@ -3174,7 +3322,8 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ q_mul( q, kf_wheels[i]->q, kf_wheels[i]->q ); q_normalize( kf_wheels[i]->q ); } - + +#if 1 { mdl_keyframe *kf_head = &pose->keyframes[localplayer.id_head-1], @@ -3252,6 +3401,7 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ sk->bones[skidders[i]].co, qskid ); } } +#endif } static void player__skate_effects( void *_animator, m4x3f *final_mtx, @@ -3419,6 +3569,7 @@ static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){ bitpack_qf32( ctx, 16, 0.0f, 120.0f, &animator->push_time ); bitpack_qf32( ctx, 16, 0.0f, 120.0f, &animator->jump_time ); + bitpack_qf32( ctx, 16, 0.0f, 4.0f, &animator->handplant_t ); bitpack_qv3f( ctx, 16, -100.0f, 100.0f, animator->root_v ); bitpack_bytes( ctx, 1, &animator->activity ); }