From 39042f61cd8a535d0afb7e87e2110230d8824508 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Wed, 26 Nov 2014 19:57:18 -0800
Subject: [PATCH 1/2] 1P mirror can lean fwd/back

---
 interface/src/Application.cpp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 58b28fcef9..a1f374c3c6 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -650,20 +650,11 @@ void Application::paintGL() {
         }
 
     } else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
-        //Only behave like a true mirror when in the OR
-        if (OculusManager::isConnected()) {
-            _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
-            _myCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
-                                  glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
-                                  (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
-                                   glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
-        } else {
-            _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
-            _myCamera.setPosition(_myAvatar->getHead()->getEyePosition() +
-                                  glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
-                                  (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
-                                  glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
-        }
+        _myCamera.setRotation(_myAvatar->getWorldAlignedOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f)));
+        _myCamera.setPosition(_myAvatar->getDefaultEyePosition() +
+                              glm::vec3(0, _raiseMirror * _myAvatar->getScale(), 0) +
+                              (_myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, _rotateMirror, 0.0f))) *
+                               glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror);
     }
 
     // Update camera position

From 709a40516d5ffcc2e3fc5b25c152f8ba3e91c970 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Sat, 29 Nov 2014 12:17:38 -0800
Subject: [PATCH 2/2] Add auto-turn of body when head is beyond 45 degrees

---
 examples/headMove.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/examples/headMove.js b/examples/headMove.js
index df5c858b46..4d2e4ded07 100644
--- a/examples/headMove.js
+++ b/examples/headMove.js
@@ -19,6 +19,7 @@ var warpPosition = { x: 0, y: 0, z: 0 };
 
 var hipsToEyes;
 var restoreCountdownTimer;
+var headTurningTimer = 0.0;
 
 //  Overlays to show target location 
 
@@ -168,6 +169,20 @@ function update(deltaTime) {
             restoreCountDownTimer = 0.0;
         }
     }
+    var HEAD_TURN_TIME = 0.10;
+    var HEAD_TURN_DEGREES = 4.0; 
+    var HEAD_TURN_START_ANGLE = 45.0;
+    var currentYaw = MyAvatar.getHeadFinalYaw();
+    if (Math.abs(currentYaw) > HEAD_TURN_START_ANGLE) {
+        headTurningTimer += deltaTime;
+        if (headTurningTimer > HEAD_TURN_TIME) {
+            headTurningTimer = 0.0;
+            MyAvatar.orientation = Quat.multiply(Quat.fromPitchYawRollDegrees(0, (currentYaw > 0) ? HEAD_TURN_DEGREES: -HEAD_TURN_DEGREES, 0), 
+                                                 MyAvatar.orientation);
+        }
+    } else {
+        headTurningTimer = 0.0;
+    }
 }
 
 Controller.keyPressEvent.connect(function(event) {