Make ftMouthOpen react to seperation of lips

Inochi2D · May 1, 2023 · 0fb87f7 · 0fb87f7
1 parent 8bc6047
commit 0fb87f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/source/ft/adaptors/ifacialmocap.d b/source/ft/adaptors/ifacialmocap.d
@@ -328,8 +328,8 @@ public:
 
                             // Avg out the different ways of opening the mouth
                             (
-                                ((this.blendshapes["mouthLowerDown_L"]+this.blendshapes["mouthLowerDown_R"])/2) +
-                                ((this.blendshapes["mouthUpperUp_L"]+this.blendshapes["mouthUpperUp_R"])/2)
+                                ((this.blendshapes["mouthLowerDown_L"]+this.blendshapes["mouthUpperUp_L"])/2) +
+                                ((this.blendshapes["mouthLowerDown_R"]+this.blendshapes["mouthUpperUp_R"])/2)
                             ),
                             0,
                             1

diff --git a/source/ft/adaptors/vtsproto.d b/source/ft/adaptors/vtsproto.d
@@ -382,17 +382,16 @@ public:
                         this.blendshapes[BlendshapeNames.ftEyeWidenRight] = this.blendshapes["EyeWideRight"];
 
                         // MOUTH
-                        this.blendshapes[BlendshapeNames.ftMouthOpen] = (
+                        this.blendshapes[BlendshapeNames.ftMouthOpen] = clamp(
 
                             // Avg out the different ways of opening the mouth
                             (
-                                (this.blendshapes["JawOpen"]-this.blendshapes["MouthClose"]) +
-                                ((this.blendshapes["MouthLowerDownLeft"]+this.blendshapes["MouthLowerDownRight"])/2) +
-                                ((this.blendshapes["MouthUpperUpLeft"]+this.blendshapes["MouthUpperUpRight"])/2)
-                            )/3
-
-                          // Sensitivity gets kind of low so we adjust it here.
-                        )*2;
+                                ((this.blendshapes["MouthLowerDownLeft"]+this.blendshapes["MouthUpperUpLeft"])/2) +
+                                ((this.blendshapes["MouthLowerDownRight"]+this.blendshapes["MouthUpperUpRight"])/2)
+                            ),
+                            0,
+                            1
+                        );
 
                         this.blendshapes[BlendshapeNames.ftMouthX] = (1 + this.blendshapes["MouthLeft"]-this.blendshapes["MouthRight"]) / 2.0;
                         this.blendshapes[BlendshapeNames.ftMouthEmotion] = (