Avoid conflict deviceClass for ETrackedDeviceClass.DisplayRedirect & VRModuleDeviceClass.TrackedHand

Author: lawwong

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

@@ -106,6 +106,18 @@ public void Clear()
                 for (int i = module2tracked.Length - 1; i >= 0; --i) { module2tracked[i] = OpenVR.k_unTrackedDeviceIndexInvalid; }
             }
         }
+
+        public static VRModuleDeviceClass ToVRModuleDeviceClass(ETrackedDeviceClass deviceClass)
+        {
+            switch (deviceClass)
+            {
+                case ETrackedDeviceClass.HMD: return VRModuleDeviceClass.HMD;
+                case ETrackedDeviceClass.Controller: return VRModuleDeviceClass.Controller;
+                case ETrackedDeviceClass.GenericTracker: return VRModuleDeviceClass.GenericTracker;
+                case ETrackedDeviceClass.TrackingReference: return VRModuleDeviceClass.TrackingReference;
+                default: return VRModuleDeviceClass.Invalid;
+            }
+        }
 #endif
 
 #if VIU_STEAMVR && UNITY_STANDALONE
@@ -423,7 +435,7 @@ private void UpdateConnectedDevice(TrackedDevicePose_t[] poses)
                         {
                             m_openvrCtrlRoleDirty = true;
                             currState.isConnected = true;
-                            currState.deviceClass = (VRModuleDeviceClass)vrSystem.GetTrackedDeviceClass(trackedIndex);
+                            currState.deviceClass = ToVRModuleDeviceClass(vrSystem.GetTrackedDeviceClass(i));
                             currState.serialNumber = QueryDeviceStringProperty(vrSystem, trackedIndex, ETrackedDeviceProperty.Prop_SerialNumber_String);
                             currState.modelNumber = QueryDeviceStringProperty(vrSystem, trackedIndex, ETrackedDeviceProperty.Prop_ModelNumber_String);
                             currState.renderModelName = QueryDeviceStringProperty(vrSystem, trackedIndex, ETrackedDeviceProperty.Prop_RenderModelName_String);

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

@@ -420,7 +420,7 @@ private void UpdateDeviceConnectionAndPose(bool obj)
                         if (!prevState.isConnected)
                         {
                             currState.isConnected = true;
-                            currState.deviceClass = (VRModuleDeviceClass)vrSystem.GetTrackedDeviceClass(i);
+                            currState.deviceClass = ToVRModuleDeviceClass(vrSystem.GetTrackedDeviceClass(i));
                             currState.serialNumber = QueryDeviceStringProperty(vrSystem, i, ETrackedDeviceProperty.Prop_SerialNumber_String);
                             currState.modelNumber = QueryDeviceStringProperty(vrSystem, i, ETrackedDeviceProperty.Prop_ModelNumber_String);
                             currState.renderModelName = QueryDeviceStringProperty(vrSystem, i, ETrackedDeviceProperty.Prop_RenderModelName_String);