From 24ddbc0d56d795500def24352ff41f4524caa44e Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 24 Apr 2021 09:10:32 +1200
Subject: [PATCH] Update ReadyPlayerMe default mapping

---
 libraries/shared/src/BlendshapeConstants.cpp | 49 ++++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/libraries/shared/src/BlendshapeConstants.cpp b/libraries/shared/src/BlendshapeConstants.cpp
index 39641851b6..6e28f5079c 100644
--- a/libraries/shared/src/BlendshapeConstants.cpp
+++ b/libraries/shared/src/BlendshapeConstants.cpp
@@ -86,19 +86,38 @@ const QMap<QString, int> BLENDSHAPE_LOOKUP_MAP = [] {
 }();
 
 const QMap<QString, QPair<QString, float>> READYPLAYERME_BLENDSHAPES_MAP = {
-    // ReadyPlayerMe blendshape synonyms.
-    {"browDownLeft", {"BrowsD_L", 0.5f}},
-    {"browDownRight", {"BrowsD_R", 0.5f}},
-    {"browInnerUp", {"BrowsU_C", 0.3f}},
-    {"browOuterUpLeft", {"BrowsU_L", 0.3f}},
-    {"browOuterUpRight", {"BrowsU_R", 0.3f}},
-    {"eyeBlinkLeft", {"EyeBlink_L", 1.0f}},
-    {"eyeBlinkRight", {"EyeBlink_R", 1.0f}},
-    {"eyeWideLeft", {"EyeOpen_L", 1.0f}},
-    {"eyeWideRight", {"EyeOpen_R", 1.0f}},
-    {"mouthLeft", {"MouthSmile_L", 0.6f}},
-    {"mouthOpen", {"JawOpen", 1.0f}},
-    {"mouthRight", {"MouthSmile_R", 0.6f}},
-    {"mouthShrugLower", {"LipsUpperClose", 0.1f}},
-    {"viseme_O", {"LipsFunnel", 0.5f}}
+    // ReadyPlayerMe blendshape default mapping.
+    { "mouthOpen", { "JawOpen", 1.0f } },
+    { "eyeBlinkLeft", { "EyeBlink_L", 1.0f } },
+    { "eyeBlinkRight", { "EyeBlink_R", 1.0f } },
+    { "eyeSquintLeft", { "EyeSquint_L", 1.0f } },
+    { "eyeSquintRight", { "EyeSquint_R", 1.0f } },
+    { "eyeWideLeft", { "EyeOpen_L", 1.0f } },
+    { "eyeWideRight", { "EyeOpen_R", 1.0f } },
+    { "browDownLeft", { "BrowsD_L", 1.0f } },
+    { "browDownRight", { "BrowsD_R", 1.0f } },
+    { "browInnerUp", { "BrowsU_C", 1.0f } },
+    { "browOuterUpLeft", { "BrowsU_L", 1.0f } },
+    { "browOuterUpRight", { "BrowsU_R", 1.0f } },
+    { "mouthFrownLeft", { "MouthFrown_L", 1.0f } },
+    { "mouthFrownRight", { "MouthFrown_R", 1.0f } },
+    { "mouthPucker", { "LipsPucker", 1.0f } },
+    { "jawForward", { "JawFwd", 1.0f } },
+    { "jawLeft", { "JawLeft", 1.0f } },
+    { "jawRight", { "JawRight", 1.0f } },
+    { "mouthLeft", { "MouthLeft", 1.0f } },
+    { "mouthRight", { "MouthRight", 1.0f } },
+    { "noseSneerLeft", { "NoseSneer_L", 1.0f } },
+    { "noseSneerRight", { "NoseSneer_R", 1.0f } },
+    { "mouthLowerDownLeft", { "MouthLowerDown_L", 1.0f } },
+    { "mouthLowerDownRight", { "MouthLowerDown_R", 1.0f } },
+    { "mouthShrugLower", { "MouthShrugLower", 1.0f } },
+    { "mouthShrugUpper", { "MouthShrugUpper", 1.0f } },
+    { "viseme_sil", { "MouthClose", 1.0f } },
+    { "mouthSmile", { "MouthSmile_L", 1.0f } },
+    { "mouthSmile", { "MouthSmile_R", 1.0f } },
+    { "viseme_CH", { "LipsFunnel", 1.0f } },
+    { "viseme_PP", { "LipsUpperClose", 1.0f } },
+    { "mouthShrugLower", { "LipsLowerClose", 1.0f } },
+    { "viseme_FF", { "Puff", 1.0f } }
 };