Fix recognizing Oculus devices in UnityXRModule

Author: lawwong

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

@@ -149,26 +149,32 @@ public sealed override void BeforeRenderUpdate()
 
             InputDevices.GetDevices(connectedDevices);
 
+            var hmdModelNum = string.Empty;
             foreach (var device in connectedDevices)
             {
                 if (!indexMap.TryGetIndex(device, out deviceIndex))
                 {
+                    string deviceName;
+
                     if (indexMap.TryMapAsHMD(device))
                     {
                         deviceIndex = VRModule.HMD_DEVICE_INDEX;
                         EnsureValidDeviceState(deviceIndex, out prevState, out currState);
+                        deviceName = device.name;
+                        hmdModelNum = deviceName + " - ";
                     }
                     else
                     {
                         // this function will skip VRModule.HMD_DEVICE_INDEX (preserved index for HMD)
                         deviceIndex = FindAndEnsureUnusedNotHMDDeviceState(out prevState, out currState);
                         indexMap.MapNonHMD(device, deviceIndex);
+                        deviceName = hmdModelNum + device.name;
                     }
 
                     currState.deviceClass = GetDeviceClass(device.name, device.characteristics);
-                    currState.serialNumber = device.name + " " + device.serialNumber + " " + (int)device.characteristics;
-                    currState.modelNumber = device.name + " (" + device.characteristics + ")";
-                    currState.renderModelName = device.name + " (" + device.characteristics + ")";
+                    currState.serialNumber = deviceName + " " + device.serialNumber + " " + (int)device.characteristics;
+                    currState.modelNumber = deviceName + " (" + device.characteristics + ")";
+                    currState.renderModelName = deviceName + " (" + device.characteristics + ")";
 
                     SetupKnownDeviceModel(currState);
 

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

@@ -39,6 +39,8 @@ protected enum DefaultModuleOrder
             private static readonly Regex s_focus3Rgx = new Regex("focus3", REGEX_OPTIONS);
             private static readonly Regex s_ver3Rgx = new Regex("^.*3.0.*$", REGEX_OPTIONS);
             private static readonly Regex s_oculusRgx = new Regex("^.*(oculus|quest).*$", REGEX_OPTIONS);
+            private static readonly Regex s_questRgx = new Regex("(quest)", REGEX_OPTIONS);
+            private static readonly Regex s_quest2Rgx = new Regex("(quest2|quest 2)", REGEX_OPTIONS);
             private static readonly Regex s_indexRgx = new Regex("^.*(index|knuckles).*$", REGEX_OPTIONS);
             private static readonly Regex s_knucklesRgx = new Regex("^.*(knu_ev1).*$", REGEX_OPTIONS);
             private static readonly Regex s_daydreamRgx = new Regex("^.*(daydream).*$", REGEX_OPTIONS);
@@ -231,58 +233,37 @@ protected static void SetupKnownDeviceModel(IVRModuleDeviceStateRW deviceState)
                             deviceState.deviceModel = VRModuleDeviceModel.OculusHMD;
                             return;
                         case VRModuleDeviceClass.Controller:
-                            if (Application.platform == RuntimePlatform.Android)
                             {
-                                if (deviceState.modelNumber.Contains("Go"))
+                                var headName = GetDeviceState(HMD_DEVICE_INDEX).modelNumber;
+                                if (s_quest2Rgx.IsMatch(deviceState.modelNumber))
                                 {
-                                    deviceState.deviceModel = VRModuleDeviceModel.OculusGoController;
-                                    deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusQuest2ControllerLeft : VRModuleDeviceModel.OculusQuest2ControllerRight;
+                                    deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                                else if (s_leftRgx.IsMatch(deviceState.modelNumber))
+                                else if (deviceState.modelNumber.Contains("Rift S") || deviceState.modelNumber.Contains("Quest"))
                                 {
-                                    deviceState.deviceModel = VRModuleDeviceModel.OculusQuestControllerLeft;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusQuestOrRiftSControllerLeft : VRModuleDeviceModel.OculusQuestOrRiftSControllerRight;
                                     deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                                else if (s_rightRgx.IsMatch(deviceState.modelNumber))
+                                else if (deviceState.modelNumber.Contains("Touch"))
                                 {
-                                    deviceState.deviceModel = VRModuleDeviceModel.OculusQuestControllerRight;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusTouchLeft : VRModuleDeviceModel.OculusTouchRight;
                                     deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                            }
-                            else
-                            {
-                                if (deviceState.modelNumber.Contains("Rift S") || deviceState.modelNumber.Contains("Quest"))
+                                else if (deviceState.modelNumber.Contains("Go"))
                                 {
-                                    if (s_leftRgx.IsMatch(deviceState.modelNumber))
-                                    {
-                                        deviceState.deviceModel = VRModuleDeviceModel.OculusQuestControllerLeft;
-                                        deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
-                                        return;
-                                    }
-                                    else if (s_rightRgx.IsMatch(deviceState.modelNumber))
-                                    {
-                                        deviceState.deviceModel = VRModuleDeviceModel.OculusQuestControllerRight;
-                                        deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
-                                        return;
-                                    }
+                                    deviceState.deviceModel = VRModuleDeviceModel.OculusGoController;
+                                    deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
+                                    return;
                                 }
-                                else
+                                else if (deviceState.modelNumber.Contains("Gear"))
                                 {
-                                    if (s_leftRgx.IsMatch(deviceState.modelNumber))
-                                    {
-                                        deviceState.deviceModel = VRModuleDeviceModel.OculusTouchLeft;
-                                        deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
-                                        return;
-                                    }
-                                    else if (s_rightRgx.IsMatch(deviceState.modelNumber))
-                                    {
-                                        deviceState.deviceModel = VRModuleDeviceModel.OculusTouchRight;
-                                        deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
-                                        return;
-                                    }
+                                    deviceState.deviceModel = VRModuleDeviceModel.OculusGearVrController;
+                                    deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
+                                    return;
                                 }
                             }
                             break;