always duplicate PlayerInput action assets and removed redundant pjwd actions enabling calls

Author: ritamerkl

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

@@ -149,11 +149,11 @@ public void PlayerInput_CanUseSameActionsForUIInputModule()
         eventSystemGO.SetActive(true);
         playerGO.SetActive(true);
 
-        Assert.That(actions.FindActionMap("Gameplay").enabled, Is.True);
-        Assert.That(actions.FindActionMap("UI").enabled, Is.True);
-        Assert.That(actions["UI/Navigate"].controls, Is.Empty);
-        Assert.That(actions["UI/Point"].controls, Is.EquivalentTo(new[] { mouse.position }));
-        Assert.That(actions["UI/Click"].controls, Is.EquivalentTo(new[] { mouse.leftButton }));
+        Assert.That(player.actions.FindActionMap("Gameplay").enabled, Is.True);
+        Assert.That(uiModule.actionsAsset.FindActionMap("UI").enabled, Is.True);
+        Assert.That(uiModule.actionsAsset["UI/Navigate"].controls, Is.Empty);
+        Assert.That(uiModule.actionsAsset["UI/Point"].controls, Is.EquivalentTo(new[] { mouse.position }));
+        Assert.That(uiModule.actionsAsset["UI/Click"].controls, Is.EquivalentTo(new[] { mouse.leftButton }));
     }
 
     [Test]

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

@@ -3609,12 +3609,6 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
             // this would cancel the import of large assets that are dependent on the InputSystem package and import it as a dependency.
             EditorApplication.delayCall += ShowRestartWarning;
 
-#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-            // Make sure project wide input actions are enabled.
-            // Note that this will always fail if entering play-mode within editor since not yet in play-mode.
-            EnableActions();
-#endif
-
             RunInitialUpdate();
 
             k_InputInitializeInEditorMarker.End();
@@ -3657,9 +3651,6 @@ internal static void OnPlayModeChange(PlayModeStateChange change)
                 case PlayModeStateChange.EnteredPlayMode:
                     s_SystemObject.enterPlayModeTime = InputRuntime.s_Instance.currentTime;
                     s_Manager.SyncAllDevicesAfterEnteringPlayMode();
-                    #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
-                    EnableActions();
-                    #endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
                     break;
 
                 case PlayModeStateChange.ExitingPlayMode:

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

@@ -956,7 +956,7 @@ public void ActivateInput()
 
             // reset state to default, only one action map is enabled at the initial state
             // Project wide actions may have enabled action maps
-            if (m_Actions != null)
+            if (m_Actions)
                 m_Actions.Disable();
 
             // If we have no current action map but there's a default
@@ -1373,18 +1373,14 @@ private void InitializeActions()
             if (m_Actions == null)
                 return;
 
-            // don't use project wide action asset for player input, but duplicate it
-            if (InputSystem.actions != null && InputSystem.actions.Equals(m_Actions))
-                DuplicateActionsForPlayer();
-
-            // Check if we need to duplicate our actions by looking at all other players. If any
-            // has the same actions, duplicate.
-            for (var i = 0; i < s_AllActivePlayersCount; ++i)
-                if (s_AllActivePlayers[i].m_Actions == m_Actions && s_AllActivePlayers[i] != this)
-                {
-                    DuplicateActionsForPlayer();
-                    break;
-                }
+            // 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]);
+            }
 
             #if UNITY_INPUT_SYSTEM_ENABLE_UI
             if (uiInputModule != null)
@@ -1432,17 +1428,6 @@ private void InitializeActions()
             m_ActionsInitialized = true;
         }
 
-        private void DuplicateActionsForPlayer()
-        {
-            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)