Update for latest vrc version + fix for enum typo (thanks for the rem…

…inder, uber5001)
Fox-McCloud · May 5, 2021 · 9b20cf4 · 9b20cf4
1 parent 3e9aeb3
commit 9b20cf4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@ bin/
 obj/
 /packages/
 riderModule.iml
-/_ReSharper.Caches/
+/_ReSharper.Caches/
+VRCFaceTracking/ParamLib
+VRCFaceTracking/ParamLib/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "VRCEyeTracking/ParamLib"]
+[submodule "VRCFaceTracking/ParamLib"]
 	path = VRCFaceTracking/ParamLib
 	url = https://github.com/benaclejames/ParamLib.git
diff --git a/VRCFaceTracking/SRParam/LipMerging/LipShapeMerger.cs b/VRCFaceTracking/SRParam/LipMerging/LipShapeMerger.cs
@@ -23,7 +23,7 @@ private enum OptimizedLipShape
         private static readonly Dictionary<OptimizedLipShape, PositiveNegativeShape> OptimizedLipShapes =
             new Dictionary<OptimizedLipShape, PositiveNegativeShape>
             {
-                {OptimizedLipShape.JawX, new PositiveNegativeShape(LipShape_v2.JawRight, LipShape_v2.Jaw_Left)},
+                {OptimizedLipShape.JawX, new PositiveNegativeShape(LipShape_v2.JawRight, LipShape_v2.JawLeft)},
                 {OptimizedLipShape.MouthUpper, new PositiveNegativeShape(LipShape_v2.MouthUpperRight, LipShape_v2.MouthUpperLeft)},
                 {OptimizedLipShape.MouthLower, new PositiveNegativeShape(LipShape_v2.MouthLowerRight, LipShape_v2.MouthLowerLeft)},
                 {OptimizedLipShape.SmileSadRight, new PositiveNegativeShape(LipShape_v2.MouthSmileRight, LipShape_v2.MouthSadRight)},

diff --git a/VRCFaceTracking/SRanipal/Lip/SRanipal_LipData_v2.cs b/VRCFaceTracking/SRanipal/Lip/SRanipal_LipData_v2.cs
@@ -12,7 +12,7 @@ public enum LipShape_v2
             {
                 None = -1,
                 JawRight = 0, // +JawX
-                Jaw_Left = 1, // -JawX
+                JawLeft = 1, // -JawX
                 JawForward = 2,
                 JawOpen = 3,
                 MouthApeShape = 4,