Merge pull request #1 from esnya/fix/reconnection

Fix Gaze Space & Reconnection Handling

Author: esnya

.editorconfig

@@ -271,6 +271,7 @@ tab_width = 4
 indent_size = 4
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
 end_of_line = crlf
+dotnet_diagnostic.CA1051.severity = none
 
 
 [{VS_PC_SDK,FaceData}.cs]

ViveStreamingEyes.cs

@@ -88,7 +88,7 @@ private void UpdateEyeDirection(Eye eye, FaceData.EyeDataIndex xIndex, FaceData.
             var direction = new float3(
                 eyeData[xIndex],
                 eyeData[yIndex],
-                eyeData[zIndex]
+                -eyeData[zIndex]
             ).Normalized;
 
             if (!direction.IsNaN && !direction.Approximately(float3.Zero, 0.001f))

ViveStreamingFaceTrackingDriver.cs

@@ -21,38 +21,9 @@ public sealed class ViveStreamingFaceTrackingDriver : IInputDriver, IDisposable
         private static string? eyeData;
         private static string? lipData;
 
-        private bool _active;
-        public bool Active
-        {
-            set
-            {
-                if (_active == value)
-                {
-                    return;
-                }
+        private bool _tracking;
+        public bool active;
 
-                _active = value;
-                if (value)
-                {
-                    if (!VS_PC_SDK.VS_StartFaceTracking())
-                    {
-                        ResoniteMod.Error("Failed to start face tracking");
-                        throw new InvalidOperationException("Failed to start face tracking");
-                    }
-                }
-                else
-                {
-                    if (!VS_PC_SDK.VS_StopFaceTracking())
-                    {
-                        throw new InvalidOperationException("Failed to stop face tracking");
-                    }
-                }
-            }
-            get
-            {
-                return _active;
-            }
-        }
         public ViveStreamingFaceTrackingDriver()
         {
             ResoniteMod.Debug($"Initializing Vive Streaming Face Tracking");
@@ -169,13 +140,38 @@ private static void OnDebugLog(string message)
 
         public void UpdateInputs(float deltaTime)
         {
+            if (connected && !_tracking && active)
+            {
+                if (!VS_PC_SDK.VS_StartFaceTracking())
+                {
+                    ResoniteMod.Error("Failed to start face tracking");
+                    throw new InvalidOperationException("Failed to start face tracking");
+                }
+                _tracking = true;
+            }
+
+            if (connected && _tracking && !active)
+            {
+                if (!VS_PC_SDK.VS_StopFaceTracking())
+                {
+                    ResoniteMod.Error("Failed to stop face tracking");
+                    throw new InvalidOperationException("Failed to stop face tracking");
+                }
+                _tracking = false;
+            }
+
+            if (!connected)
+            {
+                _tracking = false;
+            }
+
             eyes?.UpdateInputs(connected, ref eyeData);
             mouth?.UpdateInputs(connected, ref lipData);
         }
 
         public void Dispose()
         {
-            Active = false;
+            active = false;
 
             var result = VS_PC_SDK.VS_Release();
             if (result != 0)

ViveStreamingFaceTrackingMod.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Linq;
 using System.Reflection;
-
 using Elements.Core;
-using ResoniteModLoader;
 using FrooxEngine;
+using ResoniteModLoader;
 
 
 
@@ -55,11 +54,11 @@ private static void Init(ResoniteMod modInstance)
         {
             config = modInstance?.GetConfiguration();
 
-            driver.Active = config?.GetValue(enabledkey) ?? true;
+            driver.active = config?.GetValue(enabledkey) ?? true;
 
             enabledkey.OnChanged += (_) =>
             {
-                driver.Active = config?.GetValue(enabledkey) ?? true;
+                driver.active = config?.GetValue(enabledkey) ?? true;
             };
         }