Don't apply saccades to tracked eyes

interface/src/avatar/Head.cpp

@@ -17,11 +17,13 @@
 
 #include "Application.h"
 #include "Avatar.h"
+#include "DependencyManager.h"
 #include "GeometryUtil.h"
 #include "Head.h"
 #include "Menu.h"
 #include "Util.h"
 #include "devices/DdeFaceTracker.h"
+#include "devices/EyeTracker.h"
 #include "devices/Faceshift.h"
 
 using namespace std;
@@ -116,6 +118,9 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
                     applyEyelidOffset(getFinalOrientationInWorldFrame());
                 }
             }
+
+            auto eyeTracker = DependencyManager::get<EyeTracker>();
+            _isEyeTrackerConnected = eyeTracker->isTracking();
         }
         //  Twist the upper body to follow the rotation of the head, but only do this with my avatar,
         //  since everyone else will see the full joint rotations for other people.  
@@ -125,7 +130,7 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
         setTorsoTwist(currentTwist + (getFinalYaw() * BODY_FOLLOW_HEAD_FACTOR - currentTwist) * BODY_FOLLOW_HEAD_YAW_RATE);
     }
    
-    if (!(_isFaceTrackerConnected || billboard)) {
+    if (!(_isFaceTrackerConnected || _isEyeTrackerConnected || billboard)) {
         // Update eye saccades
         const float AVERAGE_MICROSACCADE_INTERVAL = 1.0f;
         const float AVERAGE_SACCADE_INTERVAL = 6.0f;

interface/src/devices/EyeTracker.cpp

@@ -140,6 +140,7 @@ void EyeTracker::setEnabled(bool enabled, bool simulate) {
 }
 
 void EyeTracker::reset() {
+    // Nothing to do.
 }
 
 QString EyeTracker::smiReturnValueToString(int value) {

libraries/avatars/src/AvatarData.cpp

@@ -194,6 +194,11 @@ QByteArray AvatarData::toByteArray() {
     if (_headData->_isFaceTrackerConnected) {
         setAtBit(bitItems, IS_FACESHIFT_CONNECTED);
     }
+    // eye tracker state
+    if (_headData->_isEyeTrackerConnected) {
+        setAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
+    }
+    // referential state
     if (_referential != NULL && _referential->isValid()) {
         setAtBit(bitItems, HAS_REFERENTIAL);
     }
@@ -431,6 +436,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
             + (oneAtBit(bitItems, HAND_STATE_FINGER_POINTING_BIT) ? IS_FINGER_POINTING_FLAG : 0);
 
         _headData->_isFaceTrackerConnected = oneAtBit(bitItems, IS_FACESHIFT_CONNECTED);
+        _headData->_isEyeTrackerConnected = oneAtBit(bitItems, IS_EYE_TRACKER_CONNECTED);
         bool hasReferential = oneAtBit(bitItems, HAS_REFERENTIAL);
 
         // Referential

libraries/avatars/src/AvatarData.h

@@ -77,21 +77,21 @@ const quint32 AVATAR_MOTION_SCRIPTABLE_BITS =
 
 const qint64 AVATAR_SILENCE_THRESHOLD_USECS = 5 * USECS_PER_SECOND;
 
-// Bitset of state flags - we store the key state, hand state, faceshift, chat circling, and existance of
+// Bitset of state flags - we store the key state, hand state, Faceshift, eye tracking, and existence of
 // referential data in this bit set. The hand state is an octal, but is split into two sections to maintain
 // backward compatibility. The bits are ordered as such (0-7 left to right).
 //     +-----+-----+-+-+-+--+
-//     |K0,K1|H0,H1|F|C|R|H2|
+//     |K0,K1|H0,H1|F|E|R|H2|
 //     +-----+-----+-+-+-+--+
 // Key state - K0,K1 is found in the 1st and 2nd bits
 // Hand state - H0,H1,H2 is found in the 3rd, 4th, and 8th bits
 // Faceshift - F is found in the 5th bit
-// Chat Circling - C is found in the 6th bit
+// Eye tracker - E is found in the 6th bit
 // Referential Data - R is found in the 7th bit
 const int KEY_STATE_START_BIT = 0; // 1st and 2nd bits
 const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits
 const int IS_FACESHIFT_CONNECTED = 4; // 5th bit
-const int UNUSED_AVATAR_STATE_BIT_5 = 5; // 6th bit (was CHAT_CIRCLING)
+const int IS_EYE_TRACKER_CONNECTED = 5; // 6th bit (was CHAT_CIRCLING)
 const int HAS_REFERENTIAL = 6; // 7th bit
 const int HAND_STATE_FINGER_POINTING_BIT = 7; // 8th bit
 

libraries/avatars/src/HeadData.cpp

@@ -32,6 +32,7 @@ HeadData::HeadData(AvatarData* owningAvatar) :
     _lookAtPosition(0.0f, 0.0f, 0.0f),
     _audioLoudness(0.0f),
     _isFaceTrackerConnected(false),
+    _isEyeTrackerConnected(false),
     _leftEyeBlink(0.0f),
     _rightEyeBlink(0.0f),
     _averageLoudness(0.0f),

libraries/avatars/src/HeadData.h

@@ -93,6 +93,7 @@ protected:
     glm::vec3 _lookAtPosition;
     float _audioLoudness;
     bool _isFaceTrackerConnected;
+    bool _isEyeTrackerConnected;
     float _leftEyeBlink;
     float _rightEyeBlink;
     float _averageLoudness;