Renamed LipsTogether to MouthClose and bug fixes.

interface/resources/controllers/standard.json

@@ -208,7 +208,7 @@
         { "from": "Standard.Puff", "to": "Actions.Puff" },
         { "from": "Standard.CheekSquint_L", "to": "Actions.CheekSquint_L" },
         { "from": "Standard.CheekSquint_R", "to": "Actions.CheekSquint_R" },
-        { "from": "Standard.LipsTogether", "to": "Actions.LipsTogether" },
+        { "from": "Standard.MouthClose", "to": "Actions.MouthClose" },
         { "from": "Standard.MouthUpperUp_L", "to": "Actions.MouthUpperUp_L" },
         { "from": "Standard.MouthUpperUp_R", "to": "Actions.MouthUpperUp_R" },
         { "from": "Standard.MouthLowerDown_L", "to": "Actions.MouthLowerDown_L" },

interface/resources/controllers/standard_nomovement.json

@@ -103,7 +103,7 @@
         { "from": "Standard.Puff", "to": "Actions.Puff" },
         { "from": "Standard.CheekSquint_L", "to": "Actions.CheekSquint_L" },
         { "from": "Standard.CheekSquint_R", "to": "Actions.CheekSquint_R" },
-        { "from": "Standard.LipsTogether", "to": "Actions.LipsTogether" },
+        { "from": "Standard.MouthClose", "to": "Actions.MouthClose" },
         { "from": "Standard.MouthUpperUp_L", "to": "Actions.MouthUpperUp_L" },
         { "from": "Standard.MouthUpperUp_R", "to": "Actions.MouthUpperUp_R" },
         { "from": "Standard.MouthLowerDown_L", "to": "Actions.MouthLowerDown_L" },

interface/src/avatar/MyHead.cpp

@@ -64,7 +64,7 @@ static controller::Action blendshapeActions[] = {
     controller::Action::PUFF,
     controller::Action::CHEEKSQUINT_L,
     controller::Action::CHEEKSQUINT_R,
-    controller::Action::LIPSTOGETHER,
+    controller::Action::MOUTHCLOSE,
     controller::Action::MOUTHUPPERUP_L,
     controller::Action::MOUTHUPPERUP_R,
     controller::Action::MOUTHLOWERDOWN_L,

libraries/avatars/src/AvatarData.cpp

@@ -1217,6 +1217,10 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
 
         _keyState = newKeyState;
         _handState = newHandState;
+        if (!newHasScriptedBlendshapes && getHasScriptedBlendshapes()) {
+            // if scripted blendshapes have just been turned off, slam blendshapes back to zero.
+            _headData->clearBlendshapeCoefficients();
+        }
         _headData->setHasScriptedBlendshapes(newHasScriptedBlendshapes);
         _headData->setProceduralAnimationFlag(HeadData::SaccadeProceduralEyeJointAnimation, newHasProceduralEyeMovement);
         _headData->setProceduralAnimationFlag(HeadData::AudioProceduralBlendshapeAnimation, newHasAudioEnabledFaceMovement);

libraries/avatars/src/HeadData.cpp

@@ -83,6 +83,10 @@ int HeadData::getNumSummedBlendshapeCoefficients() const {
     return maxSize;
 }
 
+void HeadData::clearBlendshapeCoefficients() {
+    _blendshapeCoefficients.fill(0.0f, (int)_blendshapeCoefficients.size());
+}
+
 const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
     int maxSize = std::max(_blendshapeCoefficients.size(), _transientBlendshapeCoefficients.size());
     if (_summedBlendshapeCoefficients.size() != maxSize) {

libraries/avatars/src/HeadData.h

@@ -62,6 +62,7 @@ public:
     const QVector<float>& getSummedBlendshapeCoefficients();
     int getNumSummedBlendshapeCoefficients() const;
     void setBlendshapeCoefficients(const QVector<float>& blendshapeCoefficients) { _blendshapeCoefficients = blendshapeCoefficients; }
+    void clearBlendshapeCoefficients();
 
     const glm::vec3& getLookAtPosition() const { return _lookAtPosition; }
     void setLookAtPosition(const glm::vec3& lookAtPosition) {

libraries/controllers/src/controllers/Actions.cpp

@@ -393,7 +393,7 @@ namespace controller {
             makeAxisPair(Action::PUFF, "Puff"),
             makeAxisPair(Action::CHEEKSQUINT_L, "CheekSquint_L"),
             makeAxisPair(Action::CHEEKSQUINT_R, "CheekSquint_R"),
-            makeAxisPair(Action::LIPSTOGETHER, "LipsTogether"),
+            makeAxisPair(Action::MOUTHCLOSE, "MouthClose"),
             makeAxisPair(Action::MOUTHUPPERUP_L, "MouthUpperUp_L"),
             makeAxisPair(Action::MOUTHUPPERUP_R, "MouthUpperUp_R"),
             makeAxisPair(Action::MOUTHLOWERDOWN_L, "MouthLowerDown_L"),

libraries/controllers/src/controllers/Actions.h

@@ -227,7 +227,7 @@ enum class Action {
     PUFF,
     CHEEKSQUINT_L,
     CHEEKSQUINT_R,
-    LIPSTOGETHER,
+    MOUTHCLOSE,
     MOUTHUPPERUP_L,
     MOUTHUPPERUP_R,
     MOUTHLOWERDOWN_L,

libraries/controllers/src/controllers/StandardController.cpp

@@ -399,7 +399,7 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(PUFF, "Puff"),
         makePair(CHEEKSQUINT_L, "CheekSquint_L"),
         makePair(CHEEKSQUINT_R, "CheekSquint_R"),
-        makePair(LIPSTOGETHER, "LipsTogether"),
+        makePair(MOUTHCLOSE, "MouthClose"),
         makePair(MOUTHUPPERUP_L, "MouthUpperUp_L"),
         makePair(MOUTHUPPERUP_R, "MouthUpperUp_R"),
         makePair(MOUTHLOWERDOWN_L, "MouthLowerDown_L"),

libraries/controllers/src/controllers/StandardControls.h

@@ -134,7 +134,7 @@ namespace controller {
         PUFF,
         CHEEKSQUINT_L,
         CHEEKSQUINT_R,
-        LIPSTOGETHER,
+        MOUTHCLOSE,
         MOUTHUPPERUP_L,
         MOUTHUPPERUP_R,
         MOUTHLOWERDOWN_L,

libraries/shared/src/BlendshapeConstants.cpp

@@ -54,7 +54,7 @@ const char* FACESHIFT_BLENDSHAPES[] = {
     "Puff",
     "CheekSquint_L",
     "CheekSquint_R",
-    "LipsTogether",
+    "MouthClose",
     "MouthUpperUp_L",
     "MouthUpperUp_R",
     "MouthLowerDown_L",

libraries/shared/src/BlendshapeConstants.h

@@ -58,7 +58,7 @@ enum class Blendshapes : int {
     Puff,
     CheekSquint_L,
     CheekSquint_R,
-    LipsTogether,
+    MouthClose,
     MouthUpperUp_L,
     MouthUpperUp_R,
     MouthLowerDown_L,
@@ -94,7 +94,7 @@ enum class LegacyBlendshpaes : int {
 };
 
 // NEW in ARKit
-// * LipsTogether
+// * MouthClose
 // * MouthUpperUp_L
 // * MouthUpperUp_R
 // * MouthLowerDown_L