Added missing support to disable SteamVR/OpenVR support.

zezba9000 · zezba9000 · commit b9a0e6b09f80 · 2021-08-18T19:06:57.000-07:00
diff --git a/Assets/VRstudios/XRInput/API/OpenVR_Legacy.cs b/Assets/VRstudios/XRInput/API/OpenVR_Legacy.cs
@@ -4,13 +4,13 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-#if UNITY_STANDALONE
+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR
 using Valve.VR;
 #endif
 
 namespace VRstudios.API
 {
-#if UNITY_STANDALONE
+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR
     public sealed class OpenVR_Legacy : XRInputAPI
     {
         private CVRSystem system;
diff --git a/Assets/VRstudios/XRInput/API/OpenVR_New.cs b/Assets/VRstudios/XRInput/API/OpenVR_New.cs
@@ -2,13 +2,13 @@
 using System.Runtime.InteropServices;
 using System.IO;
 
-#if UNITY_STANDALONE
+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR
 using Valve.VR;
 #endif
 
 namespace VRstudios.API
 {
-#if UNITY_STANDALONE
+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR
     public sealed class OpenVR_New : XRInputAPI
 	{
         private CVRSystem system;
diff --git a/Assets/VRstudios/XRInput/XRInput.cs b/Assets/VRstudios/XRInput/XRInput.cs
@@ -61,7 +61,7 @@ private IEnumerator Start()
             singleton = this;
 
             // print version
-            Debug.Log("XRInput version: 1.0.10");
+            Debug.Log("XRInput version: 1.0.11");
 
             // wait for XR loader
             while (loader == null || !XRSettings.enabled)
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.15f2
-m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)
+m_EditorVersion: 2020.3.16f1
+m_EditorVersionWithRevision: 2020.3.16f1 (049d6eca3c44)

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`using System.Runtime.InteropServices;`
`5`	`5`	`using System.Text;`
`6`	`6`
`7`		`-#if UNITY_STANDALONE`
	`7`	`+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR`
`8`	`8`	`using Valve.VR;`
`9`	`9`	`#endif`
`10`	`10`
`11`	`11`	`namespace VRstudios.API`
`12`	`12`	`{`
`13`		`-#if UNITY_STANDALONE`
	`13`	`+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR`
`14`	`14`	`public sealed class OpenVR_Legacy : XRInputAPI`
`15`	`15`	`{`
`16`	`16`	`private CVRSystem system;`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`	`using System.Runtime.InteropServices;`
`3`	`3`	`using System.IO;`
`4`	`4`
`5`		`-#if UNITY_STANDALONE`
	`5`	`+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR`
`6`	`6`	`using Valve.VR;`
`7`	`7`	`#endif`
`8`	`8`
`9`	`9`	`namespace VRstudios.API`
`10`	`10`	`{`
`11`		`-#if UNITY_STANDALONE`
	`11`	`+#if UNITY_STANDALONE && !XRINPUT_DISABLE_STEAMVR`
`12`	`12`	`public sealed class OpenVR_New : XRInputAPI`
`13`	`13`	`{`
`14`	`14`	`private CVRSystem system;`