From b785be458a4d2496b2972e6baa3811a05021e9cb Mon Sep 17 00:00:00 2001 From: Unity Technologies <@unity> Date: Sun, 17 Oct 2021 00:00:00 +0000 Subject: [PATCH] com.unity.xr.magicleap@6.4.2-preview.1 ## [6.4.2-preview.1] - 2021-10-17 - Updating AR Subsystems to AR Foundation. - Releasing Input System fix. --- CHANGELOG.md | 6 ++- Runtime/Input/DeviceLayouts.cs | 64 ++++++++++++++-------------- Runtime/Windows/UnityMagicLeap.dll | Bin 470528 -> 470528 bytes Runtime/macOS/UnityMagicLeap.bundle | Bin 371544 -> 371544 bytes package.json | 10 ++--- 5 files changed, 43 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a78d1..c8205d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Changelog +## [6.4.2-preview.1] - 2021-10-17 +- Updating AR Subsystems to AR Foundation. +- Releasing Input System fix. + ## [6.4.1] - 2021-10-13 - - Update legal docs with appropriate formatting. +- Update legal docs with appropriate formatting. ## [6.4.0] - 2021-09-15 - Deprecating Lumin for 2021.1 and onwards. diff --git a/Runtime/Input/DeviceLayouts.cs b/Runtime/Input/DeviceLayouts.cs index 662a9c0..fc3111b 100644 --- a/Runtime/Input/DeviceLayouts.cs +++ b/Runtime/Input/DeviceLayouts.cs @@ -1,6 +1,5 @@ #if UNITY_INPUT_SYSTEM using UnityEngine.Scripting; -using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; using UnityEngine.InputSystem.Layouts; using UnityEngine.InputSystem.XR; @@ -89,22 +88,22 @@ public bool EyesEnabled } [Preserve] - [InputControl] + [InputControl(displayName = "Confidence Level")] public AxisControl confidence { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Fixation Point Confidence")] public AxisControl fixationPointConfidence { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Left Eye Center Confidence")] public AxisControl eyeLeftCenterConfidence { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Right Eye Center Confidence")] public AxisControl eyeRightCenterConfidence { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Eyes")] public EyesControl eyes { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Eye Calibration Status")] public IntegerControl eyeCalibrationStatus { get; private set; } @@ -128,26 +127,26 @@ protected override void FinishSetup() public class MagicLeapHandDevice : XRController { [Preserve] - [InputControl] + [InputControl(displayName = "Center Point")] public Vector3Control center { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Rotation")] public QuaternionControl rotation { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Hand Confidence")] public AxisControl handConfidence { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Normalized Center")] public Vector3Control normalizeCenter { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Wrist Center Point")] public Vector3Control wristCenter { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Wrist Ulnar Point")] public Vector3Control wristUlnar { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Wrist Radial Point")] public Vector3Control wristRadial { get; private set; } //Need Bone control and Hand Control @@ -172,45 +171,47 @@ protected override void FinishSetup() public class MagicLeapController : XRController { [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 1 Pressed")] public ButtonControl touchpad1Pressed { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 1 Position")] public Vector2Control touchpad1Position { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 1 Force")] public AxisControl touchpad1Force { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 2 Pressed")] public ButtonControl touchpad2Pressed { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 2 Position")] public Vector2Control touchpad2Position { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Touchpad 2 Force")] public AxisControl touchpad2Force { get; private set; } - [Preserve] - [InputControl] + [InputControl(displayName = "Trigger Button")] public ButtonControl triggerButton { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Trigger Axis")] public AxisControl trigger { get; private set; } [Preserve] - [InputControl] - public ButtonControl bumper { get; private set; } + [InputControl(displayName = "Bumper Button")] + public ButtonControl bumperButton { get; private set; } + [Preserve] + [InputControl(displayName = "Bumper Axis")] + public AxisControl bumper { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Menu")] public ButtonControl menu { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Degrees of Freedom")] public IntegerControl dof { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Calibration Accuracy")] public IntegerControl calibrationAccuracy { get; private set; } [Preserve] - [InputControl] + [InputControl(displayName = "Input Control Type")] public IntegerControl type { get; private set; } @@ -248,7 +249,8 @@ protected override void FinishSetup() triggerButton = GetChildControl("triggerButton"); trigger = GetChildControl("trigger"); - bumper = GetChildControl("bumper"); + bumperButton = GetChildControl("bumperbutton"); + bumper = GetChildControl("bumper"); menu = GetChildControl("menu"); dof = GetChildControl("dof"); @@ -257,4 +259,4 @@ protected override void FinishSetup() } } } -#endif \ No newline at end of file +#endif diff --git a/Runtime/Windows/UnityMagicLeap.dll b/Runtime/Windows/UnityMagicLeap.dll index f1302174cec71e0e50f29a4dd71ea6b8f4e7b202..d5627e7db6e5599d40814cba8f0c4024bbbca3ca 100644 GIT binary patch delta 131 zcmZp;Bhzq4W`h7DvzcLevoK@3Fe3;v0WmWWvuqb;WHo$i4U|k|00Jf;t_0#O7HkY# zS_7ie!+fT@` HTkrz_?-m?< delta 131 zcmZp;Bhzq4W`h7DbA(%ZvoK@3Fe3;v0WmWWvuqb;WHo$i4U|k|00Jf;t_0#O7HkY# zBc^Df}=IowV#k<+kQfh H-GUzgPK+N( diff --git a/Runtime/macOS/UnityMagicLeap.bundle b/Runtime/macOS/UnityMagicLeap.bundle index dd270119a13001f82276eb1465752229d14a528b..df0113ad23f74007fa8b3e8bf5ebff0d97be75aa 100644 GIT binary patch delta 208 zcmca{P3*=sv4$4LEleB2nRSfHr*95ts%6$QD&KA#!NkkQtP5m0r!mQLfW)RJ=P~_d zHUJ7G=QEvEW7Y>Lo5obj4i?)ym#LPG*$^bQglR1&voVnMcrDXeJ}_(Z9wuHvFzfJH zCRr9{Q;_UMCSG9>Yx?IWOm87VPnp&-f?1QFgIH!jWzH{|bS1&8VkTx^DQ0t^*kKvw VUN(?ed$2My5VLF#R%T`G007n(MF;=@ delta 208 zcmca{P3*=sv4$4LEleB2nLoRwPv0EQRLlIuEq%Lj1QRbGnB|