From 03ce8081a4815def879dec40914f4acc7ce8852a Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 4 Nov 2014 11:44:47 -0800 Subject: [PATCH] Oh, when will I learn not to use "near" and "far" as variable names? --- interface/src/devices/OculusManager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp index b7884705e1..23cd52d946 100644 --- a/interface/src/devices/OculusManager.cpp +++ b/interface/src/devices/OculusManager.cpp @@ -514,8 +514,9 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p glMatrixMode(GL_PROJECTION); glLoadIdentity(); const ovrFovPort& port = _eyeFov[_activeEyeIndex]; - float near = whichCamera.getNearClip(), far = whichCamera.getFarClip(); - glFrustum(-near * port.LeftTan, near * port.RightTan, -near * port.DownTan, near * port.UpTan, near, far); + float nearClip = whichCamera.getNearClip(), farClip = whichCamera.getFarClip(); + glFrustum(-nearClip * port.LeftTan, nearClip * port.RightTan, -nearClip * port.DownTan, + nearClip * port.UpTan, nearClip, farClip); glViewport(_eyeRenderViewport[eye].Pos.x, _eyeRenderViewport[eye].Pos.y, _eyeRenderViewport[eye].Size.w, _eyeRenderViewport[eye].Size.h);