Backporting fix for the issue of building XR/VR on platforms that don't have complete implementation.

Dmytro Ivanov · Dmytro Ivanov · commit 83ec8ee9fbb2 · 2021-01-19T12:45:48.000+01:00
diff --git a/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs b/Assets/QA/Tests/XRDeviceActions/_SharedScripts/Handedness.cs
@@ -3,6 +3,8 @@
 using UnityEngine.UI;
 using UnityEngine.InputSystem.XR;
 
+#if ENABLE_VR || ENABLE_AR
+
 public class Handedness : MonoBehaviour
 {
     public Text statusText;
@@ -24,3 +26,4 @@ public void Update()
         statusText.text = handedness;
     }
 }
+#endif
diff --git a/Assets/QA/Tests/XRHaptics/XRHaptics.cs b/Assets/QA/Tests/XRHaptics/XRHaptics.cs
@@ -4,6 +4,7 @@
 
 using UnityEngine.UI;
 
+#if ENABLE_VR || ENABLE_AR
 public class XRHaptics : MonoBehaviour
 {
     public Image leftHapticDetected;
@@ -90,3 +91,5 @@ private void UpdateTimer()
         }
     }
 }
+
+#endif
diff --git a/Assets/Tests/InputSystem/Plugins/XRTests.cs b/Assets/Tests/InputSystem/Plugins/XRTests.cs
@@ -1,4 +1,5 @@
 #if UNITY_EDITOR || UNITY_STANDALONE || UNITY_ANDROID || UNITY_IOS || UNITY_WSA
+#if ENABLE_VR || ENABLE_AR
 using System;
 using NUnit.Framework;
 using System.Collections.Generic;
@@ -693,4 +694,5 @@ public FourCC format
         }
     }
 }
+#endif
 #endif // UNITY_EDITOR || UNITY_STANDALONE || UNITY_ANDROID || UNITY_IOS || UNITY_WSA
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Due to package verification, the latest version below is the unpublished version and the date is meaningless.
 however, it has to be formatted properly to pass verification tests.
 
+## [1.0.2] - 2021-1-13
+
+- Fixed compilation issues with XR and VR references when building to platforms that do not have complete XR and VR implementations. Backported from 1.1.0-preview.1
+
 ## [1.0.1] - 2020-11-20
 
 ### Fixed
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -3083,7 +3083,7 @@ private static void PerformDefaultPluginInitialization()
             Switch.SwitchSupportHID.Initialize();
             #endif
 
-            #if (UNITY_EDITOR || UNITY_STANDALONE || UNITY_ANDROID || UNITY_IOS || UNITY_WSA) && UNITY_INPUT_SYSTEM_ENABLE_XR
+            #if (UNITY_EDITOR || UNITY_STANDALONE || UNITY_ANDROID || UNITY_IOS || UNITY_WSA) && UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR
             XR.XRSupport.Initialize();
             #endif
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/GoogleVR.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !PACKAGE_DOCS_GENERATION
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !PACKAGE_DOCS_GENERATION
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Layouts;
 using UnityEngine.InputSystem.XR;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR && !DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS && !PACKAGE_DOCS_GENERATION
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_OCULUS && !PACKAGE_DOCS_GENERATION
 using UnityEngine.InputSystem;
 using UnityEngine.Scripting;
 using UnityEngine.InputSystem.XR;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/OpenVR.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR && !DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR && !PACKAGE_DOCS_GENERATION
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_OPENVR && !PACKAGE_DOCS_GENERATION
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Layouts;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR && !DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR && !PACKAGE_DOCS_GENERATION
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR && !PACKAGE_DOCS_GENERATION
 using UnityEngine.InputSystem.XR;
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.Layouts;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using UnityEngine.InputSystem.Controls;
 using UnityEngine.InputSystem.XR.Haptics;
 using UnityEngine.InputSystem.Layouts;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/BufferedRumble.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 namespace UnityEngine.InputSystem.XR.Haptics
 {
     public struct BufferedRumble
@@ -25,4 +25,4 @@ public void EnqueueRumble(byte[] samples)
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetCurrentHapticStateCommand.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using System.Runtime.InteropServices;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.LowLevel;
@@ -46,4 +46,4 @@ public static GetCurrentHapticStateCommand Create()
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/GetHapticCapabilitiesCommand.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using System.Runtime.InteropServices;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.LowLevel;
@@ -51,4 +51,4 @@ public static GetHapticCapabilitiesCommand Create()
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendBufferedHapticsCommand.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using System.Runtime.InteropServices;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.LowLevel;
@@ -52,4 +52,4 @@ public static SendBufferedHapticCommand Create(byte[] rumbleBuffer)
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Haptics/SendHapticImpulseCommand.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using System.Runtime.InteropServices;
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.InputSystem.LowLevel;
@@ -49,4 +49,4 @@ public static SendHapticImpulseCommand Create(int motorChannel, float motorAmpli
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs
@@ -147,7 +147,7 @@ void OnRotationUpdate(InputAction.CallbackContext context)
 
         protected virtual void Awake()
         {
-#if UNITY_INPUT_SYSTEM_ENABLE_VR
+#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR
             if (HasStereoCamera())
             {
                 UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(GetComponent<Camera>(), true);
@@ -169,7 +169,7 @@ void OnDisable()
 
         protected virtual void OnDestroy()
         {
-#if UNITY_INPUT_SYSTEM_ENABLE_VR
+#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR
             if (HasStereoCamera())
             {
                 UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(GetComponent<Camera>(), false);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR
 using System;
 using System.Collections.Generic;
 using UnityEngine.InputSystem.LowLevel;
@@ -280,4 +280,4 @@ private InputControlLayout Build()
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs
@@ -1,4 +1,4 @@
-#if UNITY_INPUT_SYSTEM_ENABLE_XR || PACKAGE_DOCS_GENERATION
+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
 using System;
 using System.Collections.Generic;
 using UnityEngine.XR;
@@ -426,4 +426,4 @@ public static void Initialize()
         }
     }
 }
-#endif // UNITY_INPUT_SYSTEM_ENABLE_XR
+#endif // (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) || PACKAGE_DOCS_GENERATION
diff --git a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef
@@ -11,11 +11,6 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [
-        {
-            "name": "com.unity.modules.xr",
-            "expression": "1.0.0",
-            "define": "UNITY_INPUT_SYSTEM_ENABLE_XR"
-        },
         {
             "name": "com.unity.xr.oculus",
             "expression": "1.0.3",
@@ -36,16 +31,16 @@
             "expression": "2.0.3",
             "define": "DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR"
         },
-        {
-            "name": "Select...",
-            "expression": "2.0.3",
-            "define": "DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR"
-        },
         {
             "name": "com.unity.modules.vr",
             "expression": "1.0.0",
             "define": "UNITY_INPUT_SYSTEM_ENABLE_VR"
         },
+        {
+            "name": "com.unity.modules.xr",
+            "expression": "1.0.0",
+            "define": "UNITY_INPUT_SYSTEM_ENABLE_XR"
+        },
         {
             "name": "com.unity.modules.physics",
             "expression": "1.0.0",
diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.inputsystem",
 	"displayName": "Input System",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"unity": "2019.1",
 	"repository": {
 		"type": "git",

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`using UnityEngine.UI;`
`4`	`4`	`using UnityEngine.InputSystem.XR;`
`5`	`5`
	`6`	`+#if ENABLE_VR \|\| ENABLE_AR`
	`7`	`+`
`6`	`8`	`public class Handedness : MonoBehaviour`
`7`	`9`	`{`
`8`	`10`	`public Text statusText;`
`@@ -24,3 +26,4 @@ public void Update()`
`24`	`26`	`statusText.text = handedness;`
`25`	`27`	`}`
`26`	`28`	`}`
	`29`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using UnityEngine.UI;`
`6`	`6`
	`7`	`+#if ENABLE_VR \|\| ENABLE_AR`
`7`	`8`	`public class XRHaptics : MonoBehaviour`
`8`	`9`	`{`
`9`	`10`	`public Image leftHapticDetected;`
`@@ -90,3 +91,5 @@ private void UpdateTimer()`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`	`}`
	`94`	`+`
	`95`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#if UNITY_EDITOR \|\| UNITY_STANDALONE \|\| UNITY_ANDROID \|\| UNITY_IOS \|\| UNITY_WSA`
	`2`	`+#if ENABLE_VR \|\| ENABLE_AR`
`2`	`3`	`using System;`
`3`	`4`	`using NUnit.Framework;`
`4`	`5`	`using System.Collections.Generic;`
`@@ -693,4 +694,5 @@ public FourCC format`
`693`	`694`	`}`
`694`	`695`	`}`
`695`	`696`	`}`
	`697`	`+#endif`
`696`	`698`	`#endif // UNITY_EDITOR \|\| UNITY_STANDALONE \|\| UNITY_ANDROID \|\| UNITY_IOS \|\| UNITY_WSA`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if UNITY_INPUT_SYSTEM_ENABLE_XR && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !PACKAGE_DOCS_GENERATION`
	`1`	`+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR && !DISABLE_BUILTIN_INPUT_SYSTEM_GOOGLEVR && !PACKAGE_DOCS_GENERATION`
`2`	`2`	`using UnityEngine.InputSystem.Controls;`
`3`	`3`	`using UnityEngine.InputSystem.Layouts;`
`4`	`4`	`using UnityEngine.InputSystem.XR;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if UNITY_INPUT_SYSTEM_ENABLE_XR \|\| PACKAGE_DOCS_GENERATION`
	`1`	`+#if (UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR) \|\| PACKAGE_DOCS_GENERATION`
`2`	`2`	`using UnityEngine.InputSystem.Controls;`
`3`	`3`	`using UnityEngine.InputSystem.XR.Haptics;`
`4`	`4`	`using UnityEngine.InputSystem.Layouts;`