Now mix hmd name to recognize controller for Oculus devices only

Author: lawwong

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

@@ -82,7 +82,6 @@ private struct XRInputSubsystemProfile
         private uint uxrLeftIndex = INVALID_DEVICE_INDEX;
         private uint moduleRightIndex = INVALID_DEVICE_INDEX;
         private uint moduleLeftIndex = INVALID_DEVICE_INDEX;
-        private string hmdDeviceName = string.Empty;
         private VRModule.SubmoduleBase.Collection submodules = new VRModule.SubmoduleBase.Collection(
             new ViveHandTrackingSubmodule(),
             new WaveHandTrackingSubmodule(),
@@ -161,14 +160,13 @@ public sealed override void BeforeRenderUpdate()
                         deviceIndex = VRModule.HMD_DEVICE_INDEX;
                         EnsureValidDeviceState(deviceIndex, out prevState, out currState);
                         deviceName = device.name;
-                        hmdDeviceName = 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 = hmdDeviceName + device.name;
+                        deviceName = device.name;
                     }
 
                     currState.deviceClass = GetDeviceClass(device.name, device.characteristics);

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

@@ -234,32 +234,32 @@ protected static void SetupKnownDeviceModel(IVRModuleDeviceStateRW deviceState)
                             return;
                         case VRModuleDeviceClass.Controller:
                             {
-                                var headName = GetDeviceState(HMD_DEVICE_INDEX).modelNumber;
-                                if (s_quest2Rgx.IsMatch(deviceState.modelNumber))
+                                var modelNumWithHmd = GetDeviceState(HMD_DEVICE_INDEX).modelNumber + " " + deviceState.modelNumber;
+                                if (s_quest2Rgx.IsMatch(modelNumWithHmd))
                                 {
-                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusQuest2ControllerLeft : VRModuleDeviceModel.OculusQuest2ControllerRight;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(modelNumWithHmd) ? VRModuleDeviceModel.OculusQuest2ControllerLeft : VRModuleDeviceModel.OculusQuest2ControllerRight;
                                     deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                                else if (deviceState.modelNumber.Contains("Rift S") || deviceState.modelNumber.Contains("Quest"))
+                                else if (modelNumWithHmd.Contains("Rift S") || modelNumWithHmd.Contains("Quest"))
                                 {
-                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusQuestOrRiftSControllerLeft : VRModuleDeviceModel.OculusQuestOrRiftSControllerRight;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(modelNumWithHmd) ? VRModuleDeviceModel.OculusQuestOrRiftSControllerLeft : VRModuleDeviceModel.OculusQuestOrRiftSControllerRight;
                                     deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                                else if (deviceState.modelNumber.Contains("Touch"))
+                                else if (modelNumWithHmd.Contains("Touch"))
                                 {
-                                    deviceState.deviceModel = s_leftRgx.IsMatch(deviceState.modelNumber) ? VRModuleDeviceModel.OculusTouchLeft : VRModuleDeviceModel.OculusTouchRight;
+                                    deviceState.deviceModel = s_leftRgx.IsMatch(modelNumWithHmd) ? VRModuleDeviceModel.OculusTouchLeft : VRModuleDeviceModel.OculusTouchRight;
                                     deviceState.input2DType = VRModuleInput2DType.JoystickOnly;
                                     return;
                                 }
-                                else if (deviceState.modelNumber.Contains("Go"))
+                                else if (modelNumWithHmd.Contains("Go"))
                                 {
                                     deviceState.deviceModel = VRModuleDeviceModel.OculusGoController;
                                     deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;
                                     return;
                                 }
-                                else if (deviceState.modelNumber.Contains("Gear"))
+                                else if (modelNumWithHmd.Contains("Gear"))
                                 {
                                     deviceState.deviceModel = VRModuleDeviceModel.OculusGearVrController;
                                     deviceState.input2DType = VRModuleInput2DType.TouchpadOnly;