NEW: (ISXB-1524, ISX-2325, revisiting ISXB-1396) Fix for rebinding issues related to incorrect event suppression + Changed Rebinding Sample

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.14.1
+//     version 1.15.0
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/RebindingUI/CanvasGroupModifier.cs

@@ -0,0 +1,47 @@
+using UnityEngine.EventSystems;
+
+namespace UnityEngine.InputSystem.Samples.RebindUI
+{
+    /// <summary>
+    /// Simple utility that modifies a referenced CanvasGroup while being active.
+    /// </summary>
+    public class CanvasGroupModifier : MonoBehaviour
+    {
+        [Tooltip("The Canvas Group to be modified while this component is active")]
+        public CanvasGroup canvasGroup;
+
+        [Tooltip("The interactable setting to use for the Canvas Group while this component is active")]
+        public bool interactable = false;
+
+        private bool m_SavedInteractable;
+        private GameObject m_SelectedObject;
+
+        void OnEnable()
+        {
+            if (canvasGroup != null)
+            {
+                // Store selection to make sure it is not changed when switching "windows".
+                m_SelectedObject = EventSystem.current.currentSelectedGameObject;
+
+                // Save current setting and override
+                m_SavedInteractable = canvasGroup.interactable;
+                canvasGroup.interactable = interactable;
+            }
+        }
+
+        void OnDisable()
+        {
+            if (canvasGroup != null)
+            {
+                // Restore previous setting.
+                canvasGroup.interactable = m_SavedInteractable;
+
+                // Restore previous selection.
+                if (m_SelectedObject != null)
+                    EventSystem.current.SetSelectedGameObject(m_SelectedObject);
+                else if (EventSystem.current.currentSelectedGameObject == null)
+                    EventSystem.current.SetSelectedGameObject(EventSystem.current.firstSelectedGameObject);
+            }
+        }
+    }
+}

Assets/Samples/RebindingUI/InputActionIndicator.cs

@@ -0,0 +1,95 @@
+using System;
+using UnityEngine.UI;
+
+namespace UnityEngine.InputSystem.Samples.RebindUI
+{
+    /// <summary>
+    /// A simple visual indicator of action performed.
+    /// </summary>
+    /// <remarks>Error handling have been excluded for simplicity.</remarks>
+    [RequireComponent(typeof(Image))]
+    public class InputActionIndicator : MonoBehaviour
+    {
+        [Tooltip("Reference to the associated action to be visualized.")]
+        public InputActionReference action;
+
+        [Tooltip("The color to show when the associated action is performed.")]
+        public Color activeColor = Color.green;
+
+        [Tooltip("The color to show when the associated action has not been performed for the specified duration.")]
+        public Color inactiveColor = Color.black;
+
+        [Tooltip("The color to show when the associated action is disabled")]
+        public Color disabledColor = Color.red;
+
+        [Tooltip("The duration for which the indicator should be lit before becoming completely inactive.")]
+        public float duration = 1.0f;
+
+        private double m_RealTimeLastPerformed;
+        private Image m_Image;
+        private Text m_Text;
+
+        void Awake()
+        {
+            m_Image = GetComponent<Image>();
+            m_Text = GetComponent<Text>();
+            Update();
+        }
+
+        private void OnEnable()
+        {
+            action.action.performed += OnPerformed;
+            action.action.Enable();
+        }
+
+        private void OnDisable()
+        {
+            action.action.Disable();
+            action.action.performed -= OnPerformed;
+        }
+
+        private void OnPerformed(InputAction.CallbackContext obj)
+        {
+            m_RealTimeLastPerformed = Time.realtimeSinceStartupAsDouble;
+        }
+
+        private void Update()
+        {
+            if (action.action.enabled)
+            {
+                // Pulse active color if enabled
+                var elapsedSincePerformed = Time.realtimeSinceStartupAsDouble - m_RealTimeLastPerformed;
+                m_Image.color = duration <= 0.0f
+                    ? inactiveColor
+                    : Color.Lerp(inactiveColor, activeColor,
+                    (float)Math.Max(0.0, 1.0 - elapsedSincePerformed / duration));
+            }
+            else
+            {
+                // Show disabled indicator if disabled
+                if (m_Image.color != disabledColor)
+                    m_Image.color = disabledColor;
+            }
+        }
+
+        // We want the label for the action name to update in edit mode, too, so
+        // we kick that off from here.
+#if UNITY_EDITOR
+        protected void OnValidate()
+        {
+            UpdateActionLabel();
+        }
+
+#endif
+
+        private void UpdateActionLabel()
+        {
+            if (m_Text == null)
+                return;
+            if (action != null && action.action != null)
+                m_Text.text = action.name;
+            else
+                m_Text.text = string.Empty;
+        }
+    }
+}

Assets/Samples/RebindingUI/InputActionIndicator.prefab

@@ -0,0 +1,174 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1255350527062619510
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1777307397533242038}
+  - component: {fileID: 1780074258963799934}
+  - component: {fileID: 4442569273011091735}
+  - component: {fileID: 8586258032687207620}
+  m_Layer: 5
+  m_Name: InputActionIndicator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1777307397533242038
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255350527062619510}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 943689430639722906}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1780074258963799934
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255350527062619510}
+  m_CullTransparentMesh: 1
+--- !u!114 &4442569273011091735
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255350527062619510}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 1, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8586258032687207620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255350527062619510}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b5c8f13dfafeb5445b872565802d1e44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  action: {fileID: 0}
+  activeColor: {r: 0, g: 1, b: 0, a: 1}
+  inactiveColor: {r: 0, g: 0, b: 0, a: 1}
+  duration: 1
+--- !u!1 &5827664391383982697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 943689430639722906}
+  - component: {fileID: 6561043267186049780}
+  - component: {fileID: 4072204658071074964}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &943689430639722906
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5827664391383982697}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1777307397533242038}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 45.000015}
+  m_SizeDelta: {x: 103.7, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6561043267186049780
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5827664391383982697}
+  m_CullTransparentMesh: 0
+--- !u!114 &4072204658071074964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5827664391383982697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Indicator

Assets/Samples/RebindingUI/InvokeUnityEvent.cs

@@ -0,0 +1,35 @@
+using UnityEngine.Events;
+
+namespace UnityEngine.InputSystem.Samples.RebindUI
+{
+    /// <summary>
+    /// A simple component that deactivates a target when action is performed.
+    /// </summary>
+    public class InvokeUnityEvent : MonoBehaviour
+    {
+        [Tooltip("The input action that triggers the Unity event when performed.")]
+        public InputActionReference action;
+
+        [Tooltip("The Unity event to be invoked when action is performed.")]
+        public UnityEvent onPerformed;
+
+        private void OnEnable()
+        {
+            // Register callback when component is enabled
+            if (action != null && action.action != null)
+                action.action.performed += OnActionPerformed;
+        }
+
+        private void OnDisable()
+        {
+            // Unregister callback when component is disabled
+            if (action != null && action.action != null)
+                action.action.performed -= OnActionPerformed;
+        }
+
+        private void OnActionPerformed(InputAction.CallbackContext context)
+        {
+            onPerformed?.Invoke();
+        }
+    }
+}