Code cleanup and simplification after reviewing all code on the branch

Author: ekcoh

Assets/Samples/RebindingUI/CanvasGroupModifier.cs

@@ -16,7 +16,7 @@ public class CanvasGroupModifier : MonoBehaviour
         private bool m_SavedInteractable;
         private GameObject m_SelectedObject;
 
-        void OnEnable()
+        private void OnEnable()
         {
             if (canvasGroup != null)
             {
@@ -29,7 +29,7 @@ void OnEnable()
             }
         }
 
-        void OnDisable()
+        private void OnDisable()
         {
             if (canvasGroup != null)
             {

Assets/Samples/RebindingUI/Game/Enemy.cs

@@ -40,7 +40,7 @@ private void OnCollisionEnter(Collision other)
         }
 
         // Update is called once per frame
-        void Update()
+        private void Update()
         {
             // Animate rotation
             if (animationTarget)

Assets/Samples/RebindingUI/Game/Explosion.cs

@@ -8,7 +8,7 @@ public class Explosion : MonoBehaviour
     private bool m_Exploded;
     private bool m_Destroyed;
 
-    void Awake()
+    private void Awake()
     {
         m_ParticleSystem = GetComponent<ParticleSystem>();
         m_Rigidbodies = gameObject.GetComponentsInChildren<Rigidbody>();
@@ -25,7 +25,7 @@ private void OnDisable()
         m_ParticleSystem.Stop();
     }
 
-    void Update()
+    private void Update()
     {
         if (!m_ParticleSystem.isPlaying && !m_Destroyed)
         {

Assets/Samples/RebindingUI/Game/Message.cs

@@ -4,31 +4,44 @@
 
 namespace UnityEngine.InputSystem.Samples.RebindUI
 {
+    /// <summary>
+    /// A UI to show messages reflecting changes to gameplay state.
+    /// </summary>
     public class Message : MonoBehaviour
     {
+        [Tooltip("The associated gameplay manager.")]
         public GameplayManager gameplayManager;
+
+        [Tooltip("The associated UI root to hide/show.")]
         public GameObject root;
+
+        [Tooltip("The associated UI text to be altered to show messages.")]
         public Text text;
+
         private Action m_TimeoutCallback;
 
         private void OnEnable()
         {
+            // Monitor changes to gameplay state and game pause state.
             gameplayManager.GameplayStateChanged += OnGameplayStateChanged;
             gameplayManager.PauseChanged += OnPauseChanged;
-            OnGameplayStateChanged(gameplayManager.state);
-        }
 
-        private void OnPauseChanged(bool paused)
-        {
+            // Initialize
             OnGameplayStateChanged(gameplayManager.state);
         }
 
         private void OnDisable()
         {
+            // Unsubscribe from monitoring gameplay and pause state.
             gameplayManager.GameplayStateChanged += OnGameplayStateChanged;
             gameplayManager.PauseChanged -= OnPauseChanged;
         }
 
+        private void OnPauseChanged(bool paused)
+        {
+            OnGameplayStateChanged(gameplayManager.state);
+        }
+
         private void Hide()
         {
             root.SetActive(false);

Assets/Samples/RebindingUI/Game/PlayerController.cs

@@ -13,13 +13,15 @@ namespace UnityEngine.InputSystem.Samples.RebindUI
     [DefaultExecutionOrder(-1)] // We need this to run before Player to avoid potential additional latency
     public class PlayerController : MonoBehaviour
     {
-        [Header("Input Action Bindings")]
         [Tooltip("The move action, must generate Vector2")]
         public InputActionReference move;
+
         [Tooltip("The move action, must generate Vector2")]
         public InputActionReference look;
+
         [Tooltip("The move action, must generate Button value")]
         public InputActionReference fire;
+
         [Tooltip("The move action, must generate Button value")]
         public InputActionReference change;
 
@@ -33,7 +35,7 @@ public class PlayerController : MonoBehaviour
         // Required player reference
         private Player m_Player;
 
-        private const float kMouseSensitivity = 0.5f;
+        private const float kMouseSensitivity = 0.4f;
         private const float kGamepadSensitivity = 1.0f;
 
         private void Awake()
@@ -98,7 +100,7 @@ private void Update()
                 if (lookValue.sqrMagnitude > 0.05f)
                     feedbackController?.RecordRecentDeviceFromAction(look);
 
-                var timeInvariant = (look.action.activeControl is DeltaControl);
+                var timeInvariant = look.action.activeControl is DeltaControl;
                 var scale = timeInvariant ?
                     1.0f * kMouseSensitivity :
                     Time.deltaTime * 300.0f * kGamepadSensitivity;

Assets/Samples/RebindingUI/InvokeUnityEvent.cs

@@ -38,6 +38,9 @@ public InputActionReference action
             }
         }
 
+        /// <summary>
+        /// Access or set the Unity event to be triggered when the action is performed.
+        /// </summary>
         public UnityEvent onPerformed
         {
             get => m_OnPerformed;

Assets/Samples/RebindingUI/README.md

@@ -1,6 +1,8 @@
 This sample demonstrates how to use the Input System APIs to set up a rebinding UI. The main file is [RebindActionUI](./RebindActionUI.cs) which, aside from serving as an example, contains a reusable `MonoBehaviour` component for composing rebinding UIs. The [RebindUIPrefab](./RebindUIPrefab.prefab) contains a ready-made prefab that can be used as a simple drop-in setup for rebinding an individual action.
 
- To demonstrate how to use images instead of textual display strings, take a look at [GamepadIconsExample](./GamepadIconsExample.cs).
+To demonstrate how to use images instead of textual display strings, take a look at [GamepadIconsExample](./GamepadIconsExample.cs).
+
+To demonstrate how to show dynamic texts based on input action bindings, see [ActionLabel](./ActionLabel.cs).
 
  Finally, the [RebindSaveLoad](./RebindSaveLoad.cs) script demonstrates how to persist user rebinds in `PlayerPrefs` and how to restore them from there.
 

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

@@ -1354,7 +1354,6 @@ void IInputStateChangeMonitor.NotifyControlStateChanged(InputControl control, do
             #endif
 
             SplitUpMapAndControlAndBindingIndex(mapControlAndBindingIndex, out var mapIndex, out var controlIndex, out var bindingIndex);
-            // CALLBACK HERE
             ProcessControlStateChange(mapIndex, controlIndex, bindingIndex, time, eventPtr);
         }
 
@@ -1952,7 +1951,6 @@ private void ProcessDefaultInteraction(ref TriggerState trigger, int actionIndex
                         var threshold = controls[trigger.controlIndex] is ButtonControl button ? button.pressPointOrDefault : ButtonControl.s_GlobalDefaultButtonPressPoint;
                         if (actuation >= threshold)
                         {
-                            // TODO CALLBACK HERE!
                             ChangePhaseOfAction(InputActionPhase.Performed, ref trigger,
                                 phaseAfterPerformedOrCanceled: InputActionPhase.Performed);
                         }
@@ -2513,7 +2511,7 @@ private void ChangePhaseOfActionInternal(int actionIndex, TriggerState* actionSt
             var action = map.m_Actions[actionIndex - mapIndices[trigger.mapIndex].actionStartIndex];
             trigger.phase = newPhase;
 
-            // Early out if suppressed
+            // Early out from CallActionListeners if suppressed
             if (m_Suppressed)
                 return;
 
@@ -2558,13 +2556,6 @@ private void CallActionListeners(int actionIndex, InputActionMap actionMap, Inpu
 
             k_InputActionCallbackMarker.Begin();
 
-            // Early return in case of suppressed action notifications.
-            if (m_Suppressed)
-            {
-                k_InputActionCallbackMarker.End();
-                return;
-            }
-
             // Global callback goes first.
             var action = context.action;
             if (s_GlobalState.onActionChange.length > 0)