FIX: User-contributed fixes (#1477).

Author: Rene Damm

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -2167,6 +2167,9 @@ public void Editor_ActionTree_CompositesAreShownWithNiceNames()
             .With("Negative", "<Keyboard>/a")
             .With("Positive", "<Keyboard>/b");
 
+        // Wipe name that AddCompositeBinding assigned.
+        action.ChangeBinding(0).WithName(null);
+
         var so = new SerializedObject(asset);
         var tree = new InputActionTreeView(so)
         {

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -41,6 +41,8 @@ however, it has to be formatted properly to pass verification tests.
   * This fix relies on a `CanvasGroup` being injected into each `playerRoot` and the `interactable` property of the group being toggled back and forth depending on which part of the UI is being updated.
 - Fixed `InputTestFixture` incorrectly running input updates out of sync with the player loop ([case 1341740](https://issuetracker.unity3d.com/issues/buttoncontrol-dot-waspressedthisframe-is-false-when-using-inputtestfixture-dot-press)).
   * This had effects such as `InputAction.WasPressedThisFrame()` returning false expectedly.
+- Fixed broken code example for state structs in `Devices.md` documentation (fix contributed by [jeffreylanters](https://github.com/jeffreylanters)).
+- Fixed `TrackedDeviceRaycaster` not picking closest hit in scene (fix originally contributed by [alexboost222](https://github.com/alexboost222)).
 
 #### Actions
 
@@ -58,6 +60,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed control schemes of bindings not getting updates when being pasted from one `.inputactions` asset into another ([case 1276106](https://issuetracker.unity3d.com/issues/input-system-control-schemes-are-not-resolved-when-copying-bindings-between-inputactionassets)).
   * For example, if you copied a binding from an asset that had a "Gamepad" control scheme into an asset that had none, the resulting binding would be unusable.
   * All associations with control schemes that do not exist in the target asset are now removed from bindings upon pasting.
+- Fixed `InputActionSetupExtensions.AddCompositeBinding` not setting name of composite.
 
 ## [1.2.0] - 2021-10-22
 

Packages/com.unity.inputsystem/Documentation~/Devices.md

@@ -299,7 +299,7 @@ public struct MyDeviceState : IInputStateTypeInfo
     // You must tag every state with a FourCC code for type
     // checking. The characters can be anything. Choose something that allows
     // you to easily recognize memory that belongs to your own Device.
-    public FourCC format => return new FourCC('M', 'Y', 'D', 'V');
+    public FourCC format => new FourCC('M', 'Y', 'D', 'V');
 
     // InputControlAttributes on fields tell the Input System to create Controls
     // for the public fields found in the struct.

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionSetupExtensions.cs

@@ -479,8 +479,16 @@ public static CompositeSyntax AddCompositeBinding(this InputAction action, strin
 
             var actionMap = action.GetOrCreateActionMap();
 
-            ////REVIEW: use 'name' instead of 'path' field here?
-            var binding = new InputBinding {path = composite, interactions = interactions, processors = processors, isComposite = true, action = action.name};
+            var binding = new InputBinding
+            {
+                name = NameAndParameters.ParseName(composite),
+                path = composite,
+                interactions = interactions,
+                processors = processors,
+                isComposite = true,
+                action = action.name
+            };
+
             var bindingIndex = AddBindingInternal(actionMap, binding);
             return new CompositeSyntax(actionMap, action, bindingIndex);
         }

Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputActionTreeViewItems.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
+using UnityEngine.InputSystem.Utilities;
 
 ////TODO: sync expanded state of SerializedProperties to expanded state of tree (will help preserving expansion in inspector)
 
@@ -461,6 +462,8 @@ public CompositeBindingTreeItem(SerializedProperty bindingProperty)
         public override GUIStyle colorTagStyle => Styles.blueRect;
         public override bool canRename => true;
 
+        public string compositeName => NameAndParameters.ParseName(path);
+
         public override void Rename(string newName)
         {
             InputActionSerializationHelpers.RenameComposite(property, newName);
@@ -503,7 +506,10 @@ public override bool GetDropLocation(Type itemType, int? childIndex, ref Seriali
             var item = new CompositeBindingTreeItem(bindingProperty);
 
             item.depth = parent.depth + 1;
-            item.displayName = !string.IsNullOrEmpty(item.name) ? item.name : ObjectNames.NicifyVariableName(item.path);
+            item.displayName = !string.IsNullOrEmpty(item.name)
+                ? item.name
+                : ObjectNames.NicifyVariableName(NameAndParameters.ParseName(item.path));
+
             parent.AddChild(item);
 
             return item;
@@ -531,7 +537,7 @@ public override string expectedControlLayout
                 if (m_ExpectedControlLayout == null)
                 {
                     var partName = name;
-                    var compositeName = ((CompositeBindingTreeItem)parent).name;
+                    var compositeName = ((CompositeBindingTreeItem)parent).compositeName;
                     var layoutName = InputBindingComposite.GetExpectedControlLayoutName(compositeName, partName);
                     m_ExpectedControlLayout = layoutName ?? "";
                 }

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/TrackedDeviceRaycaster.cs

@@ -96,9 +96,8 @@ public override void Raycast(PointerEventData eventData, List<RaycastResult> res
                 PerformRaycast(trackedEventData, resultAppendList);
         }
 
-        // Use this list on each raycast to avoid continually allocating.
-        [NonSerialized]
-        private List<RaycastHitData> m_RaycastResultsCache = new List<RaycastHitData>();
+        // Cached instances for raycasts hits to minimize GC.
+        [NonSerialized] private List<RaycastHitData> m_RaycastResultsCache = new List<RaycastHitData>();
 
         internal void PerformRaycast(ExtendedPointerEventData eventData, List<RaycastResult> resultAppendList)
         {
@@ -114,25 +113,18 @@ internal void PerformRaycast(ExtendedPointerEventData eventData, List<RaycastRes
             #if UNITY_INPUT_SYSTEM_ENABLE_PHYSICS
             if (m_CheckFor3DOcclusion)
             {
-                var hits = Physics.RaycastAll(ray, hitDistance, m_BlockingMask);
-
-                if (hits.Length > 0 && hits[0].distance < hitDistance)
-                {
-                    hitDistance = hits[0].distance;
-                }
+                if (Physics.Raycast(ray, out var hit, maxDistance: hitDistance, layerMask: m_BlockingMask))
+                    hitDistance = hit.distance;
             }
             #endif
 
             #if UNITY_INPUT_SYSTEM_ENABLE_PHYSICS2D
             if (m_CheckFor2DOcclusion)
             {
                 var raycastDistance = hitDistance;
-                var hits = Physics2D.GetRayIntersectionAll(ray, raycastDistance, m_BlockingMask);
-
-                if (hits.Length > 0 && hits[0].fraction * raycastDistance < hitDistance)
-                {
-                    hitDistance = hits[0].fraction * raycastDistance;
-                }
+                var hits = Physics2D.GetRayIntersection(ray, raycastDistance, m_BlockingMask);
+                if (hits.collider != null)
+                    hitDistance = hits.distance;
             }
             #endif
 
@@ -176,7 +168,7 @@ internal void PerformRaycast(ExtendedPointerEventData eventData, List<RaycastRes
 
         internal static InlinedArray<TrackedDeviceRaycaster> s_Instances;
 
-        static readonly List<RaycastHitData> s_SortedGraphics = new List<RaycastHitData>();
+        private static readonly List<RaycastHitData> s_SortedGraphics = new List<RaycastHitData>();
         private void SortedRaycastGraphics(Canvas canvas, Ray ray, List<RaycastHitData> results)
         {
             var graphics = GraphicRegistry.GetGraphicsForCanvas(canvas);