X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_skate.c;h=fa59d24e1718a534169a693a587f74cd69ad783b;hb=76042e561d89b232f04cac8a431b5cd7b30a6b9d;hp=fedeee84c37edf4eb84588a502d508d86d2a969e;hpb=e3bf80ff27b675f5e7f87dcebd16fab6fe08df7a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_skate.c b/player_skate.c index fedeee8..fa59d24 100644 --- a/player_skate.c +++ b/player_skate.c @@ -684,6 +684,12 @@ VG_STATIC void skate_apply_interface_model( player_instance *player, s->state.lift_frames = 0; v3f projected, axis; + if( s->state.activity_prev == k_skate_activity_air ) + { + player->cam_land_punch_v += v3_dot( player->rb.v, surface_avg ) * + k_cam_punch; + } + float const DOWNFORCE = -k_downforce*VG_TIMESTEP_FIXED; v3_muladds( player->rb.v, player->rb.to_world[1], DOWNFORCE, player->rb.v ); @@ -1179,9 +1185,7 @@ VG_STATIC void player__skate_update( player_instance *player ) m3x3_mulv( gate->transport, s->state.throw_v, s->state.throw_v ); /*camera */ - m4x3_mulv( gate->transport, s->state.posl, s->state.posl ); m3x3_mulv( gate->transport, s->state.vl, s->state.vl ); - m3x3_mulv( gate->transport, s->state.dirl, s->state.dirl ); #if 0 mixedcam_transport( &s->state.cam, gate ); @@ -1241,18 +1245,16 @@ VG_STATIC void player__skate_animate( player_instance *player, m4x3_mulv( player->rb.to_local, s->state.cog, offset ); v3_muls( offset, -4.0f, offset ); - static float speed_wobble = 0.0f, speed_wobble_2 = 0.0f; - float curspeed = v3_length( player->rb.v ), kickspeed = vg_clampf( curspeed*(1.0f/40.0f), 0.0f, 1.0f ), kicks = (vg_randf()-0.5f)*2.0f*kickspeed, sign = vg_signf( kicks ); s->wobble[0] = vg_lerpf( s->wobble[0], kicks*kicks*sign, 6.0f*vg.time_delta); - s->wobble[1] = vg_lerpf( s->wobble[1], speed_wobble, 2.4f*vg.time_delta); + s->wobble[1] = vg_lerpf( s->wobble[1], s->wobble[0], 2.4f*vg.time_delta); offset[0] *= 0.26f; - offset[0] += speed_wobble_2*3.0f; + offset[0] += s->wobble[1]*3.0f; offset[1] *= -0.3f; offset[2] *= 0.01f; @@ -1419,7 +1421,6 @@ 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.28f, dest->root_co ); v4f qresy, qresx, qresidual; @@ -1452,64 +1453,27 @@ VG_STATIC void player__skate_animate( player_instance *player, v3_muladds( player->rb.co, player->rb.to_world[1], 0.5f, rotation_point ); v3_sub( dest->root_co, rotation_point, rco ); - /* FIXME: q_mul v3 */ - m3x3f TEMP; - q_m3x3( qflip, TEMP ); - m3x3_mulv( TEMP, rco, rco ); + q_mulv( qflip, rco, rco ); v3_add( rco, rotation_point, dest->root_co ); } } -VG_STATIC void skate_camera_vector_look( v3f angles, v3f v, float C, float k ) -{ - float yaw = atan2f( v[0], -v[2] ), - pitch = atan2f - ( - -v[1], - sqrtf - ( - v[0]*v[0] + v[2]*v[2] - ) - ) * C + k; - - angles[0] = yaw; - angles[1] = pitch; -} - VG_STATIC void skate_camera_firstperson( player_instance *player ) { struct player_skate *s = &player->_skate; struct player_avatar *av = player->playeravatar; +#if 0 /* FIXME: viewpoint entity */ - v3f vp = {-0.1f,1.8f,0.0f}; - m4x3_mulv( av->sk.final_mtx[ av->id_head-1 ], vp, player->cam1.co ); - v3_zero( player->cam1.angles ); - - v3f flat_dir, - vel_dir, - look_dir; - - v3_copy( player->rb.v, vel_dir ); - //v3_normalize( vel_dir ); - - float tti = s->land_dist; - v3f norm; - v3_copy( s->land_normal, norm ); - - if( s->state.activity == k_skate_activity_ground ) - { - tti = 0.0f; - v3_copy( player->rb.to_world[1], norm ); - } - - v3_muladds( vel_dir, norm, -v3_dot(vel_dir,norm), flat_dir ); - //v3_normalize( flat_dir ); - - v3_lerp( flat_dir, vel_dir, vg_clampf( tti / 2.0f, 0.4f, 1.0f ), look_dir ); - v3_lerp( s->state.vl, look_dir, 4.0f*vg.time_delta, s->state.vl ); - - skate_camera_vector_look( player->cam1.angles, s->state.vl, 1.0f, 0.25f ); + v3f vp = {-0.0f,1.8f,0.0f}; + m4x3_mulv( av->sk.final_mtx[ av->id_head-1 ], vp, player->fpv_pos ); + v3_muladds( player->fpv_pos, player->rb.to_world[0], + -0.35f, player->fpv_pos ); + v3_zero( player->fpv_angles ); + + v3_lerp( s->state.vl, player->rb.v, 4.0f*vg.time_delta, s->state.vl ); + player_vector_angles( player->fpv_angles, s->state.vl, 0.7f, 0.25f ); +#endif } VG_STATIC void skate_camera_thirdperson( player_instance *player ) @@ -1520,24 +1484,10 @@ VG_STATIC void skate_camera_thirdperson( player_instance *player ) v3f origin, dir, target; v3_copy( player->rb.co, origin ); v3_add( origin, (v3f){0.0f,1.35f,0.0f}, origin ); - v3_sub( origin, s->state.posl, dir ); - - if( v3_length2( dir ) < 0.1f*0.1f ) - v3_copy( (v3f){ 0.0f, 0.0f, 1.0f }, dir ); /* FIXME */ - else - v3_normalize( dir ); - - if( s->state.activity == k_skate_activity_air ) - dir[1] *= vg_maxf( 0.0f, 1.0f - (s->land_dist/2.0f) ); - dir[1] *= 0.0f; - v3_muladds( origin, dir, -2.0f, target ); - - v3_lerp( s->state.posl, target, vg.frame_delta * 15.0f, s->state.posl ); - v3_lerp( s->state.dirl, dir, 18.0f*vg.time_delta, s->state.dirl ); - - v3_copy( s->state.posl, player->cam3.co ); - skate_camera_vector_look( player->cam3.angles, s->state.dirl, 1.0f, 0.2f ); +#if 0 + player_set_follower_subject( player, origin ); +#endif } VG_STATIC void player__skate_post_animate( player_instance *player ) @@ -1545,12 +1495,17 @@ VG_STATIC void player__skate_post_animate( player_instance *player ) struct player_skate *s = &player->_skate; struct player_avatar *av = player->playeravatar; - v3_zero( player->cam1.co ); - v3_zero( player->cam1.angles ); - skate_camera_thirdperson( player ); skate_camera_firstperson( player ); +#if 0 + player->cam_angles_override_strength = 0.0f; + player->cam_position_override_strength = 0.0f; +#endif + + + player->cam_velocity_influence = 1.0f; + /* FIXME: Organize this. Its int wrong fucking place */ v3f vp0 = {0.0f,0.1f, 0.6f}, vp1 = {0.0f,0.1f,-0.6f}; @@ -1571,30 +1526,46 @@ VG_STATIC void player__skate_reset( player_instance *player, } VG_STATIC void player__skate_transition( player_instance *player, - v3f init_velocity ) + v3f init_velocity, + enum skate_activity init_acitivity ) { struct player_skate *s = &player->_skate; s->state.activity_prev = k_skate_activity_ground; - s->state.activity = k_skate_activity_air; + s->state.activity = init_acitivity; v3f dir; v3_copy( init_velocity, dir ); v3_normalize( dir ); + + vg_info( "init velocity: %f %f %f\n", init_velocity[0], + init_velocity[1], + init_velocity[2] ); q_axis_angle( player->rb.q, (v3f){0.0f,1.0f,0.0f}, - atan2f( dir[0], dir[2] ) ); - v3_copy( player->cam.pos, s->state.posl ); - - m3x3f temp; - euler_m3x3( player->cam.angles, temp ); - v3_muls( temp[2], -1.0f, s->state.dirl ); + atan2f( -dir[0], -dir[2] ) ); v3_muladds( player->rb.co, player->rb.to_world[1], 1.0f, s->state.cog ); v3_copy( init_velocity, s->state.cog_v ); + v3_copy( init_velocity, s->state.vl ); v3_copy( init_velocity, player->rb.v ); rb_update_transform( &player->rb ); -} + if( init_acitivity == k_skate_activity_air ) + { + player_approximate_best_trajectory( player ); + s->blend_fly = 1.0f; + } + else + s->blend_fly = 0.0f; + + s->blend_slide = 0.0f; + s->blend_z = 0.0f; + s->blend_x = 0.0f; + s->blend_stand = 0.0f; + s->blend_push = 0.0f; + s->blend_jump = 0.0f; + s->blend_airdir = 0.0f; +} #endif /* PLAYER_SKATE_C */