Renamed assets to have more meaningful names, created a dedicated UI map for rebinding sample, code clean-up, tweaks.

Author: ekcoh

Assets/Samples/RebindingUI/Game/RebindingMaterial2.mat renamed to Assets/Samples/RebindingUI/Game/BulletMaterial.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: RebindingMaterial2
+  m_Name: BulletMaterial
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0

Assets/Samples/RebindingUI/Game/RebindingMaterial2.mat.meta renamed to Assets/Samples/RebindingUI/Game/BulletMaterial.mat.meta

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: RebindingMaterial3
+  m_Name: EnemyMaterial
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0

Assets/Samples/RebindingUI/Game/RebindingMaterial3.mat renamed to Assets/Samples/RebindingUI/Game/EnemyMaterial.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: RebindingMaterial
+  m_Name: PlayerMaterial
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0

Assets/Samples/RebindingUI/Game/RebindingMaterial3.mat.meta renamed to Assets/Samples/RebindingUI/Game/EnemyMaterial.mat.meta

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: RebindingMaterial4
+  m_Name: PlayerMaterial2
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0

Assets/Samples/RebindingUI/Game/RebindingMaterial.mat renamed to Assets/Samples/RebindingUI/Game/PlayerMaterial.mat

@@ -25,27 +25,22 @@ public class InputActionIndicator : MonoBehaviour
         [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;
+        public Image performedIndicator;
+        public Image pressedIndicator;
+        public Text label;
 
-        void Awake()
-        {
-            m_Image = GetComponent<Image>();
-            m_Text = GetComponent<Text>();
-            Update();
-        }
+        private double m_RealTimeLastPerformed;
 
         private void OnEnable()
         {
-            action.action.performed += OnPerformed;
-            action.action.Enable();
+            if (action != null && action.action != null)
+                action.action.performed += OnPerformed;
         }
 
         private void OnDisable()
         {
-            action.action.Disable();
-            action.action.performed -= OnPerformed;
+            if (action != null && action.action != null)
+                action.action.performed -= OnPerformed;
         }
 
         private void OnPerformed(InputAction.CallbackContext obj)
@@ -57,23 +52,30 @@ private void Update()
         {
             if (action.action.enabled)
             {
-                // Pulse active color if enabled
+                // Pulse active color if enabled and performed
                 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));
+                if (performedIndicator)
+                {
+                    performedIndicator.color = duration <= 0.0f
+                        ? inactiveColor
+                        : Color.Lerp(inactiveColor, activeColor,
+                        (float)Math.Max(0.0, 1.0 - elapsedSincePerformed / duration));
+                }
+
+                if (pressedIndicator)
+                    pressedIndicator.color = action.action.IsPressed() ? activeColor : inactiveColor;
             }
             else
             {
                 // Show disabled indicator if disabled
-                if (m_Image.color != disabledColor)
-                    m_Image.color = disabledColor;
+                if (performedIndicator && performedIndicator.color != disabledColor)
+                    performedIndicator.color = disabledColor;
+                if (pressedIndicator && pressedIndicator.color != disabledColor)
+                    pressedIndicator.color = disabledColor;
             }
         }
 
-        // We want the label for the action name to update in edit mode, too, so
-        // we kick that off from here.
+        // Also update action label in edit-mode
 #if UNITY_EDITOR
         protected void OnValidate()
         {
@@ -84,12 +86,12 @@ protected void OnValidate()
 
         private void UpdateActionLabel()
         {
-            if (m_Text == null)
+            if (label == null)
                 return;
             if (action != null && action.action != null)
-                m_Text.text = action.name;
+                label.text = action.action.name;
             else
-                m_Text.text = string.Empty;
+                label.text = string.Empty;
         }
     }
 }

Assets/Samples/RebindingUI/Game/RebindingMaterial.mat.meta renamed to Assets/Samples/RebindingUI/Game/PlayerMaterial.mat.meta

@@ -32,6 +32,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 943689430639722906}
+  - {fileID: 4857538067602185801}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -60,7 +61,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 1, b: 0.19607843, a: 1}
+  m_Color: {r: 0.30588236, g: 0.7372549, b: 0.30588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -90,10 +91,13 @@ MonoBehaviour:
   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}
-  disabledColor: {r: 1, g: 0, b: 0, a: 1}
+  activeColor: {r: 0.3019758, g: 0.735849, b: 0.3019758, a: 1}
+  inactiveColor: {r: 0.23529412, g: 0.23529412, b: 0.23529412, a: 1}
+  disabledColor: {r: 0.764151, g: 0.32079923, b: 0.32079923, a: 1}
   duration: 1
+  performedIndicator: {fileID: 4442569273011091735}
+  pressedIndicator: {fileID: 1254813625780045290}
+  label: {fileID: 4072204658071074964}
 --- !u!1 &5827664391383982697
 GameObject:
   m_ObjectHideFlags: 0
@@ -172,4 +176,79 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Indicator
+  m_Text: 
+--- !u!1 &8554363940581882067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4857538067602185801}
+  - component: {fileID: 1513442470749367355}
+  - component: {fileID: 1254813625780045290}
+  m_Layer: 5
+  m_Name: Pressed
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4857538067602185801
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8554363940581882067}
+  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.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -0.5}
+  m_SizeDelta: {x: 15, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1513442470749367355
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8554363940581882067}
+  m_CullTransparentMesh: 1
+--- !u!114 &1254813625780045290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8554363940581882067}
+  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.0023497343, g: 1, b: 0, 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