To be tested: initial implementation of v1 params mapping

Author: lorow

ExpressionStrategies/V1Mapper.cs

@@ -1,35 +1,66 @@
 using VRCFaceTracking.Core.Params.Data;
+using VRCFaceTracking.Core.Params.Expressions;
+using VRCFaceTracking.Core.Types;
 
 namespace ETVRTrackingModule.ExpressionStrategies;
 
 public class V1Mapper : IExpressionMapper
 {
-    private Dictionary<string, float> parameterValues = new()
+    private Dictionary<string, float> _parameterValues = new()
     {
-        { "RightEyeLidExpandedSqueeze", 0f }, // no fucking idea if this should be EyeWide bullfuck
+        { "RightEyeLidExpandedSqueeze", 0f },
         { "LeftEyeLidExpandedSqueeze", 0f },
         { "LeftEyeX", 0f },
         { "RightEyeX", 0f },
         { "EyesY", 0f },
     };
 
-    private string[] eyeExpressions = new[]
-    {
-        "RightEyeLidExpandedSqueeze",
-        "LeftEyeLidExpandedSqueeze"
-    };
-    
     public void handleOSCMessage(OSCMessage message)
     {
-        string paramToMap = IExpressionMapper.GetParamToMap(message.address);
-        if (parameterValues.ContainsKey(paramToMap))
+        var paramToMap = IExpressionMapper.GetParamToMap(message.address);
+        if (_parameterValues.ContainsKey(paramToMap))
         {
-            parameterValues[paramToMap] = message.value;
+            _parameterValues[paramToMap] = message.value;
         }
     }
 
     public void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
     {
-        throw new NotImplementedException();
+        HandleEyeOpenness(ref eyeData, ref eyeShapes);
+        HandleEyeGaze(ref eyeData);
+    }
+
+    private void HandleEyeOpenness(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
+    {
+        // we should widen the eye 
+        if (_parameterValues["RightEyeLidExpandedSqueeze"] > 0.8f)
+        {
+            eyeData.Right.Openness = _parameterValues["RightEyeLidExpandedSqueeze"];
+            eyeShapes[(int)UnifiedExpressions.EyeWideRight].Weight = 1;
+        }
+        if (_parameterValues["RightEyeLidExpandedSqueeze"] < 0.0f)
+        {
+            eyeData.Right.Openness = _parameterValues["RightEyeLidExpandedSqueeze"];
+            eyeShapes[(int)UnifiedExpressions.EyeSquintRight].Weight = -1;
+        }
+        eyeData.Left.Openness = _parameterValues["RightEyeLidExpandedSqueeze"];
+        
+        if (_parameterValues["LeftEyeLidExpandedSqueeze"] > 0.8f)
+        {
+            eyeData.Left.Openness = _parameterValues["LeftEyeLidExpandedSqueeze"];
+            eyeShapes[(int)UnifiedExpressions.EyeWideLeft].Weight = 1;
+        }
+        if (_parameterValues["LeftEyeLidExpandedSqueeze"] < 0.0f)
+        {
+            eyeData.Left.Openness = _parameterValues["LeftEyeLidExpandedSqueeze"];
+            eyeShapes[(int)UnifiedExpressions.EyeSquintLeft].Weight = -1;
+        }
+        eyeData.Left.Openness = _parameterValues["LeftEyeLidExpandedSqueeze"];
+    }
+
+    private void HandleEyeGaze(ref UnifiedEyeData eyeData)
+    {
+        eyeData.Right.Gaze = new Vector2(_parameterValues["RightEyeX"], _parameterValues["EyesY"]);
+        eyeData.Left.Gaze = new Vector2(_parameterValues["LeftEyeX"], _parameterValues["EyesY"]);
     }
 }