adjusted test, assets distinct for every copy now (consistently for all players) fixed initialisation

Author: ritamerkl

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

@@ -2427,13 +2427,13 @@ public void PlayerInput_DelegatesAreUpdate_WhenActionMapAddedAfterAssignment()
         // Disable the asset while adding another action map to it as none
         // of the actions in the asset can be enabled during modification
         //
-        actionAsset.Disable();
+        playerInput.actions.Disable();
         var keyboard = InputSystem.AddDevice<Keyboard>();
-        var newActionMap = actionAsset.AddActionMap("NewMap");
+        var newActionMap = playerInput.actions.AddActionMap("NewMap");
         var newAction = newActionMap.AddAction("NewAction");
         newAction.AddBinding("<Keyboard>/k", groups: "Keyboard");
-        actionAsset.AddControlScheme("Keyboard").WithRequiredDevice<Keyboard>();
-        actionAsset.Enable();
+        playerInput.actions.AddControlScheme("Keyboard").WithRequiredDevice<Keyboard>();
+        playerInput.actions.Enable();
 
         playerInput.currentActionMap = newActionMap;
         playerInput.ActivateInput();

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInput.cs

@@ -346,11 +346,7 @@ public InputActionAsset actions
 
                 if (m_Enabled)
                 {
-                    ClearCaches();
-                    AssignUserAndDevices();
-                    InitializeActions();
-                    if (m_InputActive)
-                        ActivateInput();
+                    Init();
                 }
             }
         }
@@ -1363,16 +1359,16 @@ private void InitializeActions()
 
             // duplicate action asset to not operate on the original(as it might be used outside - eg project wide action asset or UIInputModule)
             var oldActions = m_Actions;
-            m_Actions = Instantiate(m_Actions);
+            var newActions = Instantiate(m_Actions);
             for (var actionMap = 0; actionMap < oldActions.actionMaps.Count; actionMap++)
             {
                 for (var binding = 0; binding < oldActions.actionMaps[actionMap].bindings.Count; binding++)
-                    m_Actions.actionMaps[actionMap].ApplyBindingOverride(binding, oldActions.actionMaps[actionMap].bindings[binding]);
+                    newActions.actionMaps[actionMap].ApplyBindingOverride(binding, oldActions.actionMaps[actionMap].bindings[binding]);
             }
-
-            // reset state to default, only one action map is enabled at the initial state
-            // Project wide actions may have enabled action maps
-            m_Actions.Disable();
+            //reset state to default, only one action map is enabled at the initial state
+            //Project wide actions may have enabled action maps
+            newActions.Disable();
+            m_Actions = newActions;
 
             #if UNITY_INPUT_SYSTEM_ENABLE_UI
             if (uiInputModule != null)
@@ -1792,15 +1788,10 @@ void Reset()
         private void OnEnable()
         {
             m_Enabled = true;
-
             using (InputActionRebindingExtensions.DeferBindingResolution())
             {
                 AssignPlayerIndex();
-                InitializeActions();
-                AssignUserAndDevices();
-                ActivateInput();
             }
-
             // Split-screen index defaults to player index.
             if (s_InitSplitScreenIndex >= 0)
                 m_SplitScreenIndex = splitScreenIndex;
@@ -1813,6 +1804,9 @@ private void OnEnable()
                 for (var j = i; j > 0 && s_AllActivePlayers[j - 1].playerIndex > s_AllActivePlayers[j].playerIndex; --j)
                     s_AllActivePlayers.SwapElements(j, j - 1);
 
+
+            Init();
+
             // If it's the first player, hook into user change notifications.
             if (s_AllActivePlayersCount == 1)
             {
@@ -1844,6 +1838,16 @@ private void OnEnable()
             PlayerInputManager.instance?.NotifyPlayerJoined(this);
         }
 
+        private void Init()
+        {
+            using (InputActionRebindingExtensions.DeferBindingResolution())
+            {
+                InitializeActions();
+                AssignUserAndDevices();
+                ActivateInput();
+            }
+        }
+
         private void StartListeningForUnpairedDeviceActivity()
         {
             if (m_OnUnpairedDeviceUsedHooked)