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.
needle-mirror · Oct 17, 2021 · b785be4 · b785be4
1 parent 830b74c
commit b785be4
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 37 deletions.
diff --git 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
@@ -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<ButtonControl>("triggerButton");
             trigger = GetChildControl<AxisControl>("trigger");
-            bumper = GetChildControl<ButtonControl>("bumper");
+            bumperButton = GetChildControl<ButtonControl>("bumperbutton");
+            bumper = GetChildControl<AxisControl>("bumper");
             menu = GetChildControl<ButtonControl>("menu");
 
             dof = GetChildControl<IntegerControl>("dof");
@@ -257,4 +259,4 @@ protected override void FinishSetup()
         }
     }
 }
-#endif
+#endif
diff --git a/Runtime/Windows/UnityMagicLeap.dll b/Runtime/Windows/UnityMagicLeap.dll
diff --git a/Runtime/macOS/UnityMagicLeap.bundle b/Runtime/macOS/UnityMagicLeap.bundle
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.unity.xr.magicleap",
   "displayName": "Magic Leap XR Plugin",
-  "version": "6.4.1",
+  "version": "6.4.2-preview.1",
   "unity": "2020.2",
   "description": "Provides rendering and spatial mapping support for Magic Leap.\n\nNOTE: Unity 2020 LTS will be the last version of the editor which supports Magic Leap 1.\n\nDevelopers can continue to build for Magic Leap 1 using Unity 2020 LTS or 2019 LTS.",
   "keywords": [
@@ -17,17 +17,17 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.xr": "1.0.0",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.arsubsystems": "4.0.12",
+    "com.unity.xr.arfoundation": "4.1.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
-    "com.unity.xr.management": "4.0.7"
+    "com.unity.xr.management": "4.1.0"
   },
   "upmCi": {
-    "footprint": "341dad925133ff24ba8fe2373e9b9ad5ad885484"
+    "footprint": "9cb3174ca65ec2c789baa02e69c9c3f10d920dfe"
   },
   "repository": {
     "url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.magicleap.git",
     "type": "git",
-    "revision": "676be2c41661d5c4287fb0cac157aedadae166a8"
+    "revision": "81031dfd4104f4c6ac3f2c05229fd167fa43559a"
   },
   "samples": [
     {