Merge pull request #16445 from hyperlogic/bug-fix/remove-last-legacy-blendshapes

Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy blendshapes

interface/resources/controllers/standard.json

@@ -201,8 +201,6 @@
         { "from": "Standard.LipsStretch_R", "to": "Actions.LipsStretch_R" },
         { "from": "Standard.LipsUpperClose", "to": "Actions.LipsUpperClose" },
         { "from": "Standard.LipsLowerClose", "to": "Actions.LipsLowerClose" },
-        { "from": "Standard.LipsUpperOpen", "to": "Actions.LipsUpperOpen" },
-        { "from": "Standard.LipsLowerOpen", "to": "Actions.LipsLowerOpen" },
         { "from": "Standard.LipsFunnel", "to": "Actions.LipsFunnel" },
         { "from": "Standard.LipsPucker", "to": "Actions.LipsPucker" },
         { "from": "Standard.Puff", "to": "Actions.Puff" },

interface/resources/controllers/standard_nomovement.json

@@ -96,8 +96,6 @@
         { "from": "Standard.LipsStretch_R", "to": "Actions.LipsStretch_R" },
         { "from": "Standard.LipsUpperClose", "to": "Actions.LipsUpperClose" },
         { "from": "Standard.LipsLowerClose", "to": "Actions.LipsLowerClose" },
-        { "from": "Standard.LipsUpperOpen", "to": "Actions.LipsUpperOpen" },
-        { "from": "Standard.LipsLowerOpen", "to": "Actions.LipsLowerOpen" },
         { "from": "Standard.LipsFunnel", "to": "Actions.LipsFunnel" },
         { "from": "Standard.LipsPucker", "to": "Actions.LipsPucker" },
         { "from": "Standard.Puff", "to": "Actions.Puff" },

interface/src/avatar/MyHead.cpp

@@ -57,8 +57,6 @@ static controller::Action blendshapeActions[] = {
     controller::Action::LIPSSTRETCH_R,
     controller::Action::LIPSUPPERCLOSE,
     controller::Action::LIPSLOWERCLOSE,
-    controller::Action::LIPSUPPEROPEN,
-    controller::Action::LIPSLOWEROPEN,
     controller::Action::LIPSFUNNEL,
     controller::Action::LIPSPUCKER,
     controller::Action::PUFF,

libraries/controllers/src/controllers/Actions.cpp

@@ -386,8 +386,6 @@ namespace controller {
             makeAxisPair(Action::LIPSSTRETCH_R, "LipsStretch_R"),
             makeAxisPair(Action::LIPSUPPERCLOSE, "LipsUpperClose"),
             makeAxisPair(Action::LIPSLOWERCLOSE, "LipsLowerClose"),
-            makeAxisPair(Action::LIPSUPPEROPEN, "LipsUpperOpen"),
-            makeAxisPair(Action::LIPSLOWEROPEN, "LipsLowerOpen"),
             makeAxisPair(Action::LIPSFUNNEL, "LipsFunnel"),
             makeAxisPair(Action::LIPSPUCKER, "LipsPucker"),
             makeAxisPair(Action::PUFF, "Puff"),

libraries/controllers/src/controllers/Actions.h

@@ -220,8 +220,6 @@ enum class Action {
     LIPSSTRETCH_R,
     LIPSUPPERCLOSE,
     LIPSLOWERCLOSE,
-    LIPSUPPEROPEN,
-    LIPSLOWEROPEN,
     LIPSFUNNEL,
     LIPSPUCKER,
     PUFF,

libraries/controllers/src/controllers/StandardController.cpp

@@ -392,8 +392,6 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(LIPSSTRETCH_R, "LipsStretch_R"),
         makePair(LIPSUPPERCLOSE, "LipsUpperClose"),
         makePair(LIPSLOWERCLOSE, "LipsLowerClose"),
-        makePair(LIPSUPPEROPEN, "LipsUpperOpen"),
-        makePair(LIPSLOWEROPEN, "LipsLowerOpen"),
         makePair(LIPSFUNNEL, "LipsFunnel"),
         makePair(LIPSPUCKER, "LipsPucker"),
         makePair(PUFF, "Puff"),

libraries/controllers/src/controllers/StandardControls.h

@@ -127,8 +127,6 @@ namespace controller {
         LIPSSTRETCH_R,
         LIPSUPPERCLOSE,
         LIPSLOWERCLOSE,
-        LIPSUPPEROPEN,
-        LIPSLOWEROPEN,
         LIPSFUNNEL,
         LIPSPUCKER,
         PUFF,

libraries/fbx/src/FSTReader.cpp

@@ -82,6 +82,8 @@ static void fixUpLegacyBlendshapes(QVariantHash& properties) {
     removeBlendshape(bs, "JawChew");
     removeBlendshape(bs, "ChinLowerRaise");
     removeBlendshape(bs, "ChinUpperRaise");
+    removeBlendshape(bs, "LipsUpperOpen");
+    removeBlendshape(bs, "LipsLowerOpen");
 
     // These blendshapes are split in ARKit, we replace them with their left and right sides with a weight of 1/2.
     splitBlendshapes(bs, "LipsUpperUp", "MouthUpperUp_L", "MouthUpperUp_R");

libraries/shared/src/BlendshapeConstants.cpp

@@ -47,8 +47,6 @@ const char* FACESHIFT_BLENDSHAPES[] = {
     "LipsStretch_R",
     "LipsUpperClose",
     "LipsLowerClose",
-    "LipsUpperOpen",
-    "LipsLowerOpen",
     "LipsFunnel",
     "LipsPucker",
     "Puff",

libraries/shared/src/BlendshapeConstants.h

@@ -51,8 +51,6 @@ enum class Blendshapes : int {
     LipsStretch_R,
     LipsUpperClose,
     LipsLowerClose,
-    LipsUpperOpen,
-    LipsLowerOpen,
     LipsFunnel,
     LipsPucker,
     Puff,
@@ -114,5 +112,8 @@ enum class LegacyBlendshpaes : int {
 // * Sneer (split in ARKit)
 // * ChinLowerRaise (not in ARKit)
 // * ChinUpperRaise (not in ARKit)
+// * LipsUpperOpen (not in ARKit)
+// * LipsLowerOpen (not in ARKit)
+
 
 #endif // hifi_BlendshapeConstants_h