Skip to content

FIX: Removing dependencies on VRModule #2251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

FIX: Removing dependencies on VRModule #2251

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
751b6af
Removing dependencies on VRModule
RogPodge Oct 2, 2025
db1e773
Added changelog entry
RogPodge Oct 2, 2025
ca5f257
Merge branch 'develop' of https://github.com/Unity-Technologies/Input…
RogPodge Oct 3, 2025
c1f3927
Adding back API so as not to be a breaking change
RogPodge Oct 6, 2025
83cd60a
Merge branch 'develop' into vrmodule-deprecation
RogPodge Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ however, it has to be formatted properly to pass verification tests.
## [Unreleased] - yyyy-mm-dd
- Fixed InputControl picker not updating correctly when the Input Actions Window was dirty. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221)
- Fixed formatting issues on processor documentation page
- Fixed an issue where a warning would be appear due to code referencing the obsolete com.unity.modules.vr package.

### Changed
- Expanded `RebindingUISample` to include a "game mode" state and a "menu state" to be more similar to a real game. Also added action-performed indicators (`InputActionIndicator`) illustrating when actions get triggered.
Expand Down
34 changes: 0 additions & 34 deletions Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,23 +413,6 @@ protected void Reset()
m_TrackingStateInput = new InputActionProperty(new InputAction("Tracking State", expectedControlType: "Integer"));
}

/// <summary>
/// This function is called when the script instance is being loaded.
/// </summary>
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
}

/// <summary>
/// This function is called when the object becomes enabled and active.
/// </summary>
Expand All @@ -454,23 +437,6 @@ protected void OnDisable()
InputSystem.onDeviceChange -= OnDeviceChanged;
}

/// <summary>
/// This function is called when the <see cref="MonoBehaviour"/> will be destroyed.
/// </summary>
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
}

/// <summary>
/// The callback method called after the Input System has completed an update and processed all pending events.
/// </summary>
Expand Down
5 changes: 0 additions & 5 deletions Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also need to remove code that utilize UNITY_INPUT_SYSTEM_ENABLE_VR?

Copy link
Collaborator Author

@RogPodge RogPodge Oct 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were no code paths left in the InputSystem or Engine repository that utilized the define UNITY_INPUT_SYSTEM_ENABLE_VR

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

},
{
"name": "com.unity.modules.xr",
"expression": "1.0.0",
Expand Down
1 change: 0 additions & 1 deletion Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 0 additions & 1 deletion Tools/CodeAnalyzerTestProject/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
Loading