From 101ec9d7539d1fdf882d4d66f5c292f901deab41 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 4 Nov 2019 09:49:24 -0800 Subject: [PATCH 1/2] Remove LipsUpperOpen and LipsLowerOpen, the last of the legacy faceshift blendshapes These blendshapes are not present in ARKit and are not used by any of our procedural face animations (talking, blinking etc). This change should have been part of #16400 but was accidently left out. --- interface/resources/controllers/standard.json | 2 -- interface/resources/controllers/standard_nomovement.json | 2 -- interface/src/avatar/MyHead.cpp | 2 -- libraries/controllers/src/controllers/Actions.cpp | 2 -- libraries/controllers/src/controllers/Actions.h | 2 -- libraries/controllers/src/controllers/StandardController.cpp | 2 -- libraries/controllers/src/controllers/StandardControls.h | 2 -- libraries/shared/src/BlendshapeConstants.cpp | 2 -- libraries/shared/src/BlendshapeConstants.h | 5 +++-- 9 files changed, 3 insertions(+), 18 deletions(-) diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json index b6cb4e3e27..aa995c6ecb 100644 --- a/interface/resources/controllers/standard.json +++ b/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" }, diff --git a/interface/resources/controllers/standard_nomovement.json b/interface/resources/controllers/standard_nomovement.json index 04c0d2f329..9e1437d2e8 100644 --- a/interface/resources/controllers/standard_nomovement.json +++ b/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" }, diff --git a/interface/src/avatar/MyHead.cpp b/interface/src/avatar/MyHead.cpp index a0e70a3049..1b88a518c8 100644 --- a/interface/src/avatar/MyHead.cpp +++ b/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, diff --git a/libraries/controllers/src/controllers/Actions.cpp b/libraries/controllers/src/controllers/Actions.cpp index 36f454b5d0..30f4181b43 100644 --- a/libraries/controllers/src/controllers/Actions.cpp +++ b/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"), diff --git a/libraries/controllers/src/controllers/Actions.h b/libraries/controllers/src/controllers/Actions.h index 5c96923dc3..6868483a14 100644 --- a/libraries/controllers/src/controllers/Actions.h +++ b/libraries/controllers/src/controllers/Actions.h @@ -220,8 +220,6 @@ enum class Action { LIPSSTRETCH_R, LIPSUPPERCLOSE, LIPSLOWERCLOSE, - LIPSUPPEROPEN, - LIPSLOWEROPEN, LIPSFUNNEL, LIPSPUCKER, PUFF, diff --git a/libraries/controllers/src/controllers/StandardController.cpp b/libraries/controllers/src/controllers/StandardController.cpp index 936f1c391f..41835223ea 100644 --- a/libraries/controllers/src/controllers/StandardController.cpp +++ b/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"), diff --git a/libraries/controllers/src/controllers/StandardControls.h b/libraries/controllers/src/controllers/StandardControls.h index 965c095187..051f6dcc3a 100644 --- a/libraries/controllers/src/controllers/StandardControls.h +++ b/libraries/controllers/src/controllers/StandardControls.h @@ -127,8 +127,6 @@ namespace controller { LIPSSTRETCH_R, LIPSUPPERCLOSE, LIPSLOWERCLOSE, - LIPSUPPEROPEN, - LIPSLOWEROPEN, LIPSFUNNEL, LIPSPUCKER, PUFF, diff --git a/libraries/shared/src/BlendshapeConstants.cpp b/libraries/shared/src/BlendshapeConstants.cpp index 91b68ed8a9..172df461fd 100644 --- a/libraries/shared/src/BlendshapeConstants.cpp +++ b/libraries/shared/src/BlendshapeConstants.cpp @@ -47,8 +47,6 @@ const char* FACESHIFT_BLENDSHAPES[] = { "LipsStretch_R", "LipsUpperClose", "LipsLowerClose", - "LipsUpperOpen", - "LipsLowerOpen", "LipsFunnel", "LipsPucker", "Puff", diff --git a/libraries/shared/src/BlendshapeConstants.h b/libraries/shared/src/BlendshapeConstants.h index 8db29856c3..e74146eb56 100644 --- a/libraries/shared/src/BlendshapeConstants.h +++ b/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 From 821a46697af082c2bff4fe37304563c49398d8b0 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 4 Nov 2019 10:55:05 -0800 Subject: [PATCH 2/2] Update fixUpLegacyBlendshapes as well --- libraries/fbx/src/FSTReader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/fbx/src/FSTReader.cpp b/libraries/fbx/src/FSTReader.cpp index 2835151bfe..b647fe2e7f 100644 --- a/libraries/fbx/src/FSTReader.cpp +++ b/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");