Reformatted files

Author: ekcoh

Assets/Samples/RebindingUI/ActionIndicator.cs

@@ -12,30 +12,30 @@ public class ActionUIIndicator : 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; 
-    
+    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();
@@ -50,7 +50,7 @@ private void OnPerformed(InputAction.CallbackContext obj)
     private void Update()
     {
         var elapsedSincePerformed = Time.realtimeSinceStartupAsDouble - m_RealTimeLastPerformed;
-        m_Image.color = duration <= 0.0f ? inactiveColor : Color.Lerp(inactiveColor, activeColor, 
+        m_Image.color = duration <= 0.0f ? inactiveColor : Color.Lerp(inactiveColor, activeColor,
             (float)Math.Max(0.0, 1.0 - elapsedSincePerformed / duration));
     }
 }

Assets/Samples/RebindingUI/GameManager.cs

@@ -9,18 +9,18 @@ public class GameManager : MonoBehaviour
 {
     // TODO Its still an issue if we assign UI cancel button in rebinding,
     //      same goes for keyboard ESC
-    
+
     public GameObject menu;
     public InputActionAsset gameplayActions;
     public InputActionReference menuAction;
     public InputActionReference exitMenuAction;
     public GameObject initiallySelectedGameObject;
-    
+
     void Start()
     {
         // Let menu initially be disabled
         menu.SetActive(false);
-        
+
         // Let gameplay actions be initially enabled
         gameplayActions.Enable();
     }
@@ -41,10 +41,10 @@ private void OnMenu(InputAction.CallbackContext obj)
     {
         // Disable gameplay actions while in menu
         gameplayActions.Disable();
-        
+
         // Enable menu if currently not active
         menu.SetActive(true);
-        
+
         // Make sure EventSystem has a selection to allow gamepad navigation
         if (EventSystem.current.currentSelectedGameObject == null)
             EventSystem.current.SetSelectedGameObject(EventSystem.current.firstSelectedGameObject);
@@ -54,10 +54,10 @@ private void OnExitMenu(InputAction.CallbackContext obj)
     {
         if (!menu.activeInHierarchy)
             return;
-        
+
         // Hide menu
         menu.SetActive(false);
-        
+
         // Reenable gameplay actions
         gameplayActions.Enable();
     }

Assets/Samples/RebindingUI/RebindActionUI.cs

@@ -257,7 +257,7 @@ private void PerformInteractiveRebind(InputAction action, int bindingIndex, bool
             m_RebindOperation?.Cancel(); // Will null out m_RebindOperation.
 
             var actionWasEnabledPriorToRebind = action.enabled; // Allow restoring enabled state
-            
+
             void CleanUp()
             {
                 m_RebindOperation?.Dispose();
@@ -266,7 +266,7 @@ void CleanUp()
                 // Restore action enabled state based on state prior to rebind
                 if (actionWasEnabledPriorToRebind)
                     action.actionMap.Enable();
-                
+
                 m_UIInputActionMap?.Enable();
             }
 

Assets/Samples/RebindingUI/RebindingUISampleController.cs

@@ -16,9 +16,9 @@ public class RebindingUISampleController : MonoBehaviour
     public InputActionReference interact;
     public InputActionReference use;
     public InputActionReference menu;
-    
+
     public float movementSpeed = 10.0f;
-    
+
     private Material m_Material;
     private Vector3 m_TargetPosition;
     private Vector3 m_TargetEulerAngles;
@@ -40,7 +40,7 @@ private void OnEnable()
     {
         if (target != null)
             m_TargetPosition = target.transform.position;
-        
+
         move?.action?.Enable();
         look?.action?.Enable();
         interact?.action?.Enable();
@@ -60,7 +60,7 @@ private void Update()
         // When we "Move" we add to the target position
         if (move != null && move.action != null)
             m_TargetPosition += (Vector3)(move.action.ReadValue<Vector2>() * Time.deltaTime * movementSpeed);
-        
+
         // When we "Look" we rotate the target object relative to its current orientation.
         if (look != null && look.action != null && target != null)
         {
@@ -69,15 +69,15 @@ private void Update()
             // to convert absolute movement to movement per time unit.
             var timeInvariant = (look.action.activeControl is DeltaControl);
             var scale = timeInvariant ? 1.0f : Time.deltaTime * 300.0f;
-            
+
             target.transform.Rotate(Vector3.up, look.action.ReadValue<Vector2>().x * -1.0f * scale, Space.World);
             target.transform.Rotate(Vector3.right, look.action.ReadValue<Vector2>().y * 1.0f * scale, Space.World);
         }
-        
+
         // When we "Interact", we move to the next target color
         if (interact.action.WasPressedThisFrame())
             m_TargetColor = Colors[(++m_ColorIndex % Colors.Length)];
-        
+
         // When we "Use", we toggle scale of secondary object
         if (use.action.WasPerformedThisFrame())
             m_TargetScale = (Mathf.Approximately(m_TargetScale, 0.0f) ? 1.0f : 0.0f);

Assets/Samples/RebindingUI/RebindingUISampleScene.unity

@@ -4259,22 +4259,13 @@ GameObject:
   m_Component:
   - component: {fileID: 1183078599}
   - component: {fileID: 1183078598}
-  - component: {fileID: 1183078597}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &1183078597
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1183078596}
-  m_Enabled: 1
 --- !u!20 &1183078598
 Camera:
   m_ObjectHideFlags: 0

Assets/Tests/InputSystem/CoreTests_Events.cs

@@ -1229,20 +1229,20 @@ class SuppressedActionEventData
     public void EventHandledPolicy_ShouldReflectUserSetting()
     {
         // Assert default setting
-        Assert.That(InputSystem.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
+        Assert.That(InputSystem.s_Manager.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
 
         // Assert policy can be changed
-        InputSystem.inputEventHandledPolicy = InputEventHandledPolicy.SuppressActionUpdates;
-        Assert.That(InputSystem.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressActionUpdates));
+        InputSystem.s_Manager.inputEventHandledPolicy = InputEventHandledPolicy.SuppressActionUpdates;
+        Assert.That(InputSystem.s_Manager.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressActionUpdates));
 
         // Assert policy can be changed back
-        InputSystem.inputEventHandledPolicy = InputEventHandledPolicy.SuppressStateUpdates;
-        Assert.That(InputSystem.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
+        InputSystem.s_Manager.inputEventHandledPolicy = InputEventHandledPolicy.SuppressStateUpdates;
+        Assert.That(InputSystem.s_Manager.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
 
         // Assert setting property to an invalid value throws exception and do not have side-effects
         Assert.Throws<ArgumentOutOfRangeException>(() =>
-            InputSystem.inputEventHandledPolicy = (InputEventHandledPolicy)123456);
-        Assert.That(InputSystem.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
+            InputSystem.s_Manager.inputEventHandledPolicy = (InputEventHandledPolicy)123456);
+        Assert.That(InputSystem.s_Manager.inputEventHandledPolicy, Is.EqualTo(InputEventHandledPolicy.SuppressStateUpdates));
     }
 
     [TestCase(InputEventHandledPolicy.SuppressStateUpdates,
@@ -1255,7 +1255,7 @@ public void Events_ShouldRespectHandledPolicyUponUpdate(InputEventHandledPolicy
         int[] expectedProcessed, int[] expectedCancelled) // EDIT
     {
         // Update setting to match desired scenario
-        InputSystem.inputEventHandledPolicy = policy;
+        InputSystem.s_Manager.inputEventHandledPolicy = policy;
 
         // Use a boxed boolean to allow lambda to capture reference.
         var data = new SuppressedActionEventData();

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,7 +11,7 @@ however, it has to be formatted properly to pass verification tests.
 ## [Unreleased] - yyyy-mm-dd
 
 ### Changed
-- Expanded `RebindingUISample` to include a "game mode" state and a "menu state" to be more similar to a real game. Also added action-performed indicators illustrating when actions get triggered.  
+- Expanded `RebindingUISample` to include a "game mode" state and a "menu state" to be more similar to a real game. Also added action-performed indicators illustrating when actions get triggered.
 
 ### Added
 - Support for Xbox controllers over USB on macOS, using macOS's default driver. [ISXB-1548]