GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix shortcuts (F5, F6, F11) in play mode

Browse Source
This commit is contained in:
stefnotch
2021-01-03 11:34:14 +01:00
parent e5286510d1
commit f59fe297ea
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Editor.cs
View File

@@ -409,11 +409,6 @@ namespace FlaxEditor
{
_modules[i].OnUpdate();
}
if (Input.GetKeyDown(KeyboardKeys.F6))
{
Simulation.RequestResumeOrPause();
}
}
catch (Exception ex)
{

13
Source/Editor/Windows/GameWindow.cs
View File

@@ -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;

2
Source/Editor/Windows/SceneEditorWindow.cs
View File

@@ -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);
}