-
Notifications
You must be signed in to change notification settings - Fork 329
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.
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
base: develop
Are you sure you want to change the base?
Changes from all commits
751b6af
db1e773
ca5f257
c1f3927
83cd60a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -418,16 +418,6 @@ protected void Reset() | |
/// </summary> | ||
protected virtual void Awake() | ||
{ | ||
#if UNITY_INPUT_SYSTEM_ENABLE_VR && ENABLE_VR | ||
if (HasStereoCamera(out var cameraComponent)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should also be able to delete the |
||
{ | ||
// 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 | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice. Can we remove the now empty Awake and OnDestroy as well? Thanks There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No because they are |
||
|
||
/// <summary> | ||
|
@@ -459,16 +449,6 @@ protected void OnDisable() | |
/// </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> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we also need to remove code that utilize There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice! |
||
}, | ||
{ | ||
"name": "com.unity.modules.xr", | ||
"expression": "1.0.0", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Currently we have to support all Unity versions down to 2021.3 xLTS. Is this change aligned with that? Just asking to make sure. CC @ekcoh for viz. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. legacy VR module was used to support VR development before Unity 2019, so should have no effects on 2021.3+ |
||
"com.unity.modules.wind": "1.0.0", | ||
"com.unity.modules.xr": "1.0.0" | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a typo in the message. However, the warning part should have already been covered by
Fixed the compilation warnings when used with Unity 6.4 (ISX-2349).
just a few lines above in the changelog (as part of that change we also added a suppression message that made this warning go away). Provided that, maybe we should put this note in another section and say something likeChanged: Input System no longer depends on the obsolete com.unity.modules.vr package
?