fix tests and copying of asset

Author: ritamerkl

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

@@ -391,7 +391,8 @@ public void PlayerInput_CanAssignActionsToPlayer()
         var actions = InputActionAsset.FromJson(kActions);
         playerInput.actions = actions;
 
-        Assert.That(playerInput.actions, Is.SameAs(actions));
+        Assert.That(playerInput.actions.actionMaps.Count, Is.EqualTo(actions.actionMaps.Count));
+        Assert.That(playerInput.actions.actionMaps[0].name, Is.EqualTo(actions.actionMaps[0].name));
     }
 
     [Test]
@@ -407,13 +408,13 @@ public void PlayerInput_AssigningNewActionsToPlayer_DisablesExistingActions()
         playerInput.defaultActionMap = "gameplay";
         playerInput.actions = actions1;
 
-        Assert.That(actions1.actionMaps[0].enabled, Is.True);
-        Assert.That(actions2.actionMaps[0].enabled, Is.False);
+        Assert.That(playerInput.actions.actionMaps[0].enabled, Is.True);
+        Assert.That(actions1.actionMaps[0].enabled, Is.False);
 
         playerInput.actions = actions2;
 
-        Assert.That(actions1.actionMaps[0].enabled, Is.False);
-        Assert.That(actions2.actionMaps[0].enabled, Is.True);
+        Assert.That(actions2.actionMaps[0].enabled, Is.False);
+        Assert.That(playerInput.actions.actionMaps[0].enabled, Is.True);
     }
 
     [Test]
@@ -1714,7 +1715,8 @@ InputDevice[] AddDevices()
 
         // Make sure that no cloning of actions happened on the prefab.
         // https://fogbugz.unity3d.com/f/cases/1319756/
-        Assert.That(playerPrefab.GetComponent<PlayerInput>().actions, Is.SameAs(playerPrefabActions));
+
+        Assert.That(playerPrefab.GetComponent<PlayerInput>().actions.actionMaps.Count, Is.EqualTo(playerPrefabActions.actionMaps.Count));
         Assert.That(playerPrefab.GetComponent<PlayerInput>().m_ActionsInitialized, Is.False);
     }
 
@@ -2421,13 +2423,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

@@ -344,6 +344,8 @@ public InputActionAsset actions
 
                 m_Actions = value;
 
+                CopyActionAsset();
+
                 if (m_Enabled)
                 {
                     ClearCaches();
@@ -1373,14 +1375,13 @@ private void InitializeActions()
             if (m_Actions == null)
                 return;
 
-            // 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);
-            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]);
-            }
+
+            for (var i = 0; i < s_AllActivePlayersCount; ++i)
+                if (s_AllActivePlayers[i].m_Actions == m_Actions && s_AllActivePlayers[i] != this)
+                {
+                    CopyActionAsset();
+                    break;
+                }
 
             #if UNITY_INPUT_SYSTEM_ENABLE_UI
             if (uiInputModule != null)
@@ -1428,6 +1429,18 @@ private void InitializeActions()
             m_ActionsInitialized = true;
         }
 
+        private void CopyActionAsset()
+        {
+            // 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);
+            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]);
+            }
+        }
+
         private void UninitializeActions()
         {
             if (!m_ActionsInitialized)