From 997a10c98170a88fb924153745c8aa3a51c531a5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 22 May 2013 18:56:38 -0700
Subject: [PATCH] correct the sign of yaw for oculus

---
 interface/src/Application.cpp   | 2 +-
 interface/src/Head.cpp          | 8 ++++----
 interface/src/OculusManager.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9a8c44a772..1992ab678b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1377,7 +1377,7 @@ void Application::updateAvatar(float deltaTime) {
         float yaw, pitch, roll;
         OculusManager::getEulerAngles(yaw, pitch, roll);
     
-        _myAvatar.getHead().setYaw(-yaw);
+        _myAvatar.getHead().setYaw(yaw);
         _myAvatar.getHead().setPitch(pitch);
         _myAvatar.getHead().setRoll(roll);
     }
diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp
index 06f00ad78c..2f50e30b92 100644
--- a/interface/src/Head.cpp
+++ b/interface/src/Head.cpp
@@ -131,12 +131,12 @@ void Head::calculateGeometry(bool lookingInMirror) {
     //generate orientation directions based on Euler angles...
     
     float pitch =  _pitch;
-    float yaw   = -_yaw;
-    float roll  = -_roll;
+    float yaw   = _yaw;
+    float roll  = _roll;
     
     if (lookingInMirror) {
-        yaw   =  _yaw;
-        roll  =  _roll;
+        yaw   =  -_yaw;
+        roll  =  -_roll;
     }
 
     _orientation.setToIdentity();
diff --git a/interface/src/OculusManager.cpp b/interface/src/OculusManager.cpp
index f07741a3ec..e0272ac8ef 100644
--- a/interface/src/OculusManager.cpp
+++ b/interface/src/OculusManager.cpp
@@ -38,7 +38,7 @@ void OculusManager::connect() {
 
 void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) {
 #ifdef __APPLE__
-    _sensorFusion.GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CW, Handed_R>(&yaw, &pitch, &roll);
+    _sensorFusion.GetOrientation().GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
     
     // convert each angle to degrees
     yaw = glm::degrees(yaw);