Refactor ProjectWideActions to fix initialization with FEPM (ISX-1840)

- Rework the class so it operates as a Singleton (basically how it's being used)
- Move actions get/set implementations from InputSystem to ProjectWideActions class
    * Combine functionality for tighter cohesion despite being an Editor
    * Update #ifefs to allow Player to access some of these members
- Call EnsureInitialized() from Editor init flows to fix the actual bug

Tested using ProjectWideActions sample and verified could move cube when domain reloads disabled.
Ran Package tests (Edit/Play/Player) to verify no (new) failures.

Author: timkeo

Assets/Tests/InputSystem/CoreTests_ProjectWideActions.cs

@@ -38,9 +38,6 @@ private static void CreateAndAssignProjectWideTestAsset()
         else
             EditorBuildSettings.RemoveConfigObject(name: kSavedActionsObject);
 
-        // Create temporary asset and assign as setting
-        var asset = ProjectWideActionsAsset.CreateDefaultAssetAtPath(kAssetPath);
-        ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild = asset;
 #endif
     }
 

Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 
 using System;
 using System.Collections.Generic;
@@ -28,7 +28,6 @@ class ProjectSettingsPostprocessor : AssetPostprocessor
                 private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths, bool didDomainReload)
 #else
                 private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
-#endif
                 {
                     if (!migratedInputActionAssets)
                     {
@@ -46,19 +45,14 @@ private static void OnPostprocessAllAssets(string[] importedAssets, string[] del
                     }
                 }
             }
+            }
+        }
 
-            private static void MoveInputManagerAssetActionsToProjectWideInputActionAsset()
             {
                 var objects = AssetDatabase.LoadAllAssetsAtPath(EditorHelpers.GetPhysicalPath(kAssetPathInputManager));
                 if (objects == null)
                     return;
 
-                var inputActionsAsset = objects.FirstOrDefault(o => o != null && o.name == kAssetNameProjectWideInputActions) as InputActionAsset;
-                if (inputActionsAsset != default)
-                {
-                    // Found some actions in the InputManager.asset file
-                    //
-                    string path = ProjectWideActionsAsset.kDefaultAssetPath;
 
                     if (File.Exists(EditorHelpers.GetPhysicalPath(path)))
                     {
@@ -311,6 +305,7 @@ private static InputActionAsset CreateAssetAtPathFromJson(string assetPath, stri
             InputActionAssetManager.SaveAsset(assetPath, inputActionAsset.ToJson());
             return AssetDatabase.LoadAssetAtPath<InputActionAsset>(assetPath);
         }
+#endif // UNITY_EDITOR
     }
 }
 #endif // UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS

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

@@ -3099,6 +3099,9 @@ private static void DisableActions(bool triggerSetupChanged = false)
         public static InputActionAsset actions
         {
             get => s_Manager?.actions;
+            {
+                return UnityEngine.InputSystem.Editor.ProjectWideActionsAsset.instance;
+            }
             set
             {
                 // Prevent this property from being assigned in play-mode.
@@ -3110,7 +3113,6 @@ public static InputActionAsset actions
                 var current = s_Manager.actions;
                 if (ReferenceEquals(current, value))
                     return;
-
                 var valueIsNotNull = value != null;
                 #if UNITY_EDITOR
                 // Do not allow assigning non-persistent assets (pure in-memory objects)
@@ -3127,8 +3129,6 @@ public static InputActionAsset actions
 
                 // Note that we do not enable/disable any actions until play-mode
             }
-            }
-
         /// <summary>
         /// Event that is triggered if the instance assigned to property <see cref="actions"/> changes.
         /// </summary>
@@ -3143,7 +3143,6 @@ public static event Action onActionsChange
             add => s_Manager.onActionsChange += value;
             remove => s_Manager.onActionsChange -= value;
         }
-
 #endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
 
         /// <summary>
@@ -3571,6 +3570,10 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
 #endif
             }
 
+#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+            ProjectWideActionsAsset.EnsureInitialized();
+#endif
+
             var existingSystemObjects = Resources.FindObjectsOfTypeAll<InputSystemObject>();
             if (existingSystemObjects != null && existingSystemObjects.Length > 0)
             {
@@ -3627,10 +3630,8 @@ internal static void InitializeInEditor(bool calledFromCtor, IInputRuntime runti
             }
 
             Debug.Assert(settings != null);
-            #if UNITY_EDITOR
             Debug.Assert(EditorUtility.InstanceIDToObject(settings.GetInstanceID()) != null,
                 "InputSettings has lost its native object");
-            #endif
 
             // If native backends for new input system aren't enabled, ask user whether we should
             // enable them (requires restart). We only ask once per session and don't ask when
@@ -3906,8 +3907,6 @@ internal static void PerformDefaultPluginInitialization()
 #endif // UNITY_DISABLE_DEFAULT_INPUT_PLUGIN_INITIALIZATION
 
 
-
-
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
         /// <summary>
         /// Snapshot of the state used by the input system.

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

@@ -1611,15 +1611,14 @@ private void AssignPlayerIndex()
             }
         }
 
-        #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
         void Reset()
         {
             // Set default actions to project wide actions.
             m_Actions = InputSystem.actions;
             // TODO Need to monitor changes?
         }
-
-        #endif
+#endif
 
         private void OnEnable()
         {

Packages/com.unity.inputsystem/Tests/TestFixture/InputTestStateManager.cs

@@ -65,7 +65,7 @@ public void Reset(bool enableRemoting, IInputRuntime runtime)
         {
             Profiler.BeginSample("InputSystem.Reset");
 
-            InputSystem.DisableActionsForTests();
+            UnityEngine.InputSystem.Editor.ProjectWideActionsAsset.TestHook_Disable();
 
             // Some devices keep globals. Get rid of them by pretending the devices
             // are removed.
@@ -104,7 +104,7 @@ public void Reset(bool enableRemoting, IInputRuntime runtime)
             InputUser.ResetGlobals();
             EnhancedTouchSupport.Reset();
 
-            InputSystem.EnableActionsForTests();
+            UnityEngine.InputSystem.Editor.ProjectWideActionsAsset.TestHook_Enable();
 
             Profiler.EndSample();
         }