Support combined and sepatate eye tracking

Author: zmerp

ALVRModule/ALVRModule.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using VRCFaceTracking;
 using VRCFaceTracking.Core.Params.Expressions;
+using VRCFaceTracking.Core.Types;
 using static VRCFaceTracking.Core.Params.Expressions.UnifiedExpressions;
 
 namespace ALVRModule
@@ -111,6 +112,65 @@ private static float[] GetParams(byte[] packet, ref int cursor, int param_count)
             return data;
         }
 
+        // Code taken from VRCFaceTracking-QuestProOpenXR
+        private static void SetEyesQuatParams(float[] p)
+        {
+            Debug.Assert(p.Length == 8);
+
+            var eye = UnifiedTracking.Data.Eye;
+
+            var q_x = p[0];
+            var q_y = p[1];
+            var q_z = p[2];
+            var q_w = p[3];
+
+            double yaw = Math.Atan2(2.0 * (q_y * q_z + q_w * q_x), q_w * q_w - q_x * q_x - q_y * q_y + q_z * q_z);
+            double pitch = Math.Asin(-2.0 * (q_x * q_z - q_w * q_y));
+
+            double pitch_L = (180.0 / Math.PI) * pitch;
+            double yaw_L = (180.0 / Math.PI) * yaw;
+
+            q_x = p[4];
+            q_y = p[5];
+            q_z = p[6];
+            q_w = p[7];
+            yaw = Math.Atan2(2.0 * (q_y * q_z + q_w * q_x), q_w * q_w - q_x * q_x - q_y * q_y + q_z * q_z);
+            pitch = Math.Asin(-2.0 * (q_x * q_z - q_w * q_y));
+
+            double pitch_R = (180.0 / Math.PI) * pitch;
+            double yaw_R = (180.0 / Math.PI) * yaw;
+
+            var radianConst = 0.0174533f;
+
+            var pitch_R_mod = (float)(Math.Abs(pitch_R) + 4f * Math.Pow(Math.Abs(pitch_R) / 30f, 30f));
+            var pitch_L_mod = (float)(Math.Abs(pitch_L) + 4f * Math.Pow(Math.Abs(pitch_L) / 30f, 30f));
+            var yaw_R_mod = (float)(Math.Abs(yaw_R) + 6f * Math.Pow(Math.Abs(yaw_R) / 27f, 18f));
+            var yaw_L_mod = (float)(Math.Abs(yaw_L) + 6f * Math.Pow(Math.Abs(yaw_L) / 27f, 18f));
+
+            eye.Right.Gaze = new Vector2(
+                pitch_R < 0 ? pitch_R_mod * radianConst : -1 * pitch_R_mod * radianConst,
+                yaw_R < 0 ? -1 * yaw_R_mod * radianConst : (float)yaw_R * radianConst);
+            eye.Left.Gaze = new Vector2(
+                pitch_L < 0 ? pitch_L_mod * radianConst : -1 * pitch_L_mod * radianConst,
+                yaw_L < 0 ? -1 * yaw_L_mod * radianConst : (float)yaw_L * radianConst);
+
+            eye.Left.PupilDiameter_MM = 5f;
+            eye.Right.PupilDiameter_MM = 5f;
+
+            eye._minDilation = 0;
+            eye._maxDilation = 10;
+        }
+        private static void SetCombEyesQuatParams(float[] p)
+        {
+            Debug.Assert(p.Length == 4);
+
+            var array = new float[8];
+            p.CopyTo(array, 0);
+            p.CopyTo(array, 4);
+
+            SetEyesQuatParams(array);
+        }
+
         private static void SetFaceFbParams(float[] p)
         {
             Debug.Assert(p.Length == (int)FaceFbMax);
@@ -121,16 +181,6 @@ private static void SetFaceFbParams(float[] p)
             eye.Left.Openness = 1.0f - (float)Math.Max(0, Math.Min(1, p[(int)EyesClosedL] + p[(int)EyesClosedL] * p[(int)LidTightenerL]));
             eye.Right.Openness = 1.0f - (float)Math.Max(0, Math.Min(1, p[(int)EyesClosedR] + p[(int)EyesClosedR] * p[(int)LidTightenerR]));
 
-            eye.Left.Gaze.x = (p[(int)EyesLookRightL] - p[(int)EyesLookLeftL]) * 0.5f;
-            eye.Left.Gaze.y = (p[(int)EyesLookUpL] - p[(int)EyesLookDownL]) * 0.5f;
-            eye.Right.Gaze.x = (p[(int)EyesLookRightR] - p[(int)EyesLookLeftR]) * 0.5f;
-            eye.Right.Gaze.y = (p[(int)EyesLookUpR] - p[(int)EyesLookDownR]) * 0.5f;
-
-            eye._minDilation = 0.0f;
-            eye._maxDilation = 1.0f;
-            eye.Left.PupilDiameter_MM = 0.5f;
-            eye.Right.PupilDiameter_MM = 0.5f;
-
             static void SetParam(float[] data, FaceFb input, UnifiedExpressions outputType)
             {
                 UnifiedTracking.Data.Shapes[(int)outputType].Weight = data[(int)input];
@@ -246,6 +296,12 @@ public override void Update()
 
                 switch (str)
                 {
+                    case "EyesQuat":
+                        SetFaceFbParams(GetParams(packet, ref cursor, 8));
+                        break;
+                    case "CombQuat":
+                        SetFaceFbParams(GetParams(packet, ref cursor, 4));
+                        break;
                     case "FaceFb\0\0":
                         SetFaceFbParams(GetParams(packet, ref cursor, (int)FaceFbMax));
                         break;

metadata.json

@@ -3,14 +3,14 @@
     "AuthorName": "zarik5",
     "DllFileName": "ALVRModule.dll",
     "Downloads": 0,
-    "DownloadUrl": "https://github.com/alvr-org/VRCFT-ALVR/releases/download/v1.1.0/ALVRModule.zip",
-    "LastUpdated": "2023-08-18T16:19:33Z",
+    "DownloadUrl": "https://github.com/alvr-org/VRCFT-ALVR/releases/download/v1.2.0/ALVRModule.zip",
+    "LastUpdated": "2023-11-08T07:36:37Z",
     "ModuleDescription": "VRCFaceTracking module for ALVR support",
     "ModuleName": "ALVR Module",
     "ModulePageUrl": "https://github.com/alvr-org/VRCFT-ALVR",
     "Rating": 0,
     "Ratings": 0,
     "RatingSum": 0,
     "UsageInstructions": "Set `Eye and face tracking` to `VRCFaceTracking`. Reconnect the client if necessary.",
-    "Version": "1.1.0"
+    "Version": "1.2.0"
 }