diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2d29bd3f33..a6b1b45ea7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3289,10 +3289,10 @@ void Application::loadTranslatedViewMatrix(const glm::vec3& translation) { translation.z + _viewMatrixTranslation.z); } -void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, - float& far, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { +void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, + float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { - _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, near, far, nearClipPlane, farClipPlane); + _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); } void Application::displayOverlay() { diff --git a/interface/src/Application.h b/interface/src/Application.h index f0e0c14973..31954d53c1 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -189,8 +189,8 @@ public: const glm::mat4& getShadowMatrix() const { return _shadowMatrix; } /// Computes the off-axis frustum parameters for the view frustum, taking mirroring into account. - void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& near, - float& far, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const; + void computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, + float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const; virtual void nodeAdded(Node* node); virtual void nodeKilled(Node* node);