Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2971,7 +2971,14 @@ void Application::getProjectionMatrix(glm::dmat4* projectionMatrix) { · 2970 unmodified lines | |||
| 2971 | void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, | 2971 | void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, |
| 2972 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { | 2972 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { |
| 2973 | 2973 | ||
| 2974 | // allow 3DTV/Oculus to override parameters from camera | ||
| 2974 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 2975 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 2976 | if (OculusManager::isConnected()) { | ||
| 2977 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | ||
| 2978 | |||
| 2979 | } else if (TV3DManager::isConnected()) { | ||
| 2980 | TV3DManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | ||
| 2981 | } | ||
| 2975 | } | 2982 | } |
| 2976 | 2983 | ||
| 2977 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { | 2984 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { |