Only EnableActions() on InitializeInEditor()

This reverts added changes and makes it consistent with InitializeInPlayerBehavior.

Author: jfreire-unity

Assets/Tests/InputSystem/CoreTests_ProjectWideActions.cs

@@ -5,6 +5,7 @@
 using UnityEngine.InputSystem;
 using UnityEngine.TestTools;
 using UnityEngine;
+using System.Collections;
 
 #if UNITY_EDITOR
 using System.IO;
@@ -143,11 +144,11 @@ public void ProjectWideActions_AppearInEnabledActions()
 
     [Category(TestCategory)]
     [Test]
-    [TestCase("Player", true, Description = "PlayerInput using project-wide actions has the default action map set " +
+    [TestCase("Player", true, Description = "PlayerInput using project-wide actions can have default action map set " +
             "enabled, and all others disabled.")]
     [TestCase(null, false, Description = "PlayerInput using project wide actions has all action maps of project-wide " +
             "actions disabled, if there is no default action map assigned.")]
-    public void ProjectWideActions_AreDisabledWithPlayerInput(string actionMapName, bool expectedResult)
+    public void ProjectWideActions_CanEnableCurrentActionMapOfPlayerInput(string actionMapName, bool expectedResult)
     {
         var keyboard = InputSystem.AddDevice<Keyboard>();
         var go = new GameObject("PlayerInput");
@@ -159,29 +160,40 @@ public void ProjectWideActions_AreDisabledWithPlayerInput(string actionMapName,
         // will be called.
         playerInput.defaultActionMap = actionMapName;
 
-        #if UNITY_EDITOR
+        // PWA actions assigned to playerInput start enabled
+        Assert.That(playerInput.actions.enabled, Is.True);
+        Assert.That(ReferenceEquals(playerInput.actions, InputSystem.actions));
+
+#if UNITY_EDITOR
         InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingEditMode);
-        #endif
+#endif
 
         // This makes sure to call PlayerInput.OnEnable()
         go.SetActive(true);
 
-        Assert.That(ReferenceEquals(playerInput.actions, InputSystem.actions));
+        // This mimics usings to disabling actions on Start/Awake.
+        InputSystem.actions.Disable();
+
+        if (!string.IsNullOrEmpty(actionMapName))
+            playerInput.SwitchCurrentActionMap("Player");
+
         Assert.That(playerInput.actions.enabled, Is.EqualTo(expectedResult));
 
-        #if UNITY_EDITOR
-        // This mimics the behavior of entering play-mode, which will check if InputSystem.EnableActions() should
-        // be called.
+        // We do this on the editor to make sure project-wide actions maintain the enabled state
+        // after entering PlayMode.
+#if UNITY_EDITOR
         InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredPlayMode);
-        #endif
+        Assert.That(playerInput.actions.enabled, Is.EqualTo(expectedResult));
+#endif
 
-        if (actionMapName != null)
+        if (!string.IsNullOrEmpty(actionMapName))
             Assert.That(playerInput.currentActionMap.enabled, Is.EqualTo(expectedResult));
 
+        // Check state of all action maps in the asset
         Assert.That(InputSystem.actions.FindActionMap("Player").enabled, Is.EqualTo(expectedResult));
         Assert.That(InputSystem.actions.FindActionMap("UI").enabled, Is.False);
 
-        //NOTE: Asset actions will be considered enabled even if a single action map is enabled
+        //NOTE: Asset actions are considered enabled even if a single action map is enabled
         Assert.That(playerInput.actions.enabled, Is.EqualTo(expectedResult));
     }
 }

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

@@ -3038,19 +3038,6 @@ private static void EnableActions()
             actions.Enable();
         }
 
-        /// <summary>
-        /// Determines whether project-wide actions are automatically enabled after entering Play Mode.
-        /// </summary>
-        /// <remarks>
-        /// This property is set to <c>true</c> by default.
-        /// </remarks>
-        internal static bool m_EnableActionsAfterEnterPlayMode = true;
-
-        internal static void AllowEnableActionsAfterEnterPlayMode(bool enabled)
-        {
-            m_EnableActionsAfterEnterPlayMode = enabled;
-        }
-
         private static void DisableActions(bool triggerSetupChanged = false)
         {
             // Make sure project wide input actions are disabled
@@ -3663,14 +3650,7 @@ 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
-                    // Check if project-wide actions should be enabled after entering PlayMode.
-                    // In some cases, like using project-wide actions in PlayerInput, we don't want actions to be
-                    // enabled when entering PlayMode so that PlayerInput is able to enable the default action map.
-                    if (m_EnableActionsAfterEnterPlayMode)
-                        EnableActions();
 
-#endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
                     break;
 
                 case PlayModeStateChange.ExitingPlayMode:
@@ -3928,8 +3908,8 @@ private static void Reset(bool enableRemoting = false, IInputRuntime runtime = n
             InputUser.ResetGlobals();
             EnhancedTouchSupport.Reset();
 
-            // This is the point where we initialise project-wide actions for the Editor, Editor Tests and Player Tests.
-            // Note this is too early for editor ! actions is not setup yet.
+            // // This is the point where we initialise project-wide actions for the Editor, Editor Tests and Player Tests.
+            // // Note this is too early for editor ! actions is not setup yet.
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             EnableActions();
             #endif