From c832fd969a1de5cb3b1e27de7781a855387bd5ac Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 6 May 2015 11:26:46 -0700
Subject: [PATCH] Removing off-axis projection from menu

---
 interface/src/Application.cpp | 12 ------------
 interface/src/Menu.cpp        |  1 -
 interface/src/Menu.h          |  1 -
 3 files changed, 14 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1447478b5f..35912735f4 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2243,18 +2243,6 @@ void Application::updateCamera(float deltaTime) {
     PerformanceTimer perfTimer("updateCamera");
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::updateCamera()");
-
-    if (!OculusManager::isConnected() && !TV3DManager::isConnected() &&
-            Menu::getInstance()->isOptionChecked(MenuOption::OffAxisProjection)) {
-        FaceTracker* tracker = getActiveFaceTracker();
-        if (tracker) {
-            const float EYE_OFFSET_SCALE = 0.025f;
-            glm::vec3 position = tracker->getHeadTranslation() * EYE_OFFSET_SCALE;
-            float xSign = (_myCamera.getMode() == CAMERA_MODE_MIRROR) ? 1.0f : -1.0f;
-            _myCamera.setEyeOffsetPosition(glm::vec3(position.x * xSign, position.y, -position.z));
-            updateProjectionMatrix();
-        }
-    }
 }
 
 void Application::updateDialogs(float deltaTime) {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 8070bd5555..5a1c1decc8 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -282,7 +282,6 @@ Menu::Menu() {
                                            Qt::CTRL | Qt::SHIFT | Qt::Key_1, false,
                                            &nodeBounds, SLOT(setShowEntityNodes(bool)));
 
-    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::OffAxisProjection, 0, false);
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::TurnWithHead, 0, false);
 
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Stats);
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 7d105687ab..195f5ae504 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -213,7 +213,6 @@ namespace MenuOption {
     const QString MuteEnvironment = "Mute Environment";
     const QString NoFaceTracking = "None";
     const QString OctreeStats = "Entity Statistics";
-    const QString OffAxisProjection = "Off-Axis Projection";
     const QString OnlyDisplayTopTen = "Only Display Top Ten";
     const QString PackageModel = "Package Model...";
     const QString Pair = "Pair";