CHANGE: Replaced XR layout builder logic to create Axis2D inputs as Stick controls (#1649)

* [CHANGE] Replaced XR layout builder logic to create Axis2D inputs as Stick controls

* Moved cahngelog entry to unreleased list.

* Updated XRTests with proper layout

* Fixed broken RotateToFrom implementation

* Moved changelog entry to Unreleased section

---------

Co-authored-by: Chris Rodríguez <chris.rodriguez@unity3d.com>
Co-authored-by: chris-at-unity <124618947+chris-at-unity@users.noreply.github.com>
Co-authored-by: roger.liu <roger.liu@unity3d.com>
Co-authored-by: RogPodge <39840334+RogPodge@users.noreply.github.com>

Author: 3 people

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -108,8 +108,8 @@ public Quaternion RotateFromTo(Vector3 position, GameObject from, GameObject to)
         {
             var fromPosition = from.GetComponent<RectTransform>().position;
             var toPosition = to.GetComponent<RectTransform>().position;
-            var angle = Mathf.Asin((fromPosition - toPosition).magnitude / (position - fromPosition).magnitude);
-            return Quaternion.Euler(0, angle * Mathf.Rad2Deg, 0);
+            var angle = Vector3.Angle(fromPosition - position, toPosition - position);
+            return Quaternion.Euler(0, angle, 0);
         }
     }
 

Assets/Tests/InputSystem/Plugins/XRTests.cs

@@ -255,7 +255,7 @@ public void Layouts_AllFeatureTypes_AreRepresentedInTheGeneratedLayout()
         var vec2Control = generatedLayout["Vector2"];
         Assert.That(vec2Control.name, Is.EqualTo(new InternedString("Vector2")));
         Assert.That(vec2Control.offset, Is.EqualTo(12));
-        Assert.That(vec2Control.layout, Is.EqualTo(new InternedString("Vector2")));
+        Assert.That(vec2Control.layout, Is.EqualTo(new InternedString("Stick")));
         Assert.That(vec2Control.usages.Count, Is.EqualTo(1));
         Assert.That(vec2Control.usages[0], Is.EqualTo(new InternedString("Axis2DUsage")));
 

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -15,6 +15,9 @@ however, it has to be formatted properly to pass verification tests.
 - Added `InputSystem.runInBackground` to be used internally by specific platforms packages. Allows telling the input system that a specific platform runs in background. It allows fixing of [case UUM-6744](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-6744).
 - Added new UIToolkit version of the `InputActionsAsset` editor. Currently this is incomplete (view-only) and the existing editor is still used by default.
 
+### Changed
+- Changed XR Layout build behavior to create Axis2D control devices with `StickControl` type instead of `Vector2Control`.
+
 ## [1.5.1] - 2023-03-15
 
 ### Fixed

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

@@ -282,7 +282,7 @@ private InputControlLayout Build()
                     case FeatureType.Axis2D:
                     {
                         builder.AddControl(featureName)
-                            .WithLayout("Vector2")
+                            .WithLayout("Stick")
                             .WithByteOffset(currentOffset)
                             .WithFormat(InputStateBlock.FormatVector2)
                             .WithUsages(currentUsages);