From f59fe297eab54ed20a28ec4bd6efe4f63b1f82ea Mon Sep 17 00:00:00 2001 From: stefnotch Date: Sun, 3 Jan 2021 11:34:14 +0100 Subject: [PATCH] Fix shortcuts (F5, F6, F11) in play mode --- Source/Editor/Editor.cs | 5 ----- Source/Editor/Windows/GameWindow.cs | 13 ++++++------- Source/Editor/Windows/SceneEditorWindow.cs | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Source/Editor/Editor.cs b/Source/Editor/Editor.cs index 2f1c871e3..ab28f1cf7 100644 --- a/Source/Editor/Editor.cs +++ b/Source/Editor/Editor.cs @@ -409,11 +409,6 @@ namespace FlaxEditor { _modules[i].OnUpdate(); } - - if (Input.GetKeyDown(KeyboardKeys.F6)) - { - Simulation.RequestResumeOrPause(); - } } catch (Exception ex) { diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs index 76bbe0a5d..092c12a43 100644 --- a/Source/Editor/Windows/GameWindow.cs +++ b/Source/Editor/Windows/GameWindow.cs @@ -206,9 +206,12 @@ namespace FlaxEditor.Windows Editor.StateMachine.PlayingState.SceneRestored += PlayingStateOnSceneRestored; // Link editor options - var options = Editor.Options; - options.OptionsChanged += OnOptionsChanged; - OnOptionsChanged(options.Options); + Editor.Options.OptionsChanged += OnOptionsChanged; + OnOptionsChanged(Editor.Options.Options); + + InputActions.Add(options => options.Play, Editor.Simulation.RequestPlayOrStopPlay); + InputActions.Add(options => options.Pause, Editor.Simulation.RequestResumeOrPause); + InputActions.Add(options => options.StepFrame, Editor.Simulation.RequestPlayOneFrame); } private void OnOptionsChanged(EditorOptions options) @@ -369,10 +372,6 @@ namespace FlaxEditor.Windows { switch (key) { - case KeyboardKeys.Pause: - Editor.Simulation.RequestResumeOrPause(); - UnlockMouseInPlay(); - return true; case KeyboardKeys.F12: Screenshot.Capture(string.Empty); return true; diff --git a/Source/Editor/Windows/SceneEditorWindow.cs b/Source/Editor/Windows/SceneEditorWindow.cs index 5c9009b5e..26717cecd 100644 --- a/Source/Editor/Windows/SceneEditorWindow.cs +++ b/Source/Editor/Windows/SceneEditorWindow.cs @@ -38,7 +38,7 @@ namespace FlaxEditor.Windows InputActions.Add(options => options.SelectAll, Editor.SceneEditing.SelectAllScenes); InputActions.Add(options => options.Delete, Editor.SceneEditing.Delete); InputActions.Add(options => options.Search, () => Editor.Windows.SceneWin.Search()); - InputActions.Add(options => options.Play, Editor.Simulation.RequestStartPlay); + InputActions.Add(options => options.Play, Editor.Simulation.RequestPlayOrStopPlay); InputActions.Add(options => options.Pause, Editor.Simulation.RequestResumeOrPause); InputActions.Add(options => options.StepFrame, Editor.Simulation.RequestPlayOneFrame); }