From 01bef6be6dd30ab7c31bde26eced40c9b3af54f4 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 8 Oct 2014 15:28:29 -0700 Subject: [PATCH] remove unused cameraPushback variable --- interface/src/Application.cpp | 14 ++++++-------- interface/src/Application.h | 1 - 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 16537ee6dc..c90a5ade9f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -153,7 +153,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : _lastQueriedViewFrustum(), _lastQueriedTime(usecTimestampNow()), _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)), - _cameraPushback(0.0f), _scaleMirror(1.0f), _rotateMirror(0.0f), _raiseMirror(0.0f), @@ -658,13 +657,12 @@ void Application::paintGL() { ViewFrustumOffset viewFrustumOffset = Menu::getInstance()->getViewFrustumOffset(); // set the camera to third-person view but offset so we can see the frustum - _viewFrustumOffsetCamera.setPosition(_myCamera.getPosition()); - _viewFrustumOffsetCamera.setRotation(_myCamera.getRotation() * glm::quat(glm::radians(glm::vec3( - viewFrustumOffset.pitch, viewFrustumOffset.yaw, viewFrustumOffset.roll)))); - // TODO: PHILIP - // Fix Frustum offset and up - //_viewFrustumOffsetCamera.setUpShift(viewFrustumOffset.up); - //_viewFrustumOffsetCamera.setDistance(viewFrustumOffset.distance); + glm::quat frustumRotation = glm::quat(glm::radians(glm::vec3(viewFrustumOffset.pitch, viewFrustumOffset.yaw, viewFrustumOffset.roll))); + + _viewFrustumOffsetCamera.setPosition(_myCamera.getPosition() + + frustumRotation * glm::vec3(0.0f, viewFrustumOffset.up, -viewFrustumOffset.distance)); + + _viewFrustumOffsetCamera.setRotation(_myCamera.getRotation() * frustumRotation); _viewFrustumOffsetCamera.initialize(); // force immediate snap to ideal position and orientation _viewFrustumOffsetCamera.update(1.f/_fps); diff --git a/interface/src/Application.h b/interface/src/Application.h index ca26cffab8..248c4325bf 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -519,7 +519,6 @@ private: QRect _mirrorViewRect; RearMirrorTools* _rearMirrorTools; - float _cameraPushback; glm::mat4 _untranslatedViewMatrix; glm::vec3 _viewMatrixTranslation; glm::mat4 _projectionMatrix;