X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=779ba7596f5f5126ae102443bdd416d02b4c406c;hb=76315944e5a98838163e0aba8601ed3522f0724d;hp=de240df816280c96f09c8b7bd991397a297d3479;hpb=fc3e6cb16a7e6fdc440b35aa88c32f7f560d928f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index de240df..779ba75 100644 --- a/player_skate.c +++ b/player_skate.c @@ -758,7 +758,6 @@ static void skate_apply_trick_model(void){ if( (v3_length2(state->trick_vel) >= 0.0001f ) && state->trick_time > 0.2f) { - player__skate_kill_audio(); player__dead_transition( k_player_die_type_feet ); } @@ -1146,19 +1145,6 @@ 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 0 - if( button_down(k_srbind_devbutton) ){ - state->activity = k_skate_activity_popoff; - 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 ); - } -#endif - if( state->activity == k_skate_activity_handplant ){ state->handplant_t += vg.time_delta; mdl_keyframe hpose[32]; @@ -1233,8 +1219,8 @@ static void player__skate_pre_update(void){ localplayer.rb.co ); player__begin_holdout( offset ); - player__skate_kill_audio(); - player__walk_transition( k_walk_activity_ipopoff, state->trick_euler[0] ); + player__walk_transition( state->activity <= k_skate_activity_air_to_grind? + 0: 1, state->trick_euler[0] ); return; } @@ -1274,45 +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) || - (state->activity == k_skate_activity_handplant))? 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; @@ -1337,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; @@ -1353,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; @@ -1404,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 ); @@ -1416,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 ); @@ -1425,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 ); } @@ -1433,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: @@ -2189,7 +2187,6 @@ static void player__skate_update(void){ 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; } @@ -2465,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; } @@ -2635,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; } @@ -2908,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; @@ -3573,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 ); }