Add UnityXRHandSubmodule

Author: lawwong

Assets/HTC.UnityPlugin/HTC.ViveInputUtility.asmdef

@@ -17,7 +17,8 @@
         "Wave.Essence.Controller.Model",
         "Unity.InputSystem",
         "Unity.XR.OpenXR",
-        "Wave.XRSDK"
+        "Wave.XRSDK",
+        "Unity.XR.Hands"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -36,6 +37,11 @@
             "name": "com.htc.upm.wave.essence",
             "expression": "5.4.0",
             "define": "VIU_WAVE_ESSENCE_5_4_OR_NEWER"
+        },
+        {
+            "name": "com.unity.xr.hands",
+            "expression": "",
+            "define": "VIU_UNITY_XR_HAND"
         }
     ],
     "noEngineReferences": false

Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs

@@ -474,12 +474,19 @@ static OculusVRModule()
 #endif
         }
 
+        private static string s_loaderNameCache;
+        private static VRModuleKnownXRLoader s_knownLoaderCache;
         public override bool ShouldActiveModule()
         {
             if (!VIUSettings.activateOculusVRModule) { return false; }
 #pragma warning disable 0162
 #if VIU_XR_GENERAL_SETTINGS
-            return UnityXRModuleBase.HasActiveLoader(OCULUS_XR_LOADER_NAME);
+            if (!UnityXRModuleBase.TryGetActiveLoaderName(out var loaderName)) { return false; }
+            if (s_loaderNameCache != loaderName) { 
+                s_loaderNameCache = loaderName;
+                s_knownLoaderCache = UnityXRModuleBase.ToKnownXRLoader(loaderName);
+            }
+            return s_knownLoaderCache == VRModuleKnownXRLoader.Oculus;
 #endif
 #if UNITY_2019_3_OR_NEWER
             return false;

Assets/HTC.UnityPlugin/VRModule/Modules/UnityXRModuleBase.cs

@@ -131,9 +131,10 @@ private static int CompareRoleIdx(RoleIdx a, RoleIdx b)
         private static string shortIdx(uint i) { return i == INVALID_DEVICE_INDEX ? "X" : i.ToString(); }
 
         private VRModule.SubmoduleBase.Collection submodules = new VRModule.SubmoduleBase.Collection(
-            new ViveHandTrackingSubmodule(),
-            new WaveHandTrackingSubmodule(),
-            new WaveTrackerSubmodule()
+            new ViveHandTrackingSubmodule()
+            , new WaveHandTrackingSubmodule()
+            , new WaveTrackerSubmodule()
+            , new UnityXRHandSubmodule()
             );
 
         private bool[] prevDeviceConnected = new bool[VRModule.MAX_DEVICE_COUNT];
@@ -160,11 +161,12 @@ public override void OnActivated()
             EnsureDeviceStateLength(8);
             UpdateTrackingSpaceType();
             submodules.ActivateAllModules();
-            Debug.Log("Activated XRLoader Name: " + XRGeneralSettings.Instance.Manager.activeLoader.name);
+            Debug.Log("[UnityXRModule] OnActivated XRLoader Name: " + XRGeneralSettings.Instance.Manager.activeLoader.name);
         }
 
         public override void OnDeactivated()
         {
+            Debug.Log("[UnityXRModule] OnDeactivated");
             submodules.DeactivateAllModules();
             indexMap.Clear();
         }
@@ -208,7 +210,6 @@ public sealed override void BeforeRenderUpdate()
                 if (!indexMap.TryGetIndex(device, out deviceIndex))
                 {
                     string deviceName;
-
                     if (indexMap.TryMapAsHMD(device))
                     {
                         deviceIndex = VRModule.HMD_DEVICE_INDEX;
@@ -272,27 +273,28 @@ public sealed override void BeforeRenderUpdate()
                     if ((device.characteristics & InputDeviceCharacteristics.Right) != 0u) { rightIndice.Add(new RoleIdx(currState)); }
                     else if ((device.characteristics & InputDeviceCharacteristics.Left) != 0u) { leftIndice.Add(new RoleIdx(currState)); }
                 }
-
                 // TODO: update hand skeleton pose
             }
 
             // unmap index for disconnected device state
-            for (uint i = 0u, imax = (uint)prevMaxConnectedIndex; i <= imax; ++i)
+            for (int i = 0, imax = prevMaxConnectedIndex; i <= imax; ++i)
             {
                 if (prevDeviceConnected[i] && !currDeviceConnected[i])
                 {
-                    if (indexMap.IsMapped(i))
+                    if (indexMap.IsMapped((uint)i))
                     {
-                        indexMap.UnmapByIndex(i);
+                        indexMap.UnmapByIndex((uint)i);
+                        //Debug.Log("[UnityXRModule] unmap [" + i + "]");
                     }
                     else
                     {
                         Debug.LogWarning("[UnityXRModule] unmap failed: [" + i + "] already unmapped");
                     }
 
-                    if (TryGetValidDeviceState(i, out prevState, out currState) && currState.isConnected)
+                    if (TryGetValidDeviceState((uint)i, out prevState, out currState) && currState.isConnected)
                     {
                         currState.Reset();
+                        //Debug.Log("[UnityXRModule] reset [" + i + "]");
                     }
                     else
                     {
@@ -410,6 +412,11 @@ protected static VRModuleDeviceClass GetDeviceClass(string name, InputDeviceChar
                 return VRModuleDeviceClass.TrackingReference;
             }
 
+            if ((characteristics & InputDeviceCharacteristics.HandTracking) != 0)
+            {
+                return VRModuleDeviceClass.Invalid;
+            }
+
             if ((characteristics & InputDeviceCharacteristics.TrackedDevice) != 0)
             {
                 return VRModuleDeviceClass.GenericTracker;

Assets/HTC.UnityPlugin/VRModule/Modules/UnityXRModuleUtil.cs

@@ -161,7 +161,7 @@ public static bool HasActiveLoader(string loaderName)
         public static bool HasActiveLoader(VRModuleKnownXRLoader knownLoader)
         {
             string activeLoaderName;
-            return TryGetActiveLoaderName(out activeLoaderName) && knownLoader == ToKnownXRLoader(activeLoaderName);
+            return TryGetActiveLoaderName(out activeLoaderName) && (knownLoader == ToKnownXRLoader(activeLoaderName));
         }
 
         public static VRModuleKnownXRLoader GetKnownActiveLoader()
@@ -178,14 +178,7 @@ public static VRModuleKnownXRLoader GetKnownActiveLoader()
             var loaderName = loader.name;
             if (string.IsNullOrEmpty(loaderName)) { return VRModuleKnownXRLoader.Unknown; }
 
-            foreach (var profile in loaderProfiles)
-            {
-                if (string.IsNullOrEmpty(profile.fixedName) || profile.fixedName != loaderName) { continue; }
-                if (profile.matchNameRgx == null || !profile.matchNameRgx.IsMatch(loaderName)) { continue; }
-                return profile.loader;
-            }
-
-            return VRModuleKnownXRLoader.Unknown;
+            return ToKnownXRLoader(loaderName);
         }
 
         public static VRModuleKnownXRLoader ToKnownXRLoader(string loaderName)