Skip to content

Commit e83bf4f

Browse files
jdiehlUnityPauliusd01jfreire-unity
authored
FIX: Add ENABLE_VR || UNITY_GAMECORE conditionals back for InputDeviceCharacteristics (#2210)
Co-authored-by: Paulius Dervinis <[email protected]> Co-authored-by: João Freire <[email protected]>
1 parent 0ede4ed commit e83bf4f

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ however, it has to be formatted properly to pass verification tests.
1212

1313
### Fixed
1414
- Fixed an issue where using Pen devices on Android tablets would result in double clicks for UI interactions. [ISXB-1456](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1456)
15-
16-
15+
- Fixed an issue preventing an embedded platform from being released. It adds back some `#defines` to `XRSupport` and `InputDeviceCharacteristics`.
1716

1817
## [1.14.1] - 2025-07-10
1918

@@ -47,6 +46,10 @@ however, it has to be formatted properly to pass verification tests.
4746
- Fixed PlayerInput component not working with C# Wrappers (ISXB-1535). This reverted changes done to fix [ISXB-920](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-920) but users can now fix it themselves.
4847
- Fixed an issue that caused input processors with enum properties to incorrectly serialise by index instead of by value [ISXB-1474](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1474)
4948

49+
### Changed
50+
51+
- Changed conditional guards inside Plugins/XR so that we don't unnecessarily wrap entire classes. This stops downstream packages from having to also wrap Input System objects with similar conditionals.
52+
5053
## [1.14.0] - 2025-03-20
5154

5255
### Fixed
@@ -57,7 +60,6 @@ however, it has to be formatted properly to pass verification tests.
5760

5861
### Changed
5962
- Changed enum value `Key.IMESelected` to obsolete which was not a real key. Please use the ButtonControl `imeSelected`.
60-
- Changed conditional guards inside Plugins/XR so that we don't unnecessarily wrap entire classes. This stops downstream packages from having to also wrap Input System objects with similar conditionals.
6163

6264
### Added
6365
- Added support of F13-F24 keys. [UUM-44328](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-44328)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class XRController : TrackedDevice
112112
protected override void FinishSetup()
113113
{
114114
base.FinishSetup();
115-
#if UNITY_INPUT_SYSTEM_ENABLE_XR
115+
#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE)
116116
var capabilities = description.capabilities;
117117
var deviceDescriptor = XRDeviceDescriptor.FromJson(capabilities);
118118

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ internal static string OnFindLayoutForDevice(ref InputDeviceDescription descript
8888
{
8989
return null;
9090
}
91-
#if UNITY_INPUT_SYSTEM_ENABLE_XR
91+
#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE)
9292
if (string.IsNullOrEmpty(matchedLayout))
9393
{
9494
const InputDeviceCharacteristics controllerCharacteristics = InputDeviceCharacteristics.HeldInHand | InputDeviceCharacteristics.Controller;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class XRDeviceDescriptor
102102
/// <summary>
103103
/// The capabilities of the device, used to help filter and identify devices that server a certain purpose (e.g. controller, or headset, or hardware tracker).
104104
/// </summary>
105-
#if UNITY_INPUT_SYSTEM_ENABLE_XR
105+
#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE)
106106
public InputDeviceCharacteristics characteristics;
107107
#else
108108
[SerializeField]

0 commit comments

Comments
 (0)