X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=e0a77769d03e4019eda3bb6fd55c02610ef9442f;hb=bd3a7e904be0fc97e70761cc957a28609d366586;hp=3711405226dc0bc4fa88a144fb1f7e73ce758474;hpb=44459e0aa734b6a090d60a309e29a9a2a232c731;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_common.c b/player_common.c
index 3711405..e0a7776 100644
--- a/player_common.c
+++ b/player_common.c
@@ -73,7 +73,9 @@ VG_STATIC void player__cam_iterate( player_instance *player ){
    else{
       v3_copy( (v3f){-0.15f,1.75f,0.0f}, cc->fpv_viewpoint );
       v3_copy( (v3f){0.0f,0.0f,0.0f}, cc->fpv_offset );
-      v3_copy( (v3f){0.0f,1.4f,0.0f}, cc->tpv_offset );
+
+      f32 h = vg_lerpf( 0.4f, 1.4f, k_cam_height );
+      v3_copy( (v3f){0.0f,h,0.0f}, cc->tpv_offset );
       v3_add( cc->tpv_offset_extra, cc->tpv_offset, cc->tpv_offset );
    }
 
@@ -203,11 +205,13 @@ VG_STATIC void player__cam_iterate( player_instance *player ){
    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