X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=b55187588a65b2c1a8c0afeb12dd544bf7450602;hb=2b7784846e2f2ee57ba336a2aa040adb2d0ca461;hp=0c76d8df5496117dedfcde8e235279d1c35c10b1;hpb=e9b84820514f4880082d97fff4fc709ac1a2dc83;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_common.c b/player_common.c index 0c76d8d..b551875 100644 --- a/player_common.c +++ b/player_common.c @@ -240,6 +240,35 @@ VG_STATIC void player__cam_iterate( player_instance *player ) player->cam.fov = vg_lerpf( player->cam.fov, player->cam_override_fov, player->cam_override_strength ); + + if( cl_cinema >= 0.0001f ){ + ent_camera *cam = NULL; + f32 min_dist = cl_cinema; + + world_instance *world = player->viewable_world; + for( u32 i=0; ient_camera); i++ ){ + ent_camera *c = mdl_arritm(&world->ent_camera,i); + + f32 dist = v3_dist( c->transform.co, player->rb.co ); + + if( dist < min_dist ){ + min_dist = dist; + cam = c; + } + } + + if( cam ){ + player->cam.fov = cam->fov; + v3_copy( cam->transform.co, player->cam.pos ); + v3f v0; + if( cl_cinema_fixed ) + mdl_transform_vector( &cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 ); + else v3_sub( player->rb.co, cam->transform.co, v0 ); + m3x3_mulv( player->invbasis, v0, v0 ); + player_vector_angles( player->cam.angles, v0, 1.0f, 0.0f ); + } + } + /* portal transitions */ player_camera_portal_correction( player ); }