Skip to content

Commit 2c4a437

Browse files
authored
FIX: Remove dependencies on VRModule (#2251)
1 parent 78ed98f commit 2c4a437

File tree

5 files changed

+1
-32
lines changed

5 files changed

+1
-32
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ however, it has to be formatted properly to pass verification tests.
1212

1313
### Changed
1414
- 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.
15+
- Changed: Input System no longer depends the obsolete com.unity.modules.vr package.
1516

1617
### Added
1718
- 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.

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/TrackedPoseDriver.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -418,16 +418,6 @@ protected void Reset()
418418
/// </summary>
419419
protected virtual void Awake()
420420
{
421-
#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR
422-
if (HasStereoCamera(out var cameraComponent))
423-
{
424-
// The Unity 6.4+ replacement for this call has to be figured later
425-
// See https://jira.unity3d.com/browse/XR-7591
426-
#pragma warning disable CS0618
427-
UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(cameraComponent, true);
428-
#pragma warning restore CS0618
429-
}
430-
#endif
431421
}
432422

433423
/// <summary>
@@ -459,16 +449,6 @@ protected void OnDisable()
459449
/// </summary>
460450
protected virtual void OnDestroy()
461451
{
462-
#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR
463-
if (HasStereoCamera(out var cameraComponent))
464-
{
465-
// The Unity 6.4+ replacement for this call has to be figured later
466-
// See https://jira.unity3d.com/browse/XR-7591
467-
#pragma warning disable CS0618
468-
UnityEngine.XR.XRDevice.DisableAutoXRCameraTracking(cameraComponent, false);
469-
#pragma warning restore CS0618
470-
}
471-
#endif
472452
}
473453

474454
/// <summary>
@@ -630,11 +610,6 @@ protected virtual void SetLocalTransform(Vector3 newPosition, Quaternion newRota
630610
}
631611
}
632612

633-
bool HasStereoCamera(out Camera cameraComponent)
634-
{
635-
return TryGetComponent(out cameraComponent) && cameraComponent.stereoEnabled;
636-
}
637-
638613
// Evaluates whether the given action has at least one resolved control and may generate input.
639614
private static bool HasResolvedControl(InputAction action)
640615
{

Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
"expression": "2.0.3",
3333
"define": "DISABLE_BUILTIN_INPUT_SYSTEM_WINDOWSMR"
3434
},
35-
{
36-
"name": "com.unity.modules.vr",
37-
"expression": "1.0.0",
38-
"define": "UNITY_INPUT_SYSTEM_ENABLE_VR"
39-
},
4035
{
4136
"name": "com.unity.modules.xr",
4237
"expression": "1.0.0",

Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"com.unity.modules.unitywebrequestwww": "1.0.0",
4242
"com.unity.modules.vehicles": "1.0.0",
4343
"com.unity.modules.video": "1.0.0",
44-
"com.unity.modules.vr": "1.0.0",
4544
"com.unity.modules.wind": "1.0.0",
4645
"com.unity.modules.xr": "1.0.0"
4746
}

Tools/CodeAnalyzerTestProject/Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"com.unity.modules.unitywebrequestwww": "1.0.0",
3131
"com.unity.modules.vehicles": "1.0.0",
3232
"com.unity.modules.video": "1.0.0",
33-
"com.unity.modules.vr": "1.0.0",
3433
"com.unity.modules.wind": "1.0.0",
3534
"com.unity.modules.xr": "1.0.0"
3635
}

0 commit comments

Comments
 (0)