Merge pull request #2 from pikepikeid/Fix2

Fix2

Author: pikepikeid

VRCFTPicoModule/Assets/Locales/en-US.json

@@ -13,5 +13,10 @@
   "expression-tracking": "Expression Tracking",
   "init-failed": "Initialization failed, exception: {0}",
   "update-timeout": "Receive data timed out",
-  "update-failed": "Update failed with exception: {0}"
+  "update-failed": "Update failed with exception: {0}",
+  "eye-gain-loaded": "Eye gain loaded: X={0}, Y={1}",
+  "eye-gain-invalid": "Invalid eye_gain.txt format: \"{0}\"",
+  "eye-gain-not-found": "eye_gain.txt not found, using default values",
+  "eye-gain-disabled": "Eye gain disabled",
+  "eye-gain-failed": "Failed to read eye_gain.txt"
 }

VRCFTPicoModule/Utils/Updater.cs

@@ -31,6 +31,9 @@ public Updater(UdpClient udpClient, ILogger logger, bool isLegacy, (bool, bool)
         private const float SmoothingFactor = 0.5f;
         private ModuleState _moduleState;
 
+        public float EyeGainX { get; internal set; } = 1.0f;
+        public float EyeGainY { get; internal set; } = 1.0f;
+
         public void Update(ModuleState state)
         {
             if (_udpClient == null)
@@ -81,20 +84,20 @@ private static float[] ParseData(byte[] data, bool isLegacy)
             return header.trackingType == 2 ? DataPacketHelpers.ByteArrayToStructure<DataPacket.DataPackBody>(data, Marshal.SizeOf<DataPacket.DataPackHeader>()).blendShapeWeight : [];
         }
 
-        private static void UpdateEye(float[] pShape)
+        private void UpdateEye(float[] pShape)
         {
             var eye = UnifiedTracking.Data.Eye;
 
             #region LeftEye
             eye.Left.Openness = 1f - pShape[(int)BlendShape.Index.EyeBlink_L];
-            eye.Left.Gaze.x = pShape[(int)BlendShape.Index.EyeLookIn_L] - pShape[(int)BlendShape.Index.EyeLookOut_L];
-            eye.Left.Gaze.y = pShape[(int)BlendShape.Index.EyeLookUp_L] - pShape[(int)BlendShape.Index.EyeLookDown_L];
+            eye.Left.Gaze.x = (pShape[(int)BlendShape.Index.EyeLookIn_L] - pShape[(int)BlendShape.Index.EyeLookOut_L]) * EyeGainX;
+            eye.Left.Gaze.y = (pShape[(int)BlendShape.Index.EyeLookUp_L] - pShape[(int)BlendShape.Index.EyeLookDown_L]) * EyeGainY;
             #endregion
 
             #region RightEye
             eye.Right.Openness = 1f - pShape[(int)BlendShape.Index.EyeBlink_R];
-            eye.Right.Gaze.x = pShape[(int)BlendShape.Index.EyeLookOut_R] - pShape[(int)BlendShape.Index.EyeLookIn_R];
-            eye.Right.Gaze.y = pShape[(int)BlendShape.Index.EyeLookUp_R] - pShape[(int)BlendShape.Index.EyeLookDown_R];
+            eye.Right.Gaze.x = (pShape[(int)BlendShape.Index.EyeLookOut_R] - pShape[(int)BlendShape.Index.EyeLookIn_R]) * EyeGainX;
+            eye.Right.Gaze.y = (pShape[(int)BlendShape.Index.EyeLookUp_R] - pShape[(int)BlendShape.Index.EyeLookDown_R]) * EyeGainY;
             #endregion
 
             #region Brow
@@ -111,8 +114,8 @@ private static void UpdateEye(float[] pShape)
             #region Eye
             SetParam(pShape, BlendShape.Index.EyeSquint_L, UnifiedExpressions.EyeSquintLeft);
             SetParam(pShape, BlendShape.Index.EyeSquint_R, UnifiedExpressions.EyeSquintRight);
-            SetParam(pShape[(int)BlendShape.Index.EyeWide_L] / 0.5f, UnifiedExpressions.EyeWideLeft); // 目を見開けるように補正
-            SetParam(pShape[(int)BlendShape.Index.EyeWide_R] / 0.5f, UnifiedExpressions.EyeWideRight); // 目を見開けるように補正
+            SetParam(pShape, BlendShape.Index.EyeWide_L, UnifiedExpressions.EyeWideLeft);
+            SetParam(pShape, BlendShape.Index.EyeWide_R, UnifiedExpressions.EyeWideRight);
             #endregion
         }
 

VRCFTPicoModule/VRCFTPicoModule.cs

@@ -16,6 +16,13 @@ public class VRCFTPicoModule : ExtTrackingModule
     private static int _port;
     private Updater? _updater;
     private (bool, bool) _trackingAvailable;
+    private static readonly string GainFilePath =
+    Path.Combine(
+        Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)!,
+        "eye_gain.txt"
+    );
+    private static float _eyeGainX = 1.0f;
+    private static float _eyeGainY = 1.0f;
 
     public override (bool SupportsEye, bool SupportsExpression) Supported => (true, true);
 
@@ -36,6 +43,7 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
         return initializationResult;
     }
 
+
     private async Task<(bool eyeSuccess, bool expressionSuccess)> InitializeAsync()
     {
         Logger.LogDebug(T("initializing-udp-clients"), string.Join(", ", Ports));
@@ -51,12 +59,15 @@ public override (bool eyeSuccess, bool expressionSuccess) Initialize(bool eyeAva
             Logger.LogInformation(T("eye-tracking-disabled"));
         if (!_trackingAvailable.Item2)
             Logger.LogInformation(T("expression-tracking-disabled"));
-
+        
+        LoadEyeGain();
         _updater = new Updater(_udpClient, Logger, _port == Ports[1], _trackingAvailable);
+        _updater.EyeGainX = _eyeGainX;
+        _updater.EyeGainY = _eyeGainY;
 
         return _trackingAvailable;
     }
-
+    
     private (bool, bool) ReadConfiguration()
     {
         var currentDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
@@ -140,4 +151,36 @@ public override void Teardown()
         _udpClient.Dispose();
         _updater = null;
     }
+    private void LoadEyeGain()
+    {
+        try
+        {
+            if (!File.Exists(GainFilePath))
+            {
+                Logger.LogDebug("eye_gain.txt not found, using default values");
+                return;
+            }
+
+            var text = File.ReadAllText(GainFilePath).Trim();
+            var parts = text.Split(',');
+
+            if (parts.Length >= 2 &&
+                float.TryParse(parts[0], NumberStyles.Float, CultureInfo.InvariantCulture, out var x) &&
+                float.TryParse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture, out var y))
+            {
+                _eyeGainX = x;
+                _eyeGainY = y;
+
+                Logger.LogInformation($"Eye gain loaded: X={_eyeGainX}, Y={_eyeGainY}");
+            }
+            else
+            {
+                Logger.LogWarning($"Invalid eye_gain.txt format: \"{text}\"");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Failed to read eye_gain.txt");
+        }
+    }
 }