Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<PlayModeStateChange> onPlayModeChanged { get; set; }
Action onProjectChange { get; set; }
bool isInPlayMode { get; }
bool isPaused { get; }
bool isEditorActive { get; }

// Functionality related to the Unity Remote.
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public bool runPlayerUpdatesInEditMode

private bool gameIsPlaying =>
#if UNITY_EDITOR
(m_Runtime.isInPlayMode && !m_Runtime.isPaused) || m_RunPlayerUpdatesInEditMode;
(m_Runtime.isInPlayMode && !UnityEditor.EditorApplication.isPaused) || m_RunPlayerUpdatesInEditMode;
#else
true;
#endif
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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." +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<IntPtr, bool> onUnityRemoteMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<IntPtr, bool> onUnityRemoteMessage
{
Expand Down