From 0f234d739e691cad11201d8047525438116417fd Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 12 Jun 2013 21:44:49 -0700 Subject: [PATCH] remove Camera menu from frustum debugging, because its obsolete and only causes problems --- interface/src/Application.cpp | 13 +------------ interface/src/Application.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 75cda7be85..0db20f3526 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1304,9 +1304,6 @@ void Application::initMenu() { _frustumOn->setShortcut(Qt::SHIFT | Qt::Key_F); (_viewFrustumFromOffset = frustumMenu->addAction( "Use Offset Camera", this, SLOT(setFrustumOffset(bool)), Qt::SHIFT | Qt::Key_O))->setCheckable(true); - (_cameraFrustum = frustumMenu->addAction("Switch Camera"))->setCheckable(true); - _cameraFrustum->setChecked(true); - _cameraFrustum->setShortcut(Qt::SHIFT | Qt::Key_C); _frustumRenderModeAction = frustumMenu->addAction( "Render Mode", this, SLOT(cycleFrustumRenderMode()), Qt::SHIFT | Qt::Key_R); updateFrustumRenderModeAction(); @@ -1717,15 +1714,7 @@ void Application::updateAvatar(float deltaTime) { // void Application::loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum) { // We will use these below, from either the camera or head vectors calculated above - glm::vec3 position; - - // Camera or Head? - if (_cameraFrustum->isChecked()) { - position = camera.getPosition(); - } else { - position = _myAvatar.getHeadJointPosition(); - } - + glm::vec3 position(camera.getPosition()); float fov = camera.getFieldOfView(); float nearClip = camera.getNearClip(); float farClip = camera.getFarClip(); diff --git a/interface/src/Application.h b/interface/src/Application.h index 276c913fb8..4d99d73001 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -203,7 +203,6 @@ private: QAction* _destructiveAddVoxel; // when doing voxel editing do we want them to be destructive QAction* _frustumOn; // Whether or not to display the debug view frustum QAction* _viewFrustumFromOffset; // Whether or not to offset the view of the frustum - QAction* _cameraFrustum; // which frustum to look at QAction* _fullScreenMode; // whether we are in full screen mode QAction* _frustumRenderModeAction; QAction* _settingsAutosave; // Whether settings are saved automatically