From 3b492b58bfd3d02c4c6d49cedc0ce1944f69c865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Wed, 18 Jun 2025 10:46:29 +0200 Subject: [PATCH 1/2] INTERNAL: Removed isInBatchMode and isPaused from IInputRuntime --- Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs | 3 --- Packages/com.unity.inputsystem/InputSystem/InputManager.cs | 2 +- Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 2 +- .../com.unity.inputsystem/InputSystem/NativeInputRuntime.cs | 4 ---- .../Tests/TestFixture/InputTestRuntime.cs | 3 --- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs index 6913dffd28..f7851f12f0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs +++ b/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs @@ -187,13 +187,10 @@ internal unsafe interface IInputRuntime void SendAnalytic(InputAnalytics.IInputAnalytic analytic); #endif // UNITY_ANALYTICS || UNITY_EDITOR - bool isInBatchMode { get; } - #if UNITY_EDITOR Action onPlayModeChanged { get; set; } Action onProjectChange { get; set; } bool isInPlayMode { get; } - bool isPaused { get; } bool isEditorActive { get; } // Functionality related to the Unity Remote. diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index cb75d7d6f6..d83e6d7f6a 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -362,7 +362,7 @@ public bool runPlayerUpdatesInEditMode private bool gameIsPlaying => #if UNITY_EDITOR - (m_Runtime.isInPlayMode && !m_Runtime.isPaused) || m_RunPlayerUpdatesInEditMode; + (m_Runtime.isInPlayMode && !EditorApplication.isPaused) || m_RunPlayerUpdatesInEditMode; #else true; #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs index 10b5dfa98e..189c4b6e50 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs @@ -3611,7 +3611,7 @@ private static void ShowRestartWarning() { if (!s_SystemObject.newInputBackendsCheckedAsEnabled && !EditorPlayerSettingHelpers.newSystemBackendsEnabled && - !s_Manager.m_Runtime.isInBatchMode) + !Application.isBatchMode) { const string dialogText = "This project is using the new input system package but the native platform backends for the new input system are not enabled in the player settings. " + "This means that no input from native devices will come through." + diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs index f82d5fa8b3..7c6b2090ce 100644 --- a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs +++ b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs @@ -293,13 +293,9 @@ public float scrollWheelDeltaPerTick get => NativeInputSystem.GetScrollWheelDeltaPerTick(); } #endif - - public bool isInBatchMode => Application.isBatchMode; - #if UNITY_EDITOR public bool isInPlayMode => EditorApplication.isPlaying; - public bool isPaused => EditorApplication.isPaused; public bool isEditorActive => InternalEditorUtility.isApplicationActive; public Func onUnityRemoteMessage diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs index 83745a2af5..b6a482d06e 100644 --- a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs +++ b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs @@ -402,11 +402,8 @@ public double currentTimeOffsetToRealtimeSinceStartup } } - public bool isInBatchMode { get; set; } - #if UNITY_EDITOR public bool isInPlayMode { get; set; } = true; - public bool isPaused { get; set; } public bool isEditorActive { get; set; } = true; public Func onUnityRemoteMessage { From 49a7b06c33b29c87f118baf995b1b26c3add6762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akan=20Sidenvall?= Date: Wed, 18 Jun 2025 11:00:38 +0200 Subject: [PATCH 2/2] Added missing namespace --- Packages/com.unity.inputsystem/InputSystem/InputManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs index d83e6d7f6a..8940f888c6 100644 --- a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs @@ -362,7 +362,7 @@ public bool runPlayerUpdatesInEditMode private bool gameIsPlaying => #if UNITY_EDITOR - (m_Runtime.isInPlayMode && !EditorApplication.isPaused) || m_RunPlayerUpdatesInEditMode; + (m_Runtime.isInPlayMode && !UnityEditor.EditorApplication.isPaused) || m_RunPlayerUpdatesInEditMode; #else true; #endif