{ &player_skate.anim_ollie, "ollie" },
{ &player_skate.anim_ollie_reverse,"ollie_reverse" },
{ &player_skate.anim_grabs, "grabs" },
- { &player_skate.anim_handplant, "handplant" }
+ { &player_skate.anim_handplant, "handplant" },
};
for( u32 i=0; i<vg_list_size(bindings); i++ )
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 );
}
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, player_skate.anim_handplant,
+ &localplayer.skeleton, anim,
state->handplant_t, hpose );
if( state->reverse < 0.0f )
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 );
else return;
}
- if( button_down( k_srbind_use ) ){
+ if( button_down(k_srbind_use) && (v3_length2(state->trick_vel) < 0.01f) ){
localplayer.subsystem = k_player_subsystem_walk;
v3f angles;
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;
}
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; i<player_skate.possible_jump_count; i++ ){
- jump_info *jump = &player_skate.possible_jumps[i];
-
- if( jump->log_length == 0 ){
- vg_fatal_error( "assert: jump->log_length == 0\n" );
- }
-
- for( int j=0; j<jump->log_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;
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;
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;
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 );
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 );
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 );
}
audio_unlock();
}
+static void player__skate_post_update(void){
+ struct player_skate_state *state = &player_skate.state;
+
+ for( int i=0; i<player_skate.possible_jump_count; i++ ){
+ jump_info *jump = &player_skate.possible_jumps[i];
+
+ if( jump->log_length == 0 ){
+ vg_fatal_error( "assert: jump->log_length == 0\n" );
+ }
+
+ for( int j=0; j<jump->log_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:
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;
}
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;
}
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;
}
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;
}
#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, player_skate.anim_handplant,
- animator->handplant_t, hpose );
+ skeleton_sample_anim_clamped( sk, anim, animator->handplant_t, hpose );
if( animator->reverse < 0.0f )
player_mirror_pose( hpose, hpose );
v3_copy( world_view[3], pose->root_co );
f32 t = animator->handplant_t,
- frames = player_skate.anim_handplant->length-1,
- length = frames / player_skate.anim_handplant->rate,
+ 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) );
}
-
-
-
/* trick rotation */
v4f qtrick, qyaw, qpitch, qroll;
q_axis_angle( qyaw, (v3f){0.0f,1.0f,0.0f}, animator->board_euler[0] );
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 );
}
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff