History

Revert "get rid of redundant _displayViewFrustum and use _viewFrustum"

This reverts commit 6d385d9a75de786e0d1f583ad8448c30a9df2492.

ZappoMan committed 11 years ago

Commit e68e3fe1 parent 9753c824 files · +9 −7Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -2910,7 +2910,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 2909 unmodified lines
29102910 // transform by eye offset
29112911
29122912 // load the view frustum
2913− loadViewFrustum(whichCamera, _viewFrustum);
2913+ loadViewFrustum(whichCamera, _displayViewFrustum);
29142914
29152915 // flip x if in mirror mode (also requires reversing winding order for backface culling)
29162916 if (whichCamera.getMode() == CAMERA_MODE_MIRROR) {
@@ -3184,7 +3184,7 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 267 unmodified lines
31843184 float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const {
31853185
31863186 // allow 3DTV/Oculus to override parameters from camera
3187− _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
3187+ _displayViewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
31883188 if (OculusManager::isConnected()) {
31893189 OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
31903190