X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_animation.h;h=b9e28de2b5ad10398acc75fc666fba18fb1efdcb;hb=147ecb98ce2d6a2b24b0d86436913a46888dea84;hp=4d579653e643b4801fa348283d6d9d6633e9a20f;hpb=777083e1f715a26d3f68be4ba5bdf2cbcaa84a05;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_animation.h b/player_animation.h index 4d57965..b9e28de 100644 --- a/player_animation.h +++ b/player_animation.h @@ -336,15 +336,21 @@ VG_STATIC void player_animate_camera(void) /* Look angles */ v3_lerp( phys->vl, phys->rb.v, 0.05f, phys->vl ); + player.fgrind = vg_lerpf( player.fgrind, phys->grind, vg.time_delta ); + float yaw = atan2f( phys->vl[0], -phys->vl[2] ), - pitch = atan2f( -phys->vl[1], - sqrtf( - phys->vl[0]*phys->vl[0] + phys->vl[2]*phys->vl[2] - )) * 0.7f; + pitch = atan2f + ( + -phys->vl[1], + sqrtf + ( + phys->vl[0]*phys->vl[0] + phys->vl[2]*phys->vl[2] + ) + ) + * 0.7f + vg_lerpf( 0.30f, 0.90f, player.fgrind ); player.angles[0] = yaw; - player.angles[1] = vg_lerpf( player.angles[1], pitch + 0.30f, - player.fonboard ); + player.angles[1] = vg_lerpf( player.angles[1], pitch, player.fonboard ); /* Camera shake */ static v2f shake_damp = {0.0f,0.0f};