OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- block direct comparisons of TAngle with floats

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-26 17:21:34 +02:00
commit 3d2578820b
19 changed files with 64 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/rendering/r_utility.cpp
View file

@ -180,8 +180,8 @@ DEFINE_GLOBAL(LocalViewPitch);
void R_SetFOV (FRenderViewpoint &viewpoint, DAngle fov)
{
if (fov < 5.) fov = DAngle::fromDeg(5.);
else if (fov > 170.) fov = DAngle::fromDeg(170.);
if (fov < DAngle::fromDeg(5.)) fov = DAngle::fromDeg(5.);
else if (fov > DAngle::fromDeg(170.)) fov = DAngle::fromDeg(170.);
if (fov != viewpoint.FieldOfView)
{
viewpoint.FieldOfView = fov;
@ -263,7 +263,7 @@ void R_SetWindow (FRenderViewpoint &viewpoint, FViewWindow &viewwindow, int wind
if (viewwindow.centerxwide != viewwindow.centerx)
{ // centerxwide is what centerx would be if the display was not widescreen
fov = DAngle::ToDegrees(2 * atan(viewwindow.centerx * tan(fov.Radians()/2) / double(viewwindow.centerxwide)));
if (fov > 170.) fov = DAngle::fromDeg(170.);
if (fov > DAngle::fromDeg(170.)) fov = DAngle::fromDeg(170.);
}
viewwindow.FocalTangent = tan(fov.Radians() / 2);
}