Allow you to disable OpenXR detection

zezba9000 · zezba9000 · commit b4a2c649750d · 2022-11-14T15:14:33.000-08:00
diff --git a/Assets/VRstudios/XRInput/XRInput.cs b/Assets/VRstudios/XRInput/XRInput.cs
@@ -111,10 +111,14 @@ private IEnumerator Start()
                 {
                     if (loaderTypeName == "OpenXRLoader")
                     {
+                        #if !XRINPUT_DISABLE_OPENXR
                         string platformName = UnityEngine.XR.OpenXR.OpenXRRuntime.name;
                         Debug.Log($"OpenXR platform name '{platformName}'");
                         if (platformName == "Oculus") apiType = XRInputAPIType.OculusXR;
                         else apiType = XRInputAPIType.UnityEngine_XR;
+                        #else
+                        throw new NotSupportedException("You have XRINPUT_DISABLE_OPENXR enabled");
+                        #endif
                     }
                     else if (loaderTypeName == "OculusLoader")
                     {

Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,14 @@ private IEnumerator Start()`
`111`	`111`	`{`
`112`	`112`	`if (loaderTypeName == "OpenXRLoader")`
`113`	`113`	`{`
	`114`	`+ #if !XRINPUT_DISABLE_OPENXR`
`114`	`115`	`string platformName = UnityEngine.XR.OpenXR.OpenXRRuntime.name;`
`115`	`116`	`Debug.Log($"OpenXR platform name '{platformName}'");`
`116`	`117`	`if (platformName == "Oculus") apiType = XRInputAPIType.OculusXR;`
`117`	`118`	`else apiType = XRInputAPIType.UnityEngine_XR;`
	`119`	`+ #else`
	`120`	`+ throw new NotSupportedException("You have XRINPUT_DISABLE_OPENXR enabled");`
	`121`	`+ #endif`
`118`	`122`	`}`
`119`	`123`	`else if (loaderTypeName == "OculusLoader")`
`120`	`124`	`{`