Further preparation for mapping ETVR data to parameters

Author: lorow

ETVRTrackingModule.cs

@@ -9,10 +9,10 @@ public class ETVRTrackingModule : ExtTrackingModule
         private OSCManager? _OSCManager;
         private ExpressionsMapper? _expressionMapper;
 
-        public override (bool SupportsEye, bool SupportsExpression) Supported => (true, false);
+        public override (bool SupportsEye, bool SupportsExpression) Supported => (true, true);
         public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAvailable, bool expressionAvailable)
         {
-            _expressionMapper = new ExpressionsMapper();
+            _expressionMapper = new ExpressionsMapper(Logger);
             _OSCManager = new OSCManager(Logger, _expressionMapper);
 
             if (_OSCManager.State != OSCState.CONNECTED) {
@@ -24,7 +24,7 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
             var stream = GetType().Assembly.GetManifestResourceStream("ETVRTrackingModule.Assets.ETVRLogo.png");
             ModuleInformation.StaticImages = stream != null? new List<Stream> { stream } : ModuleInformation.StaticImages;
 
-            return (true, false);
+            return (true, true);
         }
 
         public override void Teardown()
@@ -34,7 +34,7 @@ public override void Teardown()
 
         public override void Update()
         {
-            _expressionMapper?.UpdateVRCFTDict();
+            _expressionMapper?.UpdateVRCFTEyeData();
             Thread.Sleep(10);
         }
     }

ExpressionsMapper.cs

@@ -1,9 +1,63 @@
 
+using Microsoft.Extensions.Logging;
+using VRCFaceTracking.Core.Params.Data;
+using VRCFaceTracking.Core.Params.Expressions;
+
 namespace ETVRTrackingModule
 {
     public class ExpressionsMapper
     {
-        public void MapMessage(OSCMessage msg) { }
-        public void UpdateVRCFTDict() { }
+        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 },
+        };
+
+        ILogger _logger;
+        public ExpressionsMapper(ILogger logger) 
+        {
+            _logger = logger;
+        }
+        public void MapMessage(OSCMessage msg)
+        {
+            if (!msg.success)
+                return;
+            if (IsV2Param(msg))
+            {
+                string paramToMap = GetParamToMap(msg.address);
+                if (parameterValues.ContainsKey(paramToMap))
+                {
+                    parameterValues[paramToMap] = msg.value;
+                }
+            }
+        }
+
+        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()
+        {
+        }
     }
 }