feat: Add support for pupil dilation

Author: lorow

ExpressionStrategies/V1Mapper.cs

@@ -15,6 +15,7 @@ public class V1Mapper : BaseParamMapper
         { "LeftEyeLidExpandedSqueeze", 1f },
         { "LeftEyeX", 0f },
         { "RightEyeX", 0f },
+        { "EyesDilation", 0f },
         { "EyesY", 0f },
     };
 
@@ -23,33 +24,38 @@ public V1Mapper(ILogger logger, Config config) : base(logger, config) {}
     public override void HandleOSCMessage(OSCMessage message)
     {
         var paramToMap = GetParamToMap(message.address);
-        if (_parameterValues.ContainsKey(paramToMap))
+        if (!_parameterValues.ContainsKey(paramToMap))
+            return;
+        
+        if (message.value is not OSCFloat oscF)
         {
-            if (message.value is not OSCFloat oscF)
-            {
-                _logger.LogInformation("ParamMapper got passed a wrong type of message: {}", message.value.Type);
-                return;
-            }
-            else
-            {
-                _parameterValues[paramToMap] = oscF.value;
-            }
+            _logger.LogInformation("ParamMapper got passed a wrong type of message: {}", message.value.Type);
+            return;
         }
+        
+        _parameterValues[paramToMap] = oscF.value;
     }
 
     public override void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
     {
         HandleEyeGaze(ref eyeData);
+        HandleEyeDilation(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 HandleEyeDilation(ref UnifiedEyeData eyeData)
+    {
+        eyeData.Left.PupilDiameter_MM = _parameterValues["EyesDilation"];
+        eyeData.Right.PupilDiameter_MM = _parameterValues["EyesDilation"];
+    }
+    
     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

ExpressionStrategies/V2Mapper.cs

@@ -27,6 +27,7 @@ public class V2Mapper : BaseParamMapper
         { "EyeRightY", 0f },
         { "EyeLidLeft", 1f },
         { "EyeLidRight", 1f },
+        { "PupilDilation", 0f }, 
     };
 
     private readonly string[] _gazeParameters =
@@ -52,7 +53,7 @@ public V2Mapper(ILogger logger, Config config) : base(logger, config) {}
 
     public override void HandleOSCMessage(OSCMessage message)
     {
-        string paramToMap = GetParamToMap(message.address);
+        var paramToMap = GetParamToMap(message.address);
         if (!_parameterValues.ContainsKey(paramToMap))
             return;
 
@@ -61,15 +62,16 @@ public override void HandleOSCMessage(OSCMessage message)
             _logger.LogInformation("ParamMapper got passed a wrong type of message: {}", message.value.Type);
             return;
         }
-        else
-            _parameterValues[paramToMap] = oscF.value;
+        
+        _parameterValues[paramToMap] = oscF.value;
 
         _isSingleEye = _singleEyeParamNames.Contains(paramToMap);
     }
 
     public override void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
     {
         HandleEyeGaze(ref eyeData, _isSingleEye);
+        HandleEyeDilation(ref eyeData);
         HandleEyeOpenness(ref eyeData, ref eyeShapes, _isSingleEye);
         EmulateEyebrows(ref eyeShapes, _isSingleEye);
     }
@@ -87,7 +89,13 @@ private void HandleEyeGaze(ref UnifiedEyeData eyeData, bool isSingleEyeMode)
         eyeData.Left.Gaze = new Vector2(_parameterValues["EyeLeftX"], _parameterValues["EyeLeftY"]);
         eyeData.Right.Gaze = new Vector2(_parameterValues["EyeRightX"], _parameterValues["EyeRightY"]);
     }
-
+    
+    private void HandleEyeDilation(ref UnifiedEyeData eyeData)
+    {
+        eyeData.Left.PupilDiameter_MM = _parameterValues["PupilDilation"];
+        eyeData.Right.PupilDiameter_MM = _parameterValues["PupilDilation"];
+    }
+    
     private void HandleEyeOpenness(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes,
         bool isSingleEyeMode = false)
     {