diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index b644a5b37d..aee42048d6 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -12,6 +12,7 @@ however, it has to be formatted properly to pass verification tests. ### Changed - Replaced "Look" rebinding button for "Keyboard" control scheme with a mouse sensitivity slider in `RebindingUISample` to illustrate how to support customizing scaling of mouse deltas and how to reapply the persisted setting between runs. +- Changed: Input System no longer depends the obsolete com.unity.modules.vr package. ### Added - Added an example of how to swap two similar controls to the `RebindingUISample`. This is accessible via a button with two arrows at the right hand-side of the screen. Pressing the button allows swapping the current bindings of the "Move" and "Look" gamepad bindings via the new `RebindActionUI.SwapBinding(RebindActionUI other)` method. diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs index 36f312a1e9..affde24152 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs @@ -418,16 +418,6 @@ protected void Reset() /// protected virtual void Awake() { -#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR - if (HasStereoCamera(out var cameraComponent)) - { - // The Unity 6.4+ replacement for this call has to be figured later - // See https://jira.unity3d.com/browse/XR-7591 -#pragma warning disable CS0618 - UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(cameraComponent, true); -#pragma warning restore CS0618 - } -#endif } /// @@ -459,16 +449,6 @@ protected void OnDisable() /// protected virtual void OnDestroy() { -#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR - if (HasStereoCamera(out var cameraComponent)) - { - // The Unity 6.4+ replacement for this call has to be figured later - // See https://jira.unity3d.com/browse/XR-7591 -#pragma warning disable CS0618 - UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(cameraComponent, false); -#pragma warning restore CS0618 - } -#endif } /// @@ -630,11 +610,6 @@ protected virtual void SetLocalTransform(Vector3 newPosition, Quaternion newRota } } - bool HasStereoCamera(out Camera cameraComponent) - { - return TryGetComponent(out cameraComponent) && cameraComponent.stereoEnabled; - } - // Evaluates whether the given action has at least one resolved control and may generate input. private static bool HasResolvedControl(InputAction action) { diff --git a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef index 7dc45c083f..3adff080e5 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef +++ b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef @@ -32,11 +32,6 @@ "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", diff --git a/Packages/manifest.json b/Packages/manifest.json index 47deea3119..04e9d9d2b6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -41,7 +41,6 @@ "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.modules.vehicles": "1.0.0", "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" } diff --git a/Tools/CodeAnalyzerTestProject/Packages/manifest.json b/Tools/CodeAnalyzerTestProject/Packages/manifest.json index 2101eb315c..8a2c71da62 100644 --- a/Tools/CodeAnalyzerTestProject/Packages/manifest.json +++ b/Tools/CodeAnalyzerTestProject/Packages/manifest.json @@ -30,7 +30,6 @@ "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.modules.vehicles": "1.0.0", "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" }