From 1b855f2c6b86d41b3a87af2b3ff9b74a7ef43ba1 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 11 May 2017 18:15:38 +1200
Subject: [PATCH] Voice modulation and facetrackers write to transient
 blendshapes

---
 interface/src/avatar/MyHead.cpp                      | 12 ++++++------
 .../avatars-renderer/src/avatars-renderer/Head.cpp   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/src/avatar/MyHead.cpp b/interface/src/avatar/MyHead.cpp
index c41fff3bb5..34a75c5461 100644
--- a/interface/src/avatar/MyHead.cpp
+++ b/interface/src/avatar/MyHead.cpp
@@ -48,7 +48,7 @@ void MyHead::simulate(float deltaTime) {
         FaceTracker* faceTracker = qApp->getActiveFaceTracker();
         _isFaceTrackerConnected = faceTracker != NULL && !faceTracker->isMuted();
         if (_isFaceTrackerConnected) {
-            _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
+            _transientBlendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
 
             if (typeid(*faceTracker) == typeid(DdeFaceTracker)) {
 
@@ -60,11 +60,11 @@ void MyHead::simulate(float deltaTime) {
                     const int FUNNEL_BLENDSHAPE = 40;
                     const int SMILE_LEFT_BLENDSHAPE = 28;
                     const int SMILE_RIGHT_BLENDSHAPE = 29;
-                    _blendshapeCoefficients[JAW_OPEN_BLENDSHAPE] += _audioJawOpen;
-                    _blendshapeCoefficients[SMILE_LEFT_BLENDSHAPE] += _mouth4;
-                    _blendshapeCoefficients[SMILE_RIGHT_BLENDSHAPE] += _mouth4;
-                    _blendshapeCoefficients[MMMM_BLENDSHAPE] += _mouth2;
-                    _blendshapeCoefficients[FUNNEL_BLENDSHAPE] += _mouth3;
+                    _transientBlendshapeCoefficients[JAW_OPEN_BLENDSHAPE] += _audioJawOpen;
+                    _transientBlendshapeCoefficients[SMILE_LEFT_BLENDSHAPE] += _mouth4;
+                    _transientBlendshapeCoefficients[SMILE_RIGHT_BLENDSHAPE] += _mouth4;
+                    _transientBlendshapeCoefficients[MMMM_BLENDSHAPE] += _mouth2;
+                    _transientBlendshapeCoefficients[FUNNEL_BLENDSHAPE] += _mouth3;
                 }
                 applyEyelidOffset(getFinalOrientationInWorldFrame());
             }
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
index 1c54ea269a..d7f7a402cf 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Head.cpp
@@ -151,7 +151,7 @@ void Head::simulate(float deltaTime) {
                                             _mouth2,
                                             _mouth3,
                                             _mouth4,
-                                            _blendshapeCoefficients);
+                                            _transientBlendshapeCoefficients);
 
         applyEyelidOffset(getOrientation());
 
@@ -227,15 +227,15 @@ void Head::applyEyelidOffset(glm::quat headOrientation) {
 
     for (int i = 0; i < 2; i++) {
         const int LEFT_EYE = 8;
-        float eyeCoefficient = _blendshapeCoefficients[i] - _blendshapeCoefficients[LEFT_EYE + i];  // Raw value
+        float eyeCoefficient = _transientBlendshapeCoefficients[i] - _transientBlendshapeCoefficients[LEFT_EYE + i];
         eyeCoefficient = glm::clamp(eyelidOffset + eyeCoefficient * (1.0f - eyelidOffset), -1.0f, 1.0f);
         if (eyeCoefficient > 0.0f) {
-            _blendshapeCoefficients[i] = eyeCoefficient;
-            _blendshapeCoefficients[LEFT_EYE + i] = 0.0f;
+            _transientBlendshapeCoefficients[i] = eyeCoefficient;
+            _transientBlendshapeCoefficients[LEFT_EYE + i] = 0.0f;
 
         } else {
-            _blendshapeCoefficients[i] = 0.0f;
-            _blendshapeCoefficients[LEFT_EYE + i] = -eyeCoefficient;
+            _transientBlendshapeCoefficients[i] = 0.0f;
+            _transientBlendshapeCoefficients[LEFT_EYE + i] = -eyeCoefficient;
         }
     }
 }