X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=a7c42035af4c62c0734a0df048dda5d07be1493f;hb=0a33f65eecb5e75cddaefa08d3a5eb1a301d0479;hp=29ae05068a284d85a2c5fd013571232ae6d6878a;hpb=192990d6d24e53749ca046fef808a63cf162ab8a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_common.c b/player_common.c index 29ae050..a7c4203 100644 --- a/player_common.c +++ b/player_common.c @@ -57,21 +57,25 @@ VG_STATIC void player_camera_portal_correction( player_instance *player ) } } +static v3f TEMP_TPV_EXTRA; + VG_STATIC void player__cam_iterate( player_instance *player ) { struct player_avatar *av = player->playeravatar; - if( player->subsystem == k_player_subsystem_walk ) - { + if( player->subsystem == k_player_subsystem_walk ){ v3_copy( (v3f){-0.1f,1.8f,0.0f}, player->fpv_viewpoint ); v3_copy( (v3f){0.0f,0.0f,0.0f}, player->fpv_offset ); v3_copy( (v3f){0.0f,1.4f,0.0f}, player->tpv_offset ); } - else - { - v3_copy( (v3f){0.0f,1.8f,0.0f}, player->fpv_viewpoint ); + else{ + v3_copy( (v3f){-0.15f,1.75f,0.0f}, player->fpv_viewpoint ); +#if 0 v3_copy( (v3f){-0.35f,0.0f,0.0f}, player->fpv_offset ); +#endif + v3_copy( (v3f){0.0f,0.0f,0.0f}, player->fpv_offset ); v3_copy( (v3f){0.0f,1.4f,0.0f}, player->tpv_offset ); + v3_add( TEMP_TPV_EXTRA, player->tpv_offset, player->tpv_offset ); } player->cam_velocity_constant = 0.25f; @@ -115,7 +119,7 @@ VG_STATIC void player__cam_iterate( player_instance *player ) /* fov -- simple blend */ /* FIXME: cl_fov */ - player->cam.fov = vg_lerpf( 97.0f, 118.0f, player->camera_type_blend ); + player->cam.fov = vg_lerpf( 97.0f, 128.0f, player->camera_type_blend ); /* * first person camera