From 76fe0c876421d6c0256fe602e67f88ab3c63d8f3 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 29 Jul 2015 11:14:00 -0700
Subject: [PATCH] Control eyes only if in HMD view or simulating

---
 interface/src/Application.cpp        | 2 +-
 interface/src/devices/EyeTracker.cpp | 1 +
 interface/src/devices/EyeTracker.h   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5861adc704..02056a94dc 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2295,7 +2295,7 @@ void Application::updateMyAvatarLookAtPosition() {
         } else {
             lookAtSpot = _myCamera.getPosition() + OculusManager::getMidEyePosition();
         }
-    } else if (eyeTracker->isTracking()) {
+    } else if (eyeTracker->isTracking() && (isHMDMode() || eyeTracker->isSimulating())) {
         //  Look at the point that the user is looking at.
         lookAtSpot = _myAvatar->getHead()->getEyePosition() +
             (_myAvatar->getHead()->getFinalOrientationInWorldFrame() * eyeTracker->getLookAtPosition());
diff --git a/interface/src/devices/EyeTracker.cpp b/interface/src/devices/EyeTracker.cpp
index f13dd0f61a..9e2737d156 100644
--- a/interface/src/devices/EyeTracker.cpp
+++ b/interface/src/devices/EyeTracker.cpp
@@ -130,6 +130,7 @@ void EyeTracker::setEnabled(bool enabled, bool simulate) {
     }
 
     _isEnabled = enabled && success;
+    _isSimulating = _isEnabled && simulate;
 
     if (!success) {
         // Display error dialog after updating _isEnabled.
diff --git a/interface/src/devices/EyeTracker.h b/interface/src/devices/EyeTracker.h
index cb970d5be5..c41d529e91 100644
--- a/interface/src/devices/EyeTracker.h
+++ b/interface/src/devices/EyeTracker.h
@@ -28,6 +28,7 @@ public:
     ~EyeTracker();
 
     bool isTracking() { return _isEnabled; }
+    bool isSimulating() { return _isSimulating; }
 
     glm::vec3 getLookAtPosition() { return _lookAtPosition; }  // From mid eye point in head frame.
     
@@ -43,6 +44,7 @@ private:
     
     bool _isInitialized = false;
     bool _isEnabled = false;
+    bool _isSimulating = false;
 
     glm::vec3 _lookAtPosition;
 };