qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 00:24:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Use a better calculation for fov_y

Browse source 
This avoids the possibility of a singularity (and thus the temptation to
use Sys_Error). While the rendering is rubbish, 0 degrees is allowed
because values less than 1 should be allowed, but where does one stop?
170 is the maximum in order to avoid any issues with (near) parallel or
inverted frustum planes (or other fun things) in the low level code.
This commit is contained in:
Bill Currie 2022-03-18 11:03:37 +09:00
parent 2b72506868
commit c8c742b240
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/video/renderer/r_screen.c
View file

@ -101,18 +101,11 @@ R_SetVrect (const vrect_t *vrectin, vrect_t *vrect, int lineadj)
static float __attribute__((pure)) static float __attribute__((pure))
CalcFov (float fov_x, float width, float height) CalcFov (float fov_x, float width, float height)
{ {
float a, x; double f = fov_x * M_PI / 360;
double c = cos(f);
double s = sin(f);
if (fov_x < 1 || fov_x > 179) return 360 * atan2 (s * height, c * width) / M_PI;
Sys_Error ("Bad fov: %f", fov_x);
x = width / tan (fov_x * (M_PI / 360));
a = (x == 0) ? 90 : atan (height / x); // 0 shouldn't happen
a = a * (360 / M_PI);
return a;
} }
static void static void
@ -136,7 +129,7 @@ SCR_CalcRefdef (void)
refdef->vrect.width, refdef->vrect.height); refdef->vrect.width, refdef->vrect.height);
// bound field of view // bound field of view
Cvar_SetValue (scr_fov, bound (1, scr_fov->value, 170)); Cvar_SetValue (scr_fov, bound (0, scr_fov->value, 170));
refdef->fov_y = CalcFov (refdef->fov_x, refdef->vrect.width, refdef->fov_y = CalcFov (refdef->fov_x, refdef->vrect.width,
refdef->vrect.height); refdef->vrect.height);