From 22961fcc9ddcd3903060be1384eaedcc9503eedd Mon Sep 17 00:00:00 2001
From: Sam Gondelman <samuel_gondelman@brown.edu>
Date: Mon, 15 Jun 2015 15:44:56 -0700
Subject: [PATCH] added camera mode to keep player in center of view

---
 interface/src/Application.cpp | 15 +++++++++++++--
 interface/src/Application.h   |  1 +
 interface/src/Menu.cpp        |  3 +++
 interface/src/Menu.h          |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a1ab6d35ae..a0e90cf2b5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -901,13 +901,18 @@ void Application::paintGL() {
         }
 
     } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
-        _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
-            _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * _myAvatar->getBoomLength() * _myAvatar->getScale());
         if (OculusManager::isConnected()) {
             _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation());
         } else {
             _myCamera.setRotation(_myAvatar->getHead()->getOrientation());
         }
+        if (Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
+            _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
+                                  _myCamera.getRotation() * glm::vec3(0.0f, 0.0f, 1.0f) * _myAvatar->getBoomLength() * _myAvatar->getScale());
+        } else {
+            _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
+                                  _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, 1.0f) * _myAvatar->getBoomLength() * _myAvatar->getScale());
+        }
 
     } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
         _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
@@ -2384,6 +2389,12 @@ void Application::cameraMenuChanged() {
     }
 }
 
+void Application::rotationModeChanged() {
+    if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
+        _myAvatar->setHeadPitch(0);
+    }
+}
+
 void Application::updateCamera(float deltaTime) {
     PerformanceTimer perfTimer("updateCamera");
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 68bf60781a..7e9d9b201c 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -453,6 +453,7 @@ private slots:
     void setEnable3DTVMode(bool enable3DTVMode);
     void setEnableVRMode(bool enableVRMode);
     void cameraMenuChanged();
+    void rotationModeChanged();
 
     glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 6242318170..d27f3e02a6 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -254,6 +254,9 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FullscreenMirror,
         0, // QML Qt::Key_H,
         false, qApp, SLOT(cameraMenuChanged()));
+    
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
+                                           0, false, qApp, SLOT(rotationModeChanged()));
 
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::HMDTools,
 #ifdef Q_OS_MAC
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 6107744abc..ebd6931bdb 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -197,6 +197,7 @@ namespace MenuOption {
     const QString FrameTimer = "Show Timer";
     const QString Fullscreen = "Fullscreen";
     const QString FullscreenMirror = "Fullscreen Mirror";
+    const QString CenterPlayerInView = "Center Player In View";
     const QString GlowWhenSpeaking = "Glow When Speaking";
     const QString NamesAboveHeads = "Names Above Heads";
     const QString GoToUser = "Go To User";