cleanup Head::simulation() code

interface/src/avatar/MyHead.cpp

@@ -44,14 +44,17 @@ glm::quat MyHead::getCameraOrientation() const {
 void MyHead::simulate(float deltaTime) {
     auto player = DependencyManager::get<recording::Deck>();
     // Only use face trackers when not playing back a recording.
-    if (!player->isPlaying()) {
+    if (player->isPlaying()) {
+        Parent::simulate(deltaTime);
+    } else {
+        computeAudioLoudness(deltaTime);
+
         FaceTracker* faceTracker = qApp->getActiveFaceTracker();
-        _isFaceTrackerConnected = faceTracker != NULL && !faceTracker->isMuted();
+        _isFaceTrackerConnected = faceTracker && !faceTracker->isMuted();
         if (_isFaceTrackerConnected) {
             _transientBlendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
 
             if (typeid(*faceTracker) == typeid(DdeFaceTracker)) {
-
                 if (Menu::getInstance()->isOptionChecked(MenuOption::UseAudioForMouth)) {
                     calculateMouthShapes(deltaTime);
 
@@ -68,9 +71,19 @@ void MyHead::simulate(float deltaTime) {
                 }
                 applyEyelidOffset(getFinalOrientationInWorldFrame());
             }
+        } else {
+            computeFaceMovement(deltaTime);
 		}
+
         auto eyeTracker = DependencyManager::get<EyeTracker>();
-        _isEyeTrackerConnected = eyeTracker->isTracking();
+        _isEyeTrackerConnected = eyeTracker && eyeTracker->isTracking();
+        if (_isEyeTrackerConnected) {
+            // TODO? figure out where EyeTracker data harvested. Move it here?
+            _saccade = glm::vec3();
+        } else {
+            computeEyeMovement(deltaTime);
         }
-    Parent::simulate(deltaTime);
+
+    }
+    computeEyePosition();
 }

libraries/avatars-renderer/src/avatars-renderer/Head.cpp

@@ -23,9 +23,10 @@
 
 #include "Avatar.h"
 
+const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for
+
 using namespace std;
 
-static bool fixGaze { false };
 static bool disableEyelidAdjustment { false };
 
 Head::Head(Avatar* owningAvatar) :
@@ -42,15 +43,9 @@ void Head::reset() {
     _baseYaw = _basePitch = _baseRoll = 0.0f;
 }
 
-void Head::simulate(float deltaTime) {
-    const float NORMAL_HZ = 60.0f; // the update rate the constant values were tuned for
-
+void Head::computeAudioLoudness(float deltaTime) {
     // grab the audio loudness from the owning avatar, if we have one
-    float audioLoudness = 0.0f;
-
-    if (_owningAvatar) {
-        audioLoudness = _owningAvatar->getAudioLoudness();
-    }
+    float audioLoudness = _owningAvatar ? _owningAvatar->getAudioLoudness() : 0.0f;
 
     // Update audio trailing average for rendering facial animations
     const float AUDIO_AVERAGING_SECS = 0.05f;
@@ -63,8 +58,13 @@ void Head::simulate(float deltaTime) {
         _longTermAverageLoudness = glm::mix(_longTermAverageLoudness, _averageLoudness, glm::min(deltaTime / AUDIO_LONG_TERM_AVERAGING_SECS, 1.0f));
     }
 
-    if (!_isFaceTrackerConnected) {
-        if (!_isEyeTrackerConnected) {
+    float audioAttackAveragingRate = (10.0f - deltaTime * NORMAL_HZ) / 10.0f; // --> 0.9 at 60 Hz
+    _audioAttack = audioAttackAveragingRate * _audioAttack +
+        (1.0f - audioAttackAveragingRate) * fabs((audioLoudness - _longTermAverageLoudness) - _lastLoudness);
+    _lastLoudness = (audioLoudness - _longTermAverageLoudness);
+}
+
+void Head::computeEyeMovement(float deltaTime) {
     // Update eye saccades
     const float AVERAGE_MICROSACCADE_INTERVAL = 1.0f;
     const float AVERAGE_SACCADE_INTERVAL = 6.0f;
@@ -78,9 +78,6 @@ void Head::simulate(float deltaTime) {
         _saccadeTarget = SACCADE_MAGNITUDE * randVector();
     }
     _saccade += (_saccadeTarget - _saccade) * pow(0.5f, NOMINAL_FRAME_RATE * deltaTime);
-        } else {
-            _saccade = glm::vec3();
-        }
 
     // Detect transition from talking to not; force blink after that and a delay
     bool forceBlink = false;
@@ -93,18 +90,6 @@ void Head::simulate(float deltaTime) {
         forceBlink = true;
     }
 
-        //  Update audio attack data for facial animation (eyebrows and mouth)
-        float audioAttackAveragingRate = (10.0f - deltaTime * NORMAL_HZ) / 10.0f; // --> 0.9 at 60 Hz
-        _audioAttack = audioAttackAveragingRate * _audioAttack +
-            (1.0f - audioAttackAveragingRate) * fabs((audioLoudness - _longTermAverageLoudness) - _lastLoudness);
-        _lastLoudness = (audioLoudness - _longTermAverageLoudness);
-
-        const float BROW_LIFT_THRESHOLD = 100.0f;
-        if (_audioAttack > BROW_LIFT_THRESHOLD) {
-            _browAudioLift += sqrtf(_audioAttack) * 0.01f;
-        }
-        _browAudioLift = glm::clamp(_browAudioLift *= 0.7f, 0.0f, 1.0f);
-
     const float BLINK_SPEED = 10.0f;
     const float BLINK_SPEED_VARIABILITY = 1.0f;
     const float BLINK_START_VARIABILITY = 0.25f;
@@ -142,6 +127,17 @@ void Head::simulate(float deltaTime) {
         }
     }
 
+    applyEyelidOffset(getOrientation());
+}
+
+void Head::computeFaceMovement(float deltaTime) {
+    // Update audio attack data for facial animation (eyebrows and mouth)
+    const float BROW_LIFT_THRESHOLD = 100.0f;
+    if (_audioAttack > BROW_LIFT_THRESHOLD) {
+        _browAudioLift += sqrtf(_audioAttack) * 0.01f;
+    }
+    _browAudioLift = glm::clamp(_browAudioLift *= 0.7f, 0.0f, 1.0f);
+
     // use data to update fake Faceshift blendshape coefficients
     calculateMouthShapes(deltaTime);
     FaceTracker::updateFakeCoefficients(_leftEyeBlink,
@@ -152,27 +148,24 @@ void Head::simulate(float deltaTime) {
                                         _mouth3,
                                         _mouth4,
                                         _transientBlendshapeCoefficients);
-
-        applyEyelidOffset(getOrientation());
-
-    } else {
-        _saccade = glm::vec3();
-    }
-    if (fixGaze) { // if debug menu turns off, use no saccade
-        _saccade = glm::vec3();
 }
 
+void Head::computeEyePosition() {
     _leftEyePosition = _rightEyePosition = getPosition();
-    _eyePosition = getPosition();
-
     if (_owningAvatar) {
         auto skeletonModel = static_cast<Avatar*>(_owningAvatar)->getSkeletonModel();
         if (skeletonModel) {
             skeletonModel->getEyePositions(_leftEyePosition, _rightEyePosition);
         }
     }
+    _eyePosition = 0.5f * (_leftEyePosition + _rightEyePosition);
+}
 
-    _eyePosition = calculateAverageEyePosition();
+void Head::simulate(float deltaTime) {
+    computeAudioLoudness(deltaTime);
+    computeFaceMovement(deltaTime);
+    computeEyeMovement(deltaTime);
+    computeEyePosition();
 }
 
 void Head::calculateMouthShapes(float deltaTime) {

libraries/avatars-renderer/src/avatars-renderer/Head.h

@@ -83,7 +83,10 @@ public:
     float getTimeWithoutTalking() const { return _timeWithoutTalking; }
 
 protected:
-    glm::vec3 calculateAverageEyePosition() const { return _leftEyePosition + (_rightEyePosition - _leftEyePosition ) * 0.5f; }
+    void computeAudioLoudness(float deltaTime);
+    void computeEyeMovement(float deltaTime);
+    void computeFaceMovement(float deltaTime);
+    void computeEyePosition();
 
     // disallow copies of the Head, copy of owning Avatar is disallowed too
     Head(const Head&);

libraries/avatars/src/HeadData.cpp

@@ -28,12 +28,6 @@ HeadData::HeadData(AvatarData* owningAvatar) :
     _basePitch(0.0f),
     _baseRoll(0.0f),
     _lookAtPosition(0.0f, 0.0f, 0.0f),
-    _isFaceTrackerConnected(false),
-    _isEyeTrackerConnected(false),
-    _leftEyeBlink(0.0f),
-    _rightEyeBlink(0.0f),
-    _averageLoudness(0.0f),
-    _browAudioLift(0.0f),
     _blendshapeCoefficients(QVector<float>(0, 0.0f)),
     _transientBlendshapeCoefficients(QVector<float>(0, 0.0f)),
     _summedBlendshapeCoefficients(QVector<float>(0, 0.0f)),

libraries/avatars/src/HeadData.h

@@ -85,12 +85,12 @@ protected:
     glm::vec3 _lookAtPosition;
     quint64 _lookAtPositionChanged { 0 };
 
-    bool _isFaceTrackerConnected;
-    bool _isEyeTrackerConnected;
-    float _leftEyeBlink;
-    float _rightEyeBlink;
-    float _averageLoudness;
-    float _browAudioLift;
+    bool _isFaceTrackerConnected { false };
+    bool _isEyeTrackerConnected { false };
+    float _leftEyeBlink { 0.0f };
+    float _rightEyeBlink { 0.0f };
+    float _averageLoudness { 0.0f };
+    float _browAudioLift { 0.0f };
 
     QVector<float> _blendshapeCoefficients;
     QVector<float> _transientBlendshapeCoefficients;