Refactor various InputSystem members to improved separation of concerns (ISX-1842)

- Make InputSystem static fields private with read-only accessors
- Add InputSystemTestHooks.cs for "Test Hook" operations that need direct access to fields
- Factor out InputSystemObject (and related State) and rename to InputSystemStateManager
- Factor out "dirty asset tracking" functionality to a separate Utility class

Despite touching a bunch of files, this is a low-risk set of changes; functions are moved
to new files and types renamed, but no real changes to functionality.

Validated changes with Edit/Play/Player tests.

Author: timkeo

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -6080,12 +6080,12 @@ public void Actions_AddingSameProcessorTwice_DoesntImpactUIHideState()
         InputSystem.RegisterProcessor<ConstantFloat1TestProcessor>();
         Assert.That(InputSystem.TryGetProcessor("ConstantFloat1Test"), Is.Not.EqualTo(null));
 
-        bool hide = InputSystem.s_Manager.processors.ShouldHideInUI("ConstantFloat1Test");
+        bool hide = InputSystem.manager.processors.ShouldHideInUI("ConstantFloat1Test");
         Assert.That(hide, Is.EqualTo(false));
 
         InputSystem.RegisterProcessor<ConstantFloat1TestProcessor>();
         // Check we haven't caused this to alias with itself and cause it to be hidden in the UI
-        hide = InputSystem.s_Manager.processors.ShouldHideInUI("ConstantFloat1Test");
+        hide = InputSystem.manager.processors.ShouldHideInUI("ConstantFloat1Test");
         Assert.That(hide, Is.EqualTo(false));
     }
 
@@ -6731,7 +6731,7 @@ public void Actions_RegisteringExistingInteractionUnderNewName_CreatesAlias()
     {
         InputSystem.RegisterInteraction<HoldInteraction>("TestTest");
 
-        Assert.That(InputSystem.s_Manager.interactions.aliases.Contains(new InternedString("TestTest")));
+        Assert.That(InputSystem.manager.interactions.aliases.Contains(new InternedString("TestTest")));
     }
 
     #endif // UNITY_EDITOR
@@ -9023,7 +9023,7 @@ public void Actions_RegisteringExistingCompositeUnderNewName_CreatesAlias()
     {
         InputSystem.RegisterBindingComposite<Vector2Composite>("TestTest");
 
-        Assert.That(InputSystem.s_Manager.composites.aliases.Contains(new InternedString("TestTest")));
+        Assert.That(InputSystem.manager.composites.aliases.Contains(new InternedString("TestTest")));
     }
 
     #endif // UNITY_EDITOR
@@ -11103,7 +11103,7 @@ public void Actions_DisablingAllActions_RemovesAllTheirStateMonitors()
 
         // Not the most elegant test as we reach into internals here but with the
         // current API, it's not possible to enumerate monitors from outside.
-        Assert.That(InputSystem.s_Manager.m_StateChangeMonitors,
+        Assert.That(InputSystem.manager.m_StateChangeMonitors,
             Has.All.Matches(
                 (InputManager.StateChangeMonitorsForDevice x) => x.memoryRegions.All(r => r.sizeInBits == 0)));
     }
@@ -12123,7 +12123,7 @@ public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingActi
             // Disable the Keyboard while action is being performed.
             // This simulates an "OnFocusLost" event occurring while processing the Action, e.g. when switching primary displays or moving the main window
             actionPerformed = true;
-            InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, false, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
+            InputSystem.manager.EnableOrDisableDevice(keyboard.device, false, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
         };
 
         map.Enable();
@@ -12136,7 +12136,7 @@ public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingActi
         Assert.IsTrue(actionPerformed);
 
         // Re enable the Keyboard (before keys are released) and execute Action again
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
+        InputSystem.manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
 
         actionPerformed = false;
         Release(keyboard.leftShiftKey);
@@ -12155,7 +12155,7 @@ public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingActi
         Release(keyboard.f1Key);
 
         // Re enable the Keyboard (after keys are released) and execute Action one more time
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
+        InputSystem.manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
 
         Press(keyboard.leftCtrlKey);
         Press(keyboard.leftShiftKey);
@@ -12169,7 +12169,7 @@ public void Actions_CompositeBindingResetWhenResetDeviceCalledWhileExecutingActi
         Press(keyboard.f1Key);
 
         // Re enable the Keyboard (before keys are released) and verify Action isn't triggered when Key pressed first
-        InputSystem.s_Manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
+        InputSystem.manager.EnableOrDisableDevice(keyboard.device, true, InputManager.DeviceDisableScope.TemporaryWhilePlayerIsInBackground);
 
         Press(keyboard.f1Key);
         Press(keyboard.leftCtrlKey);

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -572,11 +572,11 @@ public void Devices_AddingDeviceThatUsesBeforeRenderUpdates_CausesBeforeRenderUp
 
         InputSystem.RegisterLayout(deviceJson);
 
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo((InputUpdateType)0));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo((InputUpdateType)0));
 
         InputSystem.AddDevice("CustomGamepad");
 
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
     }
 
     [Test]
@@ -596,15 +596,15 @@ public void Devices_RemovingLastDeviceThatUsesBeforeRenderUpdates_CausesBeforeRe
         var device1 = InputSystem.AddDevice("CustomGamepad");
         var device2 = InputSystem.AddDevice("CustomGamepad");
 
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
 
         InputSystem.RemoveDevice(device1);
 
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo(InputUpdateType.BeforeRender));
 
         InputSystem.RemoveDevice(device2);
 
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo((InputUpdateType)0));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.BeforeRender, Is.EqualTo((InputUpdateType)0));
     }
 
     private class TestDeviceReceivingAddAndRemoveNotification : Mouse

Assets/Tests/InputSystem/CoreTests_Editor.cs

@@ -71,19 +71,6 @@ public static Version ReadVersion()
         }
     }
 
-    private void SimulateDomainReload()
-    {
-        // This quite invasively goes into InputSystem internals. Unfortunately, we
-        // have no proper way of simulating domain reloads ATM. So we directly call various
-        // internal methods here in a sequence similar to what we'd get during a domain reload.
-        // Since we're faking it, pass 'true' for calledFromCtor param.
-
-        InputSystem.s_SystemObject.OnBeforeSerialize();
-        InputSystem.s_SystemObject = null;
-        InputSystem.s_Manager = null; // Do NOT Dispose()! The native memory cannot be freed as it's reference by saved state
-        InputSystem.InitializeInEditor(true, runtime);
-    }
-
     [Test]
     [Category("Editor")]
     public void Editor_PackageVersionAndAssemblyVersionAreTheSame()
@@ -213,7 +200,7 @@ public void Editor_DomainReload_CanRestoreDevicesBuiltWithDynamicallyGeneratedLa
         Assert.That(InputSystem.devices, Is.Empty);
 
         var state = m_StateManager.GetSavedState();
-        var manager = InputSystem.s_Manager;
+        var manager = InputSystem.manager;
 
         manager.m_SavedAvailableDevices = state.managerState.availableDevices;
         manager.m_SavedDeviceStates = state.managerState.devices;
@@ -232,7 +219,7 @@ public void Editor_DomainReload_PreservesUsagesOnDevices()
         var device = InputSystem.AddDevice<Gamepad>();
         InputSystem.SetDeviceUsage(device, CommonUsages.LeftHand);
 
-        SimulateDomainReload();
+        InputSystem.TestHook_SimulateDomainReload(runtime);
 
         var newDevice = InputSystem.devices[0];
 
@@ -252,7 +239,7 @@ public void Editor_DomainReload_PreservesEnabledState()
 
         Assert.That(device.enabled, Is.False);
 
-        SimulateDomainReload();
+        InputSystem.TestHook_SimulateDomainReload(runtime);
 
         var newDevice = InputSystem.devices[0];
 
@@ -265,7 +252,7 @@ public void Editor_DomainReload_InputSystemInitializationCausesDevicesToBeRecrea
     {
         InputSystem.AddDevice<Gamepad>();
 
-        SimulateDomainReload();
+        InputSystem.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.devices, Has.Count.EqualTo(1));
         Assert.That(InputSystem.devices[0], Is.TypeOf<Gamepad>());
@@ -302,7 +289,7 @@ public void Editor_DomainReload_CustomDevicesAreRestoredAsLayoutsBecomeAvailable
         InputSystem.RegisterLayout(kLayout);
         InputSystem.AddDevice("CustomDevice");
 
-        SimulateDomainReload();
+        InputSystem.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.devices, Is.Empty);
 
@@ -323,7 +310,7 @@ public void Editor_DomainReload_RetainsUnsupportedDevices()
         });
         InputSystem.Update();
 
-        SimulateDomainReload();
+        InputSystem.TestHook_SimulateDomainReload(runtime);
 
         Assert.That(InputSystem.GetUnsupportedDevices(), Has.Count.EqualTo(1));
         Assert.That(InputSystem.GetUnsupportedDevices()[0].interfaceName, Is.EqualTo("SomethingUnknown"));
@@ -2517,7 +2504,7 @@ public void TODO_Editor_SettingsModifiedInPlayMode_AreRestoredWhenReEnteringEdit
     [Category("Editor")]
     public void Editor_AlwaysKeepsEditorUpdatesEnabled()
     {
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Editor, Is.EqualTo(InputUpdateType.Editor));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.Editor, Is.EqualTo(InputUpdateType.Editor));
     }
 
     [Test]
@@ -2939,15 +2926,15 @@ public void Editor_LeavingPlayMode_DestroysAllActionStates()
         action.Enable();
 
         Assert.That(InputActionState.s_GlobalState.globalList.length, Is.EqualTo(1));
-        Assert.That(InputSystem.s_Manager.m_StateChangeMonitors.Length, Is.GreaterThan(0));
-        Assert.That(InputSystem.s_Manager.m_StateChangeMonitors[0].count, Is.EqualTo(1));
+        Assert.That(InputSystem.manager.m_StateChangeMonitors.Length, Is.GreaterThan(0));
+        Assert.That(InputSystem.manager.m_StateChangeMonitors[0].count, Is.EqualTo(1));
 
         // Exit play mode.
         InputSystem.OnPlayModeChange(PlayModeStateChange.ExitingPlayMode);
         InputSystem.OnPlayModeChange(PlayModeStateChange.EnteredEditMode);
 
         Assert.That(InputActionState.s_GlobalState.globalList.length, Is.Zero);
-        Assert.That(InputSystem.s_Manager.m_StateChangeMonitors[0].listeners[0].control, Is.Null); // Won't get removed, just cleared.
+        Assert.That(InputSystem.manager.m_StateChangeMonitors[0].listeners[0].control, Is.Null); // Won't get removed, just cleared.
     }
 
     [Test]

Assets/Tests/InputSystem/CoreTests_Events.cs

@@ -431,7 +431,7 @@ public void Events_CanSwitchToFullyManualUpdates()
 
         #if UNITY_EDITOR
         // Edit mode updates shouldn't have been disabled in editor.
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Editor, Is.Not.Zero);
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.Editor, Is.Not.Zero);
         #endif
 
         InputSystem.QueueStateEvent(mouse, new MouseState().WithButton(MouseButton.Left));
@@ -458,8 +458,8 @@ public void Events_CanSwitchToProcessingInFixedUpdates()
 
         Assert.That(InputSystem.settings.updateMode, Is.EqualTo(InputSettings.UpdateMode.ProcessEventsInFixedUpdate));
         Assert.That(receivedOnChange, Is.True);
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Fixed, Is.EqualTo(InputUpdateType.Fixed));
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Dynamic, Is.EqualTo(InputUpdateType.None));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.Fixed, Is.EqualTo(InputUpdateType.Fixed));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.Dynamic, Is.EqualTo(InputUpdateType.None));
 
         InputSystem.QueueStateEvent(mouse, new MouseState().WithButton(MouseButton.Left));
         runtime.currentTimeForFixedUpdate += Time.fixedDeltaTime;
@@ -475,19 +475,19 @@ public void Events_CanSwitchToProcessingInFixedUpdates()
     [Category("Events")]
     public void Events_ShouldRunUpdate_AppliesUpdateMask()
     {
-        InputSystem.s_Manager.updateMask = InputUpdateType.Dynamic;
+        InputSystem.manager.updateMask = InputUpdateType.Dynamic;
 
         Assert.That(runtime.onShouldRunUpdate.Invoke(InputUpdateType.Dynamic));
         Assert.That(!runtime.onShouldRunUpdate.Invoke(InputUpdateType.Fixed));
         Assert.That(!runtime.onShouldRunUpdate.Invoke(InputUpdateType.Manual));
 
-        InputSystem.s_Manager.updateMask = InputUpdateType.Manual;
+        InputSystem.manager.updateMask = InputUpdateType.Manual;
 
         Assert.That(!runtime.onShouldRunUpdate.Invoke(InputUpdateType.Dynamic));
         Assert.That(!runtime.onShouldRunUpdate.Invoke(InputUpdateType.Fixed));
         Assert.That(runtime.onShouldRunUpdate.Invoke(InputUpdateType.Manual));
 
-        InputSystem.s_Manager.updateMask = InputUpdateType.Default;
+        InputSystem.manager.updateMask = InputUpdateType.Default;
 
         Assert.That(runtime.onShouldRunUpdate.Invoke(InputUpdateType.Dynamic));
         Assert.That(runtime.onShouldRunUpdate.Invoke(InputUpdateType.Fixed));

Assets/Tests/InputSystem/CoreTests_Remoting.cs

@@ -297,7 +297,7 @@ public void Remote_CanConnectInputSystemsOverEditorPlayerConnection()
         connectionToPlayer.Bind(fakeEditorConnection, true);
 
         // Bind a local remote on the player side.
-        var local = new InputRemoting(InputSystem.s_Manager);
+        var local = new InputRemoting(InputSystem.manager);
         local.Subscribe(connectionToEditor);
 
         connectionToEditor.Subscribe(local);
@@ -479,11 +479,11 @@ public FakeRemote()
             runtime = new InputTestRuntime();
             var manager = InputManager.CreateAndInitialize(runtime, null, true);
 
-            local = new InputRemoting(InputSystem.s_Manager);
+            local = new InputRemoting(InputSystem.manager);
             remote = new InputRemoting(manager);
 
             var remoteInstaller = new GlobalsInstallerObserver(manager);
-            var localInstaller = new GlobalsInstallerObserver(InputSystem.s_Manager);
+            var localInstaller = new GlobalsInstallerObserver(InputSystem.manager);
 
             // The installers will ensure the globals environment is prepared right before
             // the receiver processes the message. There are some static fields, such as
@@ -501,14 +501,12 @@ public FakeRemote()
 
         public void SwitchToRemoteState()
         {
-            InputSystem.s_Manager = remoteManager;
-            InputStateBuffers.SwitchTo(remoteManager.m_StateBuffers, remoteManager.defaultUpdateType);
+            InputSystem.TestHook_SwitchToDifferentInputManager(remoteManager);
         }
 
         public void SwitchToLocalState()
         {
-            InputSystem.s_Manager = localManager;
-            InputStateBuffers.SwitchTo(localManager.m_StateBuffers, localManager.defaultUpdateType);
+            InputSystem.TestHook_SwitchToDifferentInputManager(localManager);
         }
 
         public void Dispose()

Assets/Tests/InputSystem/CoreTests_State.cs

@@ -1196,7 +1196,7 @@ public void State_FixedUpdatesAreDisabledByDefault()
     {
         Assert.That(InputSystem.settings.updateMode, Is.EqualTo(InputSettings.UpdateMode.ProcessEventsInDynamicUpdate));
         Assert.That(runtime.onShouldRunUpdate(InputUpdateType.Fixed), Is.False);
-        Assert.That(InputSystem.s_Manager.updateMask & InputUpdateType.Fixed, Is.EqualTo(InputUpdateType.None));
+        Assert.That(InputSystem.manager.updateMask & InputUpdateType.Fixed, Is.EqualTo(InputUpdateType.None));
     }
 
     [Test]

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

@@ -869,7 +869,7 @@ IEnumerator IEnumerable.GetEnumerator()
         internal void MarkAsDirty()
         {
 #if UNITY_EDITOR
-            InputSystem.TrackDirtyInputActionAsset(this);
+            DirtyAssetTracker.TrackDirtyInputActionAsset(this);
 #endif
         }
 

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

@@ -1120,7 +1120,7 @@ private void EnableControls(int mapIndex, int controlStartIndex, int numControls
                 "Control start index out of range");
             Debug.Assert(controlStartIndex + numControls <= totalControlCount, "Control range out of bounds");
 
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             for (var i = 0; i < numControls; ++i)
             {
                 var controlIndex = controlStartIndex + i;
@@ -1149,7 +1149,7 @@ private void DisableControls(int mapIndex, int controlStartIndex, int numControl
                 "Control start index out of range");
             Debug.Assert(controlStartIndex + numControls <= totalControlCount, "Control range out of bounds");
 
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             for (var i = 0; i < numControls; ++i)
             {
                 var controlIndex = controlStartIndex + i;
@@ -1225,7 +1225,7 @@ private void HookOnBeforeUpdate()
 
             if (m_OnBeforeUpdateDelegate == null)
                 m_OnBeforeUpdateDelegate = OnBeforeInitialUpdate;
-            InputSystem.s_Manager.onBeforeUpdate += m_OnBeforeUpdateDelegate;
+            InputSystem.manager.onBeforeUpdate += m_OnBeforeUpdateDelegate;
             m_OnBeforeUpdateHooked = true;
         }
 
@@ -1234,7 +1234,7 @@ private void UnhookOnBeforeUpdate()
             if (!m_OnBeforeUpdateHooked)
                 return;
 
-            InputSystem.s_Manager.onBeforeUpdate -= m_OnBeforeUpdateDelegate;
+            InputSystem.manager.onBeforeUpdate -= m_OnBeforeUpdateDelegate;
             m_OnBeforeUpdateHooked = false;
         }
 
@@ -1267,7 +1267,7 @@ private void OnBeforeInitialUpdate()
             // Go through all binding states and for every binding that needs an initial state check,
             // go through all bound controls and for each one that isn't in its default state, pretend
             // that the control just got actuated.
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             for (var bindingIndex = 0; bindingIndex < totalBindingCount; ++bindingIndex)
             {
                 ref var bindingState = ref bindingStates[bindingIndex];
@@ -2102,7 +2102,7 @@ internal void StartTimeout(float seconds, ref TriggerState trigger)
             Debug.Assert(trigger.controlIndex >= 0 && trigger.controlIndex < totalControlCount, "Control index out of range");
             Debug.Assert(trigger.interactionIndex >= 0 && trigger.interactionIndex < totalInteractionCount, "Interaction index out of range");
 
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             var currentTime = trigger.time;
             var control = controls[trigger.controlIndex];
             var interactionIndex = trigger.interactionIndex;
@@ -2131,7 +2131,7 @@ private void StopTimeout(int interactionIndex)
 
             ref var interactionState = ref interactionStates[interactionIndex];
 
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             manager.RemoveStateChangeMonitorTimeout(this, interactionState.timerMonitorIndex, interactionIndex);
 
             // Update state.

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

@@ -557,7 +557,7 @@ public unsafe long ExecuteCommand<TCommand>(ref TCommand command)
             var commandPtr = (InputDeviceCommand*)UnsafeUtility.AddressOf(ref command);
 
             // Give callbacks first shot.
-            var manager = InputSystem.s_Manager;
+            var manager = InputSystem.manager;
             manager.m_DeviceCommandCallbacks.LockForChanges();
             for (var i = 0; i < manager.m_DeviceCommandCallbacks.length; ++i)
             {