Merge pull request #339 from lukaspj/fix/forcefov-on-guitscontrol

ForceFOV is not working on GuiTSControl.
This commit is contained in:
Brian Roberts 2020-10-28 20:38:25 -05:00 committed by GitHub
commit 0e2fff00d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -362,9 +362,6 @@ void GuiTSCtrl::_internalRender(RectI guiViewport, RectI renderViewport, Frustum
GFXTarget *origTarget = GFX->getActiveRenderTarget();
S32 origStereoTarget = GFX->getCurrentStereoTarget();
if (mForceFOV != 0)
mLastCameraQuery.fov = mDegToRad(mForceFOV);
if (mCameraZRot)
{
MatrixF rotMat(EulerF(0, 0, mDegToRad(mCameraZRot)));
@ -677,6 +674,9 @@ void GuiTSCtrl::onRender(Point2I offset, const RectI &updateRect)
F32 renderHeight = F32(renderSize.y);
F32 aspectRatio = renderWidth / renderHeight;
if (mForceFOV != 0)
mLastCameraQuery.fov = mDegToRad(mForceFOV);
// Use the FOV to calculate the viewport height scale
// then generate the width scale from the aspect ratio.
if (!mLastCameraQuery.ortho)