Skip to content

Commit 751b6af

Browse files
committed
Removing dependencies on VRModule
1 parent a32fbdb commit 751b6af

File tree

4 files changed

+0
-41
lines changed

4 files changed

+0
-41
lines changed

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -413,23 +413,6 @@ protected void Reset()
413413
m_TrackingStateInput = new InputActionProperty(new InputAction("Tracking State", expectedControlType: "Integer"));
414414
}
415415

416-
/// <summary>
417-
/// This function is called when the script instance is being loaded.
418-
/// </summary>
419-
protected virtual void Awake()
420-
{
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
431-
}
432-
433416
/// <summary>
434417
/// This function is called when the object becomes enabled and active.
435418
/// </summary>
@@ -454,23 +437,6 @@ protected void OnDisable()
454437
InputSystem.onDeviceChange -= OnDeviceChanged;
455438
}
456439

457-
/// <summary>
458-
/// This function is called when the <see cref="MonoBehaviour"/> will be destroyed.
459-
/// </summary>
460-
protected virtual void OnDestroy()
461-
{
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
472-
}
473-
474440
/// <summary>
475441
/// The callback method called after the Input System has completed an update and processed all pending events.
476442
/// </summary>

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)