Merge branch 'master' of https://github.com/rkrahn/FlaxEngine into rkrahn-master

This commit is contained in:
Wojtek Figat
2024-04-05 15:46:30 +02:00
2 changed files with 5 additions and 0 deletions

View File

@@ -320,6 +320,10 @@ namespace FlaxEditor.Options
[EditorDisplay("Viewport"), EditorOrder(1750)]
public InputBinding ViewpointBottom = new InputBinding(KeyboardKeys.Numpad2);
[DefaultValue(typeof(InputBinding), "NumpadDecimal")]
[EditorDisplay("Viewport"), EditorOrder(1760)]
public InputBinding ToggleOrthographic = new InputBinding(KeyboardKeys.NumpadDecimal);
#endregion
#region Interface

View File

@@ -998,6 +998,7 @@ namespace FlaxEditor.Viewport
InputActions.Add(options => options.CameraToggleRotation, () => _isVirtualMouseRightDown = !_isVirtualMouseRightDown);
InputActions.Add(options => options.CameraIncreaseMoveSpeed, () => AdjustCameraMoveSpeed(1));
InputActions.Add(options => options.CameraDecreaseMoveSpeed, () => AdjustCameraMoveSpeed(-1));
InputActions.Add(options => options.ToggleOrthographic, () => OnOrthographicModeToggled(null));
// Link for task event
task.Begin += OnRenderBegin;