From 38baeabbe5bf4e4625da9c1242140acbe418a1da Mon Sep 17 00:00:00 2001
From: 1P-Cusack <1p-cusack@1stplayable.com>
Date: Mon, 3 Jul 2017 13:52:06 -0400
Subject: [PATCH 1/2] Add View->Enter First Person Mode in HMD checkbox.

When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
---
 interface/src/Application.cpp | 6 ++++++
 interface/src/Menu.cpp        | 3 +++
 interface/src/Menu.h          | 1 +
 3 files changed, 10 insertions(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 75bcee0703..99ff486d5d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6900,6 +6900,12 @@ void Application::updateDisplayMode() {
     // reset the avatar, to set head and hand palms back to a reasonable default pose.
     getMyAvatar()->reset(false);
 
+    // switch to first person if entering hmd and setting is checked
+    if (isHmd && menu->isOptionChecked(MenuOption::FirstPersonHMD)) {
+        menu->setIsOptionChecked(MenuOption::FirstPerson, true);
+        cameraMenuChanged();
+    }
+
     Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
 }
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 7d4535c681..9bda575305 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -258,6 +258,9 @@ Menu::Menu() {
     // View > Overlays
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
 
+    // View > Enter First Person Mode in HMD
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, false);
+
     // Navigate menu ----------------------------------
     MenuWrapper* navigateMenu = addMenu("Navigate");
 
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index cc8e67c8f7..1848a4add7 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -105,6 +105,7 @@ namespace MenuOption {
     const QString ExpandPhysicsSimulationTiming = "Expand /physics";
     const QString ExpandUpdateTiming = "Expand /update";
     const QString FirstPerson = "First Person";
+    const QString FirstPersonHMD = "Enter First Person Mode in HMD";
     const QString FivePointCalibration = "5 Point Calibration";
     const QString FixGaze = "Fix Gaze (no saccade)";
     const QString Forward = "Forward";

From 77001712abec8cba03815bfaf2a1c3acabd8b041 Mon Sep 17 00:00:00 2001
From: 1P-Cusack <1p-cusack@1stplayable.com>
Date: Fri, 7 Jul 2017 15:35:32 -0400
Subject: [PATCH 2/2] Default 'Enter First Person Mode in HMD' to true.

---
 interface/src/Menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 9bda575305..042719362b 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -259,7 +259,7 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
 
     // View > Enter First Person Mode in HMD
-    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, false);
+    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);
 
     // Navigate menu ----------------------------------
     MenuWrapper* navigateMenu = addMenu("Navigate");