Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -2910,7 +2910,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 2909 unmodified lines | |||
| 2910 | // transform by eye offset | 2910 | // transform by eye offset |
| 2911 | 2911 | ||
| 2912 | // load the view frustum | 2912 | // load the view frustum |
| 2913 | loadViewFrustum(whichCamera, _displayViewFrustum); | 2913 | loadViewFrustum(whichCamera, _viewFrustum); |
| 2914 | 2914 | ||
| 2915 | // flip x if in mirror mode (also requires reversing winding order for backface culling) | 2915 | // flip x if in mirror mode (also requires reversing winding order for backface culling) |
| 2916 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { | 2916 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { |
| @@ -3184,7 +3184,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 267 unmodified lines | |||
| 3184 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { | 3184 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { |
| 3185 | 3185 | ||
| 3186 | // allow 3DTV/Oculus to override parameters from camera | 3186 | // allow 3DTV/Oculus to override parameters from camera |
| 3187 | _displayViewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 3187 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 3188 | if (OculusManager::isConnected()) { | 3188 | if (OculusManager::isConnected()) { |
| 3189 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 3189 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 3190 | 3190 | ||