Add experimental support for V1 eye brow emulation

Author: lorow

ETVRTrackingModule.cs

@@ -23,8 +23,7 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
             _expressionMapper = new ExpressionsMapper(Logger, ref config);
             _oscManager = new OSCManager(Logger, _expressionMapper, ref config);
             _oscManager.Start();
-
-
+            
             if (_oscManager.State == OSCState.CONNECTED) return (true, true);
 
             Logger.LogError("ETVR Module could not connect to the specified port.");

ExpressionStrategies/V1Mapper.cs

@@ -38,10 +38,17 @@ public void handleOSCMessage(OSCMessage message)
 
     private void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
     {
-        HandleEyeOpenness(ref eyeData, ref eyeShapes);
         HandleEyeGaze(ref eyeData);
+        HandleEyeOpenness(ref eyeData, ref eyeShapes);
+        EmulateEyeBrows(ref eyeShapes);
     }
 
+    private void HandleEyeGaze(ref UnifiedEyeData eyeData)
+    {
+        eyeData.Right.Gaze = new Vector2(_parameterValues["RightEyeX"], _parameterValues["EyesY"]);
+        eyeData.Left.Gaze = new Vector2(_parameterValues["LeftEyeX"], _parameterValues["EyesY"]);
+    }
+    
     private void HandleEyeOpenness(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
     {
         // so how it works, currently we cannot output values above 1.0 and below 0.0
@@ -91,9 +98,62 @@ float squeezeThreshold
         }
     }
 
-    private void HandleEyeGaze(ref UnifiedEyeData eyeData)
+    private void EmulateEyeBrows(ref UnifiedExpressionShape[] eyeShapes)
     {
-        eyeData.Right.Gaze = new Vector2(_parameterValues["RightEyeX"], _parameterValues["EyesY"]);
-        eyeData.Left.Gaze = new Vector2(_parameterValues["LeftEyeX"], _parameterValues["EyesY"]);
+        var baseRightEyeOpenness = _parameterValues["RightEyeLidExpandedSqueeze"];
+        var baseLeftEyeOpenness = _parameterValues["LeftEyeLidExpandedSqueeze"];
+        
+        _emulateEyeBrow(
+            ref eyeShapes,
+            UnifiedExpressions.BrowLowererRight,
+            UnifiedExpressions.BrowOuterUpRight,
+            baseRightEyeOpenness,
+            _config.WidenThreshold,
+            _config.SqueezeThreshold
+        );
+        
+        _emulateEyeBrow(
+            ref eyeShapes,
+            UnifiedExpressions.BrowLowererLeft,
+            UnifiedExpressions.BrowOuterUpLeft,
+            baseLeftEyeOpenness,
+            _config.WidenThreshold,
+            _config.SqueezeThreshold
+        );
+    }
+
+    private void _emulateEyeBrow(
+        ref UnifiedExpressionShape[] eyeShapes,
+        UnifiedExpressions eyebrowExpressionLowerrer,
+        UnifiedExpressions eyebrowExpressionUpper,
+        float baseEyeOpenness,
+        float widenThreshold,
+        float squeezeThreshold)
+    {
+        if (!_config.ShouldEmulateEyebrows)
+            return;
+
+        if (baseEyeOpenness >= widenThreshold)
+        {
+            eyeShapes[(int)eyebrowExpressionLowerrer].Weight = Utils.SmoothStep(
+                widenThreshold,
+                1,
+                baseEyeOpenness
+            );
+        }
+
+        if (baseEyeOpenness <= squeezeThreshold)
+        {
+            eyeShapes[(int)eyebrowExpressionUpper].Weight = Utils.SmoothStep(
+                squeezeThreshold,
+                1,
+                baseEyeOpenness
+            );
+            eyeShapes[(int)UnifiedExpressions.BrowLowererLeft].Weight = Utils.SmoothStep(
+                squeezeThreshold,
+                1,
+                baseEyeOpenness
+            );
+        }
     }
 }