X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=eeed469d04c52c8b7cdbf36d04709a6eaf967ef3;hb=510bec78dcd9d91dd57d8995b573b1fff5256821;hp=203f52bc28e4500acfbe38a38f8442c8da909169;hpb=333430b27b5f9f73cbe9ad7921a4735aaff444f1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_common.c b/player_common.c index 203f52b..eeed469 100644 --- a/player_common.c +++ b/player_common.c @@ -188,6 +188,8 @@ static void player__cam_iterate(void){ v3f pco; v4f pq; rb_extrapolate( &localplayer.rb, pco, pq ); + v3_muladds( pco, localplayer.holdout_pose.root_co, + localplayer.holdout_time, pco ); v3_lerp( cc->tpv_lpf, pco, 20.0f*vg.time_frame_delta, cc->tpv_lpf ); /* now move into world */ @@ -203,13 +205,6 @@ static void player__cam_iterate(void){ v3_muladds( tpv_offset, cc->cam_velocity_smooth, -0.025f, tpv_offset ); v3_add( tpv_origin, tpv_offset, tpv_pos ); -#if 0 - f32 t; v3f n; - if( spherecast_world( world_current_instance(), tpv_origin, tpv_pos, - 0.2f, &t, n ) != -1 ){ - v3_lerp( tpv_origin, tpv_pos, t, tpv_pos ); - } -#endif /* * Blend cameras