Tweaks to sample, adding missing namespace, changed game manager to use classic state machine for clarity.

ekcoh · ekcoh · commit 90a9a24c2620 · 2025-06-25T12:11:54.000+02:00
diff --git a/Assets/Samples/RebindingUI/RebindUIActionIndicator.cs b/Assets/Samples/RebindingUI/RebindUIActionIndicator.cs
@@ -3,54 +3,59 @@
 using UnityEngine.InputSystem;
 using UnityEngine.UI;
 
-/// <summary>
-/// A simple visual indicator of action performed.
-/// </summary>
-/// <remarks>Error handling have been excluded for simplicity.</remarks>
-[RequireComponent(typeof(Image))]
-public class RebindUIActionIndicator : MonoBehaviour
+namespace UnityEngine.InputSystem.Samples.RebindUI
 {
-    [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 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;
-
-    void Start()
-    {
-        m_Image = GetComponent<Image>();
-    }
-
-    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()
+    /// <summary>
+    /// A simple visual indicator of action performed.
+    /// </summary>
+    /// <remarks>Error handling have been excluded for simplicity.</remarks>
+    [RequireComponent(typeof(Image))]
+    public class RebindUIActionIndicator : MonoBehaviour
     {
-        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));
+        [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 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;
+
+        void Start()
+        {
+            m_Image = GetComponent<Image>();
+        }
+
+        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()
+        {
+            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));
+        }
     }
 }
diff --git a/Assets/Samples/RebindingUI/RebindUIGameManager.cs b/Assets/Samples/RebindingUI/RebindUIGameManager.cs
@@ -1,63 +1,88 @@
-using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityEngine.InputSystem;
 
-/// <summary>
-/// Simple game manager that manages enabling/disabling in-game and UI actions.
-/// </summary>
-public class RebindUIGameManager : MonoBehaviour
+namespace UnityEngine.InputSystem.Samples.RebindUI
 {
-    public GameObject menu;
-    public InputActionAsset gameplayActions;
-    public InputActionReference menuAction;
-    public InputActionReference exitMenuAction;
-    public GameObject initiallySelectedGameObject;
-
-    void Start()
+    /// <summary>
+    /// Simple game manager that manages enabling/disabling in-game and UI actions.
+    /// </summary>
+    public class RebindUIGameManager : MonoBehaviour
     {
-        // Let menu initially be disabled
-        menu.SetActive(false);
+        public GameObject menu;
+        public InputActionAsset gameplayActions;
+        public InputActionReference menuAction;
+        public InputActionReference exitMenuAction;
 
-        // Let gameplay actions be initially enabled
-        gameplayActions.Enable();
-    }
+        private enum GameState
+        {
+            Initializing,
+            Playing,
+            RebindingMenu
+        }
 
-    private void OnEnable()
-    {
-        menuAction.action.performed += OnMenu;
-        exitMenuAction.action.performed += OnExitMenu;
-    }
+        private GameState m_CurrentState = GameState.Initializing;
 
-    private void OnDisable()
-    {
-        menuAction.action.performed -= OnMenu;
-        exitMenuAction.action.performed -= OnExitMenu;
-    }
+        void Start()
+        {
+            SetState(GameState.Playing);
 
-    private void OnMenu(InputAction.CallbackContext obj)
-    {
-        // Disable gameplay actions while in menu
-        gameplayActions.Disable();
+            // Let menu initially be disabled
+            menu.SetActive(false);
 
-        // Enable menu if currently not active
-        menu.SetActive(true);
+            // Let gameplay actions be initially enabled
+            gameplayActions.Enable();
+        }
 
-        // Make sure EventSystem has a selection to allow gamepad navigation
-        if (EventSystem.current.currentSelectedGameObject == null)
-            EventSystem.current.SetSelectedGameObject(EventSystem.current.firstSelectedGameObject);
-    }
+        private void SetState(GameState newState)
+        {
+            // Abort if there is no change to state
+            if (newState == m_CurrentState)
+                return;
 
-    private void OnExitMenu(InputAction.CallbackContext obj)
-    {
-        // TODO We cannot do this without first cancelling rebinding
+            switch (newState)
+            {
+                // Entering game mode: enable in-game actions, show menu
+                case GameState.Playing:
+                    gameplayActions.Enable();
+                    menu.SetActive(false);
+                    break;
+
+                // Entering menu: disable in-game actions, hide menu, make sure we have selection
+                case GameState.RebindingMenu:
+                    gameplayActions.Disable();
+                    menu.SetActive(true);
+                    if (EventSystem.current.currentSelectedGameObject == null)
+                        EventSystem.current.SetSelectedGameObject(EventSystem.current.firstSelectedGameObject);
+                    break;
+
+                case GameState.Initializing:
+                default:
+                    break;
+            }
+
+            // Update current state
+            m_CurrentState = newState;
+        }
+
+        private void OnMenu(InputAction.CallbackContext obj)
+        {
+            SetState(GameState.RebindingMenu);
+        }
 
-        if (!menu.activeInHierarchy)
-            return;
+        private void OnExitMenu(InputAction.CallbackContext obj)
+        {
+            SetState(GameState.Playing);
+        }
 
-        // Hide menu
-        menu.SetActive(false);
+        private void OnEnable()
+        {
+            menuAction.action.performed += OnMenu;
+            exitMenuAction.action.performed += OnExitMenu;
+        }
 
-        // Reenable gameplay actions
-        gameplayActions.Enable();
+        private void OnDisable()
+        {
+            menuAction.action.performed -= OnMenu;
+            exitMenuAction.action.performed -= OnExitMenu;
+        }
     }
 }
diff --git a/Assets/Samples/RebindingUI/RebindUIPrefab.prefab b/Assets/Samples/RebindingUI/RebindUIPrefab.prefab
@@ -98,10 +98,10 @@ MonoBehaviour:
     m_SelectOnRight: {fileID: 0}
   m_Transition: 1
   m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.7882353, g: 0.9019608, b: 1, a: 1}
+    m_NormalColor: {r: 0.25, g: 0.3071429, b: 0.45, a: 1}
+    m_HighlightedColor: {r: 0.36173913, g: 0.4408696, b: 0.65, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.078431375, g: 0.64705884, b: 1, a: 1}
+    m_SelectedColor: {r: 0.8679245, g: 0.4550042, b: 0.045033824, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
@@ -191,7 +191,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.8901961, g: 0.8901961, b: 0.8901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -270,7 +270,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.8901961, g: 0.8901961, b: 0.8901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -457,7 +457,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.8901961, g: 0.8901961, b: 0.8901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -467,7 +467,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -576,10 +576,10 @@ MonoBehaviour:
     m_SelectOnRight: {fileID: 0}
   m_Transition: 1
   m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.7877358, g: 0.89941245, b: 1, a: 1}
+    m_NormalColor: {r: 0.2509804, g: 0.30588236, b: 0.4509804, a: 1}
+    m_HighlightedColor: {r: 0.36078432, g: 0.4392157, b: 0.6509804, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.078431375, g: 0.64705884, b: 1, a: 1}
+    m_SelectedColor: {r: 0.8666667, g: 0.45490196, b: 0.043137256, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
diff --git a/Assets/Samples/RebindingUI/RebindingMaterial.mat b/Assets/Samples/RebindingUI/RebindingMaterial.mat
@@ -79,7 +79,7 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.20000027, g: 0.20000029, b: 0.99999887, a: 1}
+    - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0.27450982, g: 0.078431375, b: 0.19607843, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/Assets/Samples/RebindingUI/RebindingUISampleController.cs b/Assets/Samples/RebindingUI/RebindingUISampleController.cs
diff --git a/Assets/Samples/RebindingUI/RebindingUISampleScene.unity b/Assets/Samples/RebindingUI/RebindingUISampleScene.unity
