Update Facetrackers

interface/src/devices/DdeFaceTracker.cpp

@@ -50,6 +50,8 @@ DdeFaceTracker::DdeFaceTracker() :
 }
 
 DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
+    _host(host),
+    _port(port),
     _lastReceiveTimestamp(0),
     _reset(false),
     _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
@@ -63,9 +65,7 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
     _browUpRightIndex(18),
     _mouthSmileLeftIndex(28),
     _mouthSmileRightIndex(29),
-    _jawOpenIndex(21),
-    _host(host),
-    _port(port)
+    _jawOpenIndex(21)
 {
     _blendshapeCoefficients.resize(NUM_EXPRESSION);
     
@@ -80,18 +80,6 @@ DdeFaceTracker::~DdeFaceTracker() {
     }
 }
 
-void DdeFaceTracker::init() {
-    
-}
-
-void DdeFaceTracker::reset() {
-    _reset  = true;
-}
-
-void DdeFaceTracker::update() {
-    
-}
-
 void DdeFaceTracker::setEnabled(bool enabled) {
     // isOpen() does not work as one might expect on QUdpSocket; don't test isOpen() before closing socket.
     _udpSocket.close();

interface/src/devices/DdeFaceTracker.h

@@ -23,12 +23,10 @@ class DdeFaceTracker : public FaceTracker, public Dependency {
     SINGLETON_DEPENDENCY
     
 public:
-    //initialization
-    void init();
-    void reset();
-    void update();
-    
-    bool isActive() const;
+    virtual void reset() { _reset = true; }
+
+    virtual bool isActive() const;
+    virtual bool isTracking() const { return isActive(); }
     
     float getLeftBlink() const { return getBlendshapeCoefficient(_leftBlinkIndex); }
     float getRightBlink() const { return getBlendshapeCoefficient(_rightBlinkIndex); }

interface/src/devices/Faceshift.cpp

@@ -25,37 +25,11 @@ using namespace fs;
 
 using namespace std;
 
+const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost";
 const quint16 FACESHIFT_PORT = 33433;
-float STARTING_FACESHIFT_FRAME_TIME = 0.033f;
+const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
 
 Faceshift::Faceshift() :
-    _tcpEnabled(true),
-    _tcpRetryCount(0),
-    _lastTrackingStateReceived(0),
-    _averageFrameTime(STARTING_FACESHIFT_FRAME_TIME),
-    _headAngularVelocity(0),
-    _headLinearVelocity(0),
-    _lastHeadTranslation(0),
-    _filteredHeadTranslation(0),
-    _eyeGazeLeftPitch(0.0f),
-    _eyeGazeLeftYaw(0.0f),
-    _eyeGazeRightPitch(0.0f),
-    _eyeGazeRightYaw(0.0f),
-    _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
-    _rightBlinkIndex(1),
-    _leftEyeOpenIndex(8),
-    _rightEyeOpenIndex(9),
-    _browDownLeftIndex(14),
-    _browDownRightIndex(15),
-    _browUpCenterIndex(16),
-    _browUpLeftIndex(17),
-    _browUpRightIndex(18),
-    _mouthSmileLeftIndex(28),
-    _mouthSmileRightIndex(29),
-    _jawOpenIndex(21),
-    _longTermAverageEyePitch(0.0f),
-    _longTermAverageEyeYaw(0.0f),
-    _longTermAverageInitialized(false),
     _eyeDeflection("faceshiftEyeDeflection", DEFAULT_FACESHIFT_EYE_DEFLECTION),
     _hostname("faceshiftHostname", DEFAULT_FACESHIFT_HOSTNAME)
 {
@@ -71,31 +45,15 @@ Faceshift::Faceshift() :
 #endif
 }
 
+#ifdef HAVE_FACESHIFT
 void Faceshift::init() {
-#ifdef HAVE_FACESHIFT
     setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
-#endif
 }
 
-bool Faceshift::isConnectedOrConnecting() const {
-    return _tcpSocket.state() == QAbstractSocket::ConnectedState ||
-    (_tcpRetryCount == 0 && _tcpSocket.state() != QAbstractSocket::UnconnectedState);
-}
-
-bool Faceshift::isActive() const {
-#ifdef HAVE_FACESHIFT
-    const quint64 ACTIVE_TIMEOUT_USECS = 1000000;
-    return (usecTimestampNow() - _lastTrackingStateReceived) < ACTIVE_TIMEOUT_USECS;
-#else
-    return false;
-#endif
-}
-
-void Faceshift::update() {
+void Faceshift::update(float deltaTime) {
     if (!isActive()) {
         return;
     }
-    PerformanceTimer perfTimer("faceshift");
     // get the euler angles relative to the window
     glm::vec3 eulers = glm::degrees(safeEulerAngles(_headRotation * glm::quat(glm::radians(glm::vec3(
         (_eyeGazeLeftPitch + _eyeGazeRightPitch) / 2.0f, (_eyeGazeLeftYaw + _eyeGazeRightYaw) / 2.0f, 0.0f)))));
@@ -116,14 +74,28 @@ void Faceshift::update() {
 }
 
 void Faceshift::reset() {
-#ifdef HAVE_FACESHIFT
     if (_tcpSocket.state() == QAbstractSocket::ConnectedState) {
         string message;
         fsBinaryStream::encode_message(message, fsMsgCalibrateNeutral());
         send(message);
     }
     _longTermAverageInitialized = false;
+}
+
+bool Faceshift::isActive() const {
+    const quint64 ACTIVE_TIMEOUT_USECS = 1000000;
+    return (usecTimestampNow() - _lastTrackingStateReceived) < ACTIVE_TIMEOUT_USECS;
+}
+
+bool Faceshift::isTracking() const {
+    return isActive() && _tracking;
+}
 #endif
+
+
+bool Faceshift::isConnectedOrConnecting() const {
+    return _tcpSocket.state() == QAbstractSocket::ConnectedState ||
+    (_tcpRetryCount == 0 && _tcpSocket.state() != QAbstractSocket::UnconnectedState);
 }
 
 void Faceshift::updateFakeCoefficients(float leftBlink, float rightBlink, float browUp,
@@ -148,12 +120,13 @@ void Faceshift::updateFakeCoefficients(float leftBlink, float rightBlink, float
 }
 
 void Faceshift::setTCPEnabled(bool enabled) {
+#ifdef HAVE_FACESHIFT
     if ((_tcpEnabled = enabled)) {
         connectSocket();
-
     } else {
         _tcpSocket.disconnectFromHost();
     }
+#endif
 }
 
 void Faceshift::connectSocket() {
@@ -202,10 +175,6 @@ void Faceshift::readFromSocket() {
     receive(_tcpSocket.readAll());
 }
 
-float Faceshift::getBlendshapeCoefficient(int index) const {
-    return (index >= 0 && index < (int)_blendshapeCoefficients.size()) ? _blendshapeCoefficients[index] : 0.0f;
-}
-
 void Faceshift::send(const std::string& message) {
     _tcpSocket.write(message.data(), message.size());
 }

interface/src/devices/Faceshift.h

@@ -24,8 +24,7 @@
 
 #include "FaceTracker.h"
 
-const float DEFAULT_FACESHIFT_EYE_DEFLECTION = 0.25f;
-const QString DEFAULT_FACESHIFT_HOSTNAME = "localhost";
+const float STARTING_FACESHIFT_FRAME_TIME = 0.033f;
 
 /// Handles interaction with the Faceshift software, which provides head position/orientation and facial features.
 class Faceshift : public FaceTracker, public Dependency {
@@ -33,11 +32,17 @@ class Faceshift : public FaceTracker, public Dependency {
     SINGLETON_DEPENDENCY
 
 public:
-    void init();
+#ifdef HAVE_FACESHIFT
+    // If we don't have faceshift, use the base class' methods
+    virtual void init();
+    virtual void update(float deltaTime);
+    virtual void reset();
 
-    bool isConnectedOrConnecting() const; 
+    virtual bool isActive() const;
+    virtual bool isTracking() const;
+#endif
 
-    bool isActive() const;
+    bool isConnectedOrConnecting() const;
 
     const glm::vec3& getHeadAngularVelocity() const { return _headAngularVelocity; }
 
@@ -68,9 +73,6 @@ public:
     
     QString getHostname() { return _hostname.get(); }
     void setHostname(const QString& hostname);
-
-    void update();
-    void reset();
     
     void updateFakeCoefficients(float leftBlink,
                                 float rightBlink,
@@ -82,15 +84,12 @@ public:
                                 QVector<float>& coefficients) const;
     
 signals:
-
     void connectionStateChanged();
 
 public slots:
-    
     void setTCPEnabled(bool enabled);
     
 private slots:
-
     void connectSocket();
     void noteConnected();
     void noteError(QAbstractSocket::SocketError error);
@@ -101,8 +100,6 @@ private:
     Faceshift();
     virtual ~Faceshift() {}
     
-    float getBlendshapeCoefficient(int index) const;
-    
     void send(const std::string& message);
     void receive(const QByteArray& buffer);
     
@@ -113,48 +110,48 @@ private:
     fs::fsBinaryStream _stream;
 #endif
     
-    bool _tcpEnabled;
-    int _tcpRetryCount;
-    bool _tracking;
-    quint64 _lastTrackingStateReceived;
-    float _averageFrameTime;
+    bool _tcpEnabled = true;
+    int _tcpRetryCount = 0;
+    bool _tracking = false;
+    quint64 _lastTrackingStateReceived = 0;
+    float _averageFrameTime = STARTING_FACESHIFT_FRAME_TIME;
     
-    glm::vec3 _headAngularVelocity;
-    glm::vec3 _headLinearVelocity;
-    glm::vec3 _lastHeadTranslation;
-    glm::vec3 _filteredHeadTranslation;
+    glm::vec3 _headAngularVelocity = glm::vec3(0.0f);
+    glm::vec3 _headLinearVelocity = glm::vec3(0.0f);
+    glm::vec3 _lastHeadTranslation = glm::vec3(0.0f);
+    glm::vec3 _filteredHeadTranslation = glm::vec3(0.0f);
     
     // degrees
-    float _eyeGazeLeftPitch;
-    float _eyeGazeLeftYaw;
-    float _eyeGazeRightPitch;
-    float _eyeGazeRightYaw;
-    
-    int _leftBlinkIndex;
-    int _rightBlinkIndex;
-    int _leftEyeOpenIndex;
-    int _rightEyeOpenIndex;
-
-    // Brows
-    int _browDownLeftIndex;
-    int _browDownRightIndex;
-    int _browUpCenterIndex;
-    int _browUpLeftIndex;
-    int _browUpRightIndex;
-    
-    int _mouthSmileLeftIndex;
-    int _mouthSmileRightIndex;
-    
-    int _jawOpenIndex;
+    float _eyeGazeLeftPitch = 0.0f;
+    float _eyeGazeLeftYaw = 0.0f;
+    float _eyeGazeRightPitch = 0.0f;
+    float _eyeGazeRightYaw = 0.0f;
     
     // degrees
-    float _longTermAverageEyePitch;
-    float _longTermAverageEyeYaw;
-    bool _longTermAverageInitialized;
+    float _longTermAverageEyePitch = 0.0f;
+    float _longTermAverageEyeYaw = 0.0f;
+    bool _longTermAverageInitialized = false;
     
     Setting::Handle<float> _eyeDeflection;
     Setting::Handle<QString> _hostname;
     
+    // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
+    int _leftBlinkIndex = 0;
+    int _rightBlinkIndex = 1;
+    int _leftEyeOpenIndex = 8;
+    int _rightEyeOpenIndex = 9;
+    
+    // Brows
+    int _browDownLeftIndex = 14;
+    int _browDownRightIndex = 15;
+    int _browUpCenterIndex = 16;
+    int _browUpLeftIndex = 17;
+    int _browUpRightIndex = 18;
+    
+    int _mouthSmileLeftIndex = 28;
+    int _mouthSmileRightIndex = 29;
+    
+    int _jawOpenIndex = 21;
 };
 
 #endif // hifi_Faceshift_h

interface/src/devices/Visage.cpp

@@ -126,13 +126,12 @@ void Visage::init() {
     updateEnabled();
 }
 
-void Visage::update() {
+void Visage::update(float deltaTime) {
 #ifdef HAVE_VISAGE
     _active = (_tracker->getTrackingData(_data) == TRACK_STAT_OK);
     if (!_active) {
         return;
     }
-    PerformanceTimer perfTimer("visage");
     _headRotation = glm::quat(glm::vec3(-_data->faceRotation[0], -_data->faceRotation[1], _data->faceRotation[2]));    
     _headTranslation = (glm::vec3(_data->faceTranslation[0], _data->faceTranslation[1], _data->faceTranslation[2]) -
         _headOrigin) * TRANSLATION_SCALE;

interface/src/devices/Visage.h

@@ -31,12 +31,12 @@ class Visage : public FaceTracker, public Dependency {
     SINGLETON_DEPENDENCY
     
 public:
-    void init();
+    virtual void init();
+    virtual void update(float deltaTime);
+    virtual void reset();
     
-    bool isActive() const { return _active; }
-    
-    void update();
-    void reset();
+    virtual bool isActive() const { return _active; }
+    virtual bool isTracking() const { return isActive(); }
 
 public slots: