X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=7029edc774f1fe9b6bdb722d7b0a31141d45a86f;hb=b4a83d4fcab39bee5a8cd6e8e6eec06314864e5b;hp=bec54539ecd625135513fd136df79ad731a8f117;hpb=eb203257efcfe324217de9e733cc6c1371b99de6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index bec5453..7029edc 100644 --- a/player_skate.c +++ b/player_skate.c @@ -4,6 +4,7 @@ #include "player.h" #include "audio.h" #include "vg/vg_perlin.h" +#include "menu.h" VG_STATIC void player__skate_bind( player_instance *player ) { @@ -123,17 +124,15 @@ VG_STATIC int skate_grind_scansq( player_instance *player, v3_normalize( support_axis ); while( bh_next( world->geo_bh, &it, box, &idx ) ){ - u32 *ptri = &world->scene_geo->arrindices[ idx*3 ]; + u32 *ptri = &world->scene_geo.arrindices[ idx*3 ]; v3f tri[3]; struct world_surface *surf = world_tri_index_surface(world,ptri[0]); -#if 0 - if( !(surf->info.flags & k_material_flag_skate_surface) ) + if( !(surf->info.flags & k_material_flag_grindable) ) continue; -#endif for( int j=0; j<3; j++ ) - v3_copy( world->scene_geo->arrvertices[ptri[j]].co, tri[j] ); + v3_copy( world->scene_geo.arrvertices[ptri[j]].co, tri[j] ); for( int j=0; j<3; j++ ){ int i0 = j, @@ -348,7 +347,7 @@ VG_STATIC int create_jumps_to_hit_target( player_instance *player, VG_STATIC void player__approximate_best_trajectory( player_instance *player ) { - world_instance *world = get_active_world(); + world_instance *world0 = get_active_world(); struct player_skate *s = &player->_skate; float k_trace_delta = k_rb_delta * 10.0f; @@ -393,6 +392,7 @@ void player__approximate_best_trajectory( player_instance *player ) v3_copy( player->rb.co, launch_co ); v3_copy( player->rb.v, launch_v ); v3_copy( launch_co, co0 ); + world_instance *trace_world = world0; float vt = (float)m * (1.0f/30.0f), ang = vg_lerpf( angle_begin, angle_end, vt ) * 0.15f; @@ -430,10 +430,9 @@ void player__approximate_best_trajectory( player_instance *player ) /* REFACTOR */ - v3f closest; + v3f closest={0.0f,0.0f,0.0f}; if( search_for_grind ){ - if( bh_closest_point( world->geo_bh, co1, closest, 1.0f ) != -1 ){ - + if( bh_closest_point(trace_world->geo_bh,co1,closest,1.0f) != -1 ){ float min_dist = 0.75f; min_dist *= min_dist; @@ -492,14 +491,18 @@ void player__approximate_best_trajectory( player_instance *player ) } } - if( world->rendering_gate ){ - ent_gate *gate = world->rendering_gate; + if( trace_world->rendering_gate ){ + ent_gate *gate = trace_world->rendering_gate; if( gate_intersect( gate, co1, co0 ) ){ m4x3_mulv( gate->transport, co0, co0 ); m4x3_mulv( gate->transport, co1, co1 ); m3x3_mulv( gate->transport, launch_v, launch_v); m4x3_mulv( gate->transport, launch_co, launch_co ); m3x3_mul( gate->transport, basis, basis ); + + if( gate->type == k_gate_type_nonlocel ){ + trace_world = &world_global.worlds[ gate->target ]; + } } } @@ -509,15 +512,16 @@ void player__approximate_best_trajectory( player_instance *player ) float scan_radius = k_board_radius; scan_radius *= vg_clampf( t, 0.02f, 1.0f ); - int idx = spherecast_world( world, co0, co1, scan_radius, &t1, n ); + int idx = spherecast_world(trace_world, co0, co1, scan_radius, &t1, n); if( idx != -1 ){ v3f co; v3_lerp( co0, co1, t1, co ); v3_copy( co, inf->log[ inf->log_length ++ ] ); v3_copy( n, inf->n ); - u32 *tri = &world->scene_geo->arrindices[ idx*3 ]; - struct world_surface *surf = world_tri_index_surface(world, tri[0]); + u32 *tri = &trace_world->scene_geo.arrindices[ idx*3 ]; + struct world_surface *surf = + world_tri_index_surface( trace_world, tri[0] ); inf->type = k_prediction_land; @@ -528,11 +532,13 @@ void player__approximate_best_trajectory( player_instance *player ) inf->score = -v3_dot( ve, inf->n ); inf->land_dist = t + k_trace_delta * t1; - /* Bias prediction towords ramps */ - if( !(surf->info.flags & k_material_flag_skate_surface) ) + if( !(surf->info.flags & k_material_flag_skate_target) ) inf->score *= 10.0f; + if( surf->info.flags & k_material_flag_boundary ) + s->possible_jump_count --; + break; } @@ -579,8 +585,6 @@ void player__approximate_best_trajectory( player_instance *player ) v3_add( launch_co, co0, co0 ); /* rough scan to make sure we dont collide with anything */ - /* NOTE this was rarely needed and ends up with false negatives. */ -#if 0 for( int j=1; j<=16; j++ ){ t = (float)j*(1.0f/16.0f); t *= 0.9f; @@ -594,15 +598,14 @@ void player__approximate_best_trajectory( player_instance *player ) float t1; v3f n; - int idx = spherecast_world( world, co0,co1, - k_board_radius*0.5f, &t1, n); + int idx = spherecast_world( world0, co0,co1, + k_board_radius*0.1f, &t1, n); if( idx != -1 ){ goto invalidated_grind; } v3_copy( co1, co0 ); } -#endif v3_copy( grind.n, jump->n ); @@ -614,10 +617,8 @@ void player__approximate_best_trajectory( player_instance *player ) s->possible_jumps[ s->possible_jump_count ++ ] = *jump; -#if 0 continue; invalidated_grind:; -#endif } } @@ -1010,7 +1011,8 @@ VG_STATIC void skate_apply_pump_model( player_instance *player ) v3_muladds( s->state.throw_v, player->rb.to_world[1], -doty, Fl); if( s->state.activity == k_skate_activity_ground ){ - v3_muladds( player->rb.v, Fl, k_mmcollect_lat, player->rb.v ); + if( v3_length2(player->rb.v)<(20.0f*20.0f) ) + v3_muladds( player->rb.v, Fl, k_mmcollect_lat, player->rb.v ); v3_muladds( s->state.throw_v, Fl, -k_mmcollect_lat, s->state.throw_v ); } @@ -1161,7 +1163,7 @@ VG_STATIC void player__skate_post_update( player_instance *player ) jump_info *jump = &s->possible_jumps[i]; if( jump->log_length == 0 ){ - vg_fatal_exit_loop( "assert: jump->log_length == 0\n" ); + vg_fatal_error( "assert: jump->log_length == 0\n" ); } for( int j=0; jlog_length - 1; j ++ ){ @@ -1191,10 +1193,13 @@ VG_STATIC void player__skate_post_update( player_instance *player ) slide = 0.0f; } + static float menu_gate = 1.0f; + menu_gate = vg_lerpf( menu_gate, 1-cl_menu, vg.time_frame_delta*4.0f ); + float - vol_main = sqrtf( (1.0f-air)*attn*(1.0f-slide) * 0.4f ), - vol_air = sqrtf( air *attn * 0.5f ), - vol_slide = sqrtf( (1.0f-air)*attn*slide * 0.25f ); + vol_main = sqrtf( (1.0f-air)*attn*(1.0f-slide) * 0.4f ) * menu_gate, + vol_air = sqrtf( air *attn * 0.5f ) * menu_gate, + vol_slide = sqrtf( (1.0f-air)*attn*slide * 0.25f ) * menu_gate; const u32 flags = AUDIO_FLAG_SPACIAL_3D|AUDIO_FLAG_LOOP; @@ -1227,7 +1232,7 @@ VG_STATIC void player__skate_post_update( player_instance *player ) vg_lerpf( 250.0f, 80.0f, attn ) ); if( s->sample_change_cooldown > 0.0f ){ - s->sample_change_cooldown -= vg.frame_delta; + s->sample_change_cooldown -= vg.time_frame_delta; } else{ int sample_type = k_skate_sample_concrete; @@ -1399,11 +1404,11 @@ int skate_compute_surface_alignment( player_instance *player, if( idx != -1 ) { - u32 *tri = &world->scene_geo->arrindices[ idx * 3 ]; + u32 *tri = &world->scene_geo.arrindices[ idx * 3 ]; v3f verts[3]; for( int j=0; j<3; j++ ) - v3_copy( world->scene_geo->arrvertices[ tri[j] ].co, verts[j] ); + v3_copy( world->scene_geo.arrvertices[ tri[j] ].co, verts[j] ); v3f vert0, vert1, n; v3_sub( verts[1], verts[0], vert0 ); @@ -1946,7 +1951,7 @@ VG_STATIC enum skate_activity skate_availible_grind( player_instance *player ) struct player_skate *s = &player->_skate; if( s->grind_cooldown > 100 ){ - vg_fatal_exit_loop( "wth!\n" ); + vg_fatal_error( "wth!\n" ); } /* debounces this state manager a little bit */ @@ -2390,7 +2395,8 @@ begin_collision:; manifold_len += l; - debug_capsule( mtx, capsule.radius, capsule.height, VG__WHITE ); + if( vg_lines.draw ) + debug_capsule( mtx, capsule.radius, capsule.height, VG__WHITE ); /* add limits */ if( s->state.activity >= k_skate_activity_grind_any ){ @@ -2736,11 +2742,10 @@ VG_STATIC void player__skate_animate( player_instance *player, (vg.time - s->state.cur_push) < 0.125, 6.0f*vg.time_delta ); - float pt = push_time + vg.accumulator; if( s->state.reverse > 0.0f ) - skeleton_sample_anim( sk, s->anim_push, pt, bpose ); + skeleton_sample_anim( sk, s->anim_push, push_time, bpose ); else - skeleton_sample_anim( sk, s->anim_push_reverse, pt, bpose ); + skeleton_sample_anim( sk, s->anim_push_reverse, push_time, bpose ); skeleton_lerp_pose( sk, apose, bpose, s->blend_push, apose ); @@ -2858,7 +2863,8 @@ VG_STATIC void player__skate_animate( player_instance *player, vg_warn( "FIX THIS! CARROT\n" ); v4_copy( player->rb.q, s->state.smoothed_rotation ); } - v4_lerp( s->state.smoothed_rotation, player->rb.q, 2.0f*vg.frame_delta, + v4_lerp( s->state.smoothed_rotation, player->rb.q, + 2.0f*vg.time_frame_delta, s->state.smoothed_rotation ); q_normalize( s->state.smoothed_rotation ); @@ -2951,15 +2957,20 @@ VG_STATIC void player__skate_animate( player_instance *player, q_mul( kf_board->q, qtrick, kf_board->q ); q_normalize( kf_board->q ); + struct player_board *board = player->playerboard; /* foot weight distribution */ if( s->blend_weight > 0.0f ){ - kf_foot_l->co[2] += s->blend_weight * 0.2f; - kf_foot_r->co[2] += s->blend_weight * 0.1f; + kf_foot_l->co[2] = + vg_lerpf( kf_foot_l->co[2], + board->truck_positions[k_board_truck_back][2]+0.3f, + 0.5f*s->blend_weight ); } else{ - kf_foot_r->co[2] += s->blend_weight * 0.3f; - kf_foot_l->co[2] += s->blend_weight * 0.1f; + kf_foot_r->co[2] = + vg_lerpf( kf_foot_r->co[2], + board->truck_positions[k_board_truck_front][2]-0.3f, + -0.5f*s->blend_weight ); } float slapm = vg_maxf( 1.0f-v3_length2( s->state.trick_vel ), 0.0f ); @@ -3025,15 +3036,18 @@ VG_STATIC void player__skate_animate( player_instance *player, /* transform */ rb_extrapolate( &player->rb, dest->root_co, dest->root_q ); - v3_muladds( dest->root_co, player->rb.to_world[1], -0.1f, dest->root_co ); - float substep = vg_clampf( vg.accumulator / VG_TIMESTEP_FIXED, 0.0f, 1.0f ); + v3f ext_up,ext_co; + q_mulv( dest->root_q, (v3f){0.0f,1.0f,0.0f}, ext_up ); + v3_copy( dest->root_co, ext_co ); + v3_muladds( dest->root_co, ext_up, -0.1f, dest->root_co ); v4f qflip; if( (s->state.activity <= k_skate_activity_air_to_grind) && (fabsf(s->state.flip_rate) > 0.01f) ) { - float t = s->state.flip_time; + float substep = vg.time_fixed_extrapolate; + float t = s->state.flip_time+s->state.flip_rate*substep*k_rb_delta; sign = vg_signf( t ); t = 1.0f - vg_minf( 1.0f, fabsf( t * 1.1f ) ); @@ -3050,7 +3064,7 @@ VG_STATIC void player__skate_animate( player_instance *player, q_normalize( dest->root_q ); v3f rotation_point, rco; - v3_muladds( player->rb.co, player->rb.to_world[1], 0.5f, rotation_point ); + v3_muladds( ext_co, ext_up, 0.5f, rotation_point ); v3_sub( dest->root_co, rotation_point, rco ); q_mulv( qflip, rco, rco ); @@ -3071,6 +3085,8 @@ 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 )