Skip to content

Commit f055bdd

Browse files
committed
Expand the filter list a bit
to catch Oculus and Windows XR Plugin as well
1 parent f1c60c9 commit f055bdd

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,11 @@ protected virtual SupportedControllerType GetCurrentControllerType(string joysti
234234
{
235235
// todo: this should be using an allow list, not a disallow list
236236
if (string.IsNullOrEmpty(joystickName) ||
237-
joystickName.Contains("OpenVR") ||
238-
joystickName.Contains("OpenXR") ||
239-
joystickName.Contains("Spatial"))
237+
joystickName.Contains("OpenVR") || // This catches input sources from legacy OpenVR
238+
joystickName.Contains("OpenXR") || // This catches input sources from OpenXR Plugin
239+
joystickName.Contains("Oculus") || // This catches controllers from Oculus XR Plugin
240+
joystickName.Contains("Hand - ") || // This catches HoloLens hands from Windows XR Plugin
241+
joystickName.Contains("Spatial")) // This catches controllers from Windows XR Plugin and all input sources from legacy WMR
240242
{
241243
return 0;
242244
}

0 commit comments

Comments
 (0)