A slight refactor to make it easier to support v2 and legacy params

Author: lorow

ExpressionStrategies/IExpressionMapper.cs

@@ -0,0 +1,15 @@
+using VRCFaceTracking.Core.Params.Data;
+
+namespace ETVRTrackingModule.ExpressionStrategies;
+
+public interface IExpressionMapper
+{
+    public static string GetParamToMap(string oscAddress)
+    {
+        var oscUrlSplit = oscAddress.Split("/");
+        return oscUrlSplit[^1];
+    }
+    
+    public void handleOSCMessage(OSCMessage message);
+    public void UpdateVRCFTEyeData( ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes);
+}

ExpressionStrategies/V1Mapper.cs

@@ -0,0 +1,35 @@
+using VRCFaceTracking.Core.Params.Data;
+
+namespace ETVRTrackingModule.ExpressionStrategies;
+
+public class V1Mapper : IExpressionMapper
+{
+    private Dictionary<string, float> parameterValues = new()
+    {
+        { "RightEyeLidExpandedSqueeze", 0f }, // no fucking idea if this should be EyeWide bullfuck
+        { "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))
+        {
+            parameterValues[paramToMap] = message.value;
+        }
+    }
+
+    public void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
+    {
+        throw new NotImplementedException();
+    }
+}

ExpressionStrategies/V2Mapper.cs

@@ -0,0 +1,33 @@
+using VRCFaceTracking.Core.Params.Data;
+
+namespace ETVRTrackingModule.ExpressionStrategies;
+
+public class V2Mapper : IExpressionMapper
+{
+    private Dictionary<string, float> parameterValues = new()
+    {
+        { "EyeX", 0f },
+        { "EyeLeftX", 0f },
+        { "EyeRightX", 0f },
+        { "EyeLeftY", 0f },
+        { "EyeRightY", 0f },
+        { "EyeLid", 0f },
+        { "EyeLidLeft", 0f },
+        { "EyeLidRight", 0f },
+    };
+    
+
+    public void handleOSCMessage(OSCMessage message)
+    {
+        string paramToMap = IExpressionMapper.GetParamToMap(message.address);
+        if (parameterValues.ContainsKey(paramToMap))
+        {
+            parameterValues[paramToMap] = message.value;
+        }
+    }
+
+    public void UpdateVRCFTEyeData(ref UnifiedEyeData eyeData, ref UnifiedExpressionShape[] eyeShapes)
+    {
+        throw new NotImplementedException();
+    }
+}

ExpressionsMapper.cs

@@ -1,63 +1,40 @@
-
+using ETVRTrackingModule.ExpressionStrategies;
 using Microsoft.Extensions.Logging;
-using VRCFaceTracking.Core.Params.Data;
-using VRCFaceTracking.Core.Params.Expressions;
+using VRCFaceTracking;
 
 namespace ETVRTrackingModule
 {
     public class ExpressionsMapper
     {
-        private Dictionary<string, float> parameterValues = new()
-        {
-            // v1, legacy support
-            { "RightEyeLidExpandedSqueeze", 0f },
-            { "LeftEyeLidExpandedSqueeze", 0f },
-            { "LeftEyeX", 0f },
-            { "RightEyeX", 0f },
-            { "EyesY", 0f },
-            // v2
-            { "EyeX", 0f },
-            { "EyeLeftX", 0f },
-            { "EyeRightX", 0f },
-            { "EyeLeftY", 0f },
-            { "EyeRightY", 0f },
-            { "EyeLid", 0f },
-            { "EyeLidLeft", 0f },
-            { "EyeLidRight", 0f },
-        };
-
+        private IExpressionMapper _mappingStrategy;
+        
         ILogger _logger;
         public ExpressionsMapper(ILogger logger) 
         {
             _logger = logger;
+            _mappingStrategy = new V2Mapper();
         }
         public void MapMessage(OSCMessage msg)
         {
             if (!msg.success)
                 return;
-            if (IsV2Param(msg))
+            
+            var nextStrategy =  IsV2Param(msg) ? (IExpressionMapper) new V2Mapper() : new V1Mapper();
+            if (_mappingStrategy.GetType() != nextStrategy.GetType())
             {
-                string paramToMap = GetParamToMap(msg.address);
-                if (parameterValues.ContainsKey(paramToMap))
-                {
-                    parameterValues[paramToMap] = msg.value;
-                }
+                _mappingStrategy = nextStrategy;
             }
+            _mappingStrategy.handleOSCMessage(msg);
         }
 
         private bool IsV2Param(OSCMessage oscMessage)
         {
             return oscMessage.address.Contains("/v2/");
         }
 
-        private static string GetParamToMap(string oscAddress)
-        {
-            var oscUrlSplit = oscAddress.Split("/");
-            return oscUrlSplit[^1];
-        }
-
         public void UpdateVRCFTEyeData()
         {
+            _mappingStrategy.UpdateVRCFTEyeData(ref UnifiedTracking.Data.Eye, ref UnifiedTracking.Data.Shapes);
         }
     }
 }

OSCManager.cs

@@ -26,27 +26,26 @@ public class OSCManager
         private ExpressionsMapper _expressionMapper;
 
         private int _receivingPort;
-        private const int _defaultPort = 8889;
-        private const int connectionTimeout = 10000;
+        private const int DefaultPort = 8889;
+        private const int ConnectionTimeout = 10000;
 
         public OSCManager(ILogger iLogger, ExpressionsMapper expressionsMapper, int? port = null) {
             _logger = iLogger;
             _expressionMapper = expressionsMapper;
-            _receivingPort = port ?? _defaultPort;
+            _receivingPort = port ?? DefaultPort;
             _receiver = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
 
             try
             {
                 // we should make this a setting, how do settings work in vrcft?
                 _receiver.Bind(new IPEndPoint(IPAddress.Loopback, _receivingPort));
-                _receiver.ReceiveTimeout = connectionTimeout;
+                _receiver.ReceiveTimeout = ConnectionTimeout;
                 State = OSCState.CONNECTED;
             }
             catch (Exception e)
             {
                 _logger.LogError(e.ToString());
                 State = OSCState.ERROR;
-                
             }
 
             _literningThread = new Thread(OSCListen);