Showing the changes to interface/src/Application.cpp (1 of 31 files). Show all
Unified · Split
| @@ -2954,7 +2954,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 2953 unmodified lines | |||
| 2954 | // transform by eye offset | 2954 | // transform by eye offset |
| 2955 | 2955 | ||
| 2956 | // load the view frustum | 2956 | // load the view frustum |
| 2957 | loadViewFrustum(whichCamera, _viewFrustum); | 2957 | loadViewFrustum(whichCamera, _displayViewFrustum); |
| 2958 | 2958 | ||
| 2959 | // flip x if in mirror mode (also requires reversing winding order for backface culling) | 2959 | // flip x if in mirror mode (also requires reversing winding order for backface culling) |
| 2960 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { | 2960 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { |
| @@ -3228,7 +3228,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 267 unmodified lines | |||
| 3228 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { | 3228 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { |
| 3229 | 3229 | ||
| 3230 | // allow 3DTV/Oculus to override parameters from camera | 3230 | // allow 3DTV/Oculus to override parameters from camera |
| 3231 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 3231 | _displayViewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 3232 | if (OculusManager::isConnected()) { | 3232 | if (OculusManager::isConnected()) { |
| 3233 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 3233 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 3234 | 3234 | ||