diff --git a/Content/Editor/IconsAtlas.flax b/Content/Editor/IconsAtlas.flax index 3318b811b..ae46fcf06 100644 --- a/Content/Editor/IconsAtlas.flax +++ b/Content/Editor/IconsAtlas.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d867a994701f09964335ddf51cd4060a54728b9de4420ad3f0bfbd8847bc7602 -size 5611659 +oid sha256:745ce418c493445abde98aea91a34592b00c5c46b68cd7e61604a05b3043c76c +size 5608587 diff --git a/Source/Editor/EditorIcons.cs b/Source/Editor/EditorIcons.cs index 127ba3f6f..fb3c46a41 100644 --- a/Source/Editor/EditorIcons.cs +++ b/Source/Editor/EditorIcons.cs @@ -96,6 +96,7 @@ namespace FlaxEditor public SpriteHandle Link64; public SpriteHandle Build64; public SpriteHandle Add64; + public SpriteHandle ShipIt64; // 96px public SpriteHandle Toolbox96; diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs new file mode 100644 index 000000000..5abb52b4a --- /dev/null +++ b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs @@ -0,0 +1,93 @@ +// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved. + +using System; +using System.Collections.Generic; +using FlaxEngine; + +namespace FlaxEditor.GUI.ContextMenu +{ + /// + /// Context menu for a single selectable option from range of values (eg. enum). + /// + [HideInEditor] + class ContextMenuSingleSelectGroup + { + private struct SingleSelectGroupItem + { + public string Text; + public string Tooltip; + public T Value; + public Action Selected; + public List Buttons; + } + + private List _menus = new List(); + private List _items = new List(); + private SingleSelectGroupItem _selectedItem; + + public T Selected + { + get => _selectedItem.Value; + set + { + var index = _items.FindIndex(x => x.Value.Equals(value)); + if (index != -1 && !_selectedItem.Value.Equals(value)) + { + SetSelected(_items[index]); + } + } + } + + public Action SelectedChanged; + + public ContextMenuSingleSelectGroup AddItem(string text, T value, Action selected = null, string tooltip = null) + { + var item = new SingleSelectGroupItem + { + Text = text, + Tooltip = tooltip, + Value = value, + Selected = selected, + Buttons = new List() + }; + _items.Add(item); + foreach (var contextMenu in _menus) + AddItemToContextMenu(contextMenu, item); + return this; + } + + public ContextMenuSingleSelectGroup AddItemsToContextMenu(ContextMenu contextMenu) + { + _menus.Add(contextMenu); + for (int i = 0; i < _items.Count; i++) + AddItemToContextMenu(contextMenu, _items[i]); + return this; + } + + private void AddItemToContextMenu(ContextMenu contextMenu, SingleSelectGroupItem item) + { + var btn = contextMenu.AddButton(item.Text, () => { SetSelected(item); }); + if (item.Tooltip != null) + btn.TooltipText = item.Tooltip; + item.Buttons.Add(btn); + if (item.Equals(_selectedItem)) + btn.Checked = true; + } + + private void SetSelected(SingleSelectGroupItem item) + { + foreach (var e in _items) + { + foreach (var btn in e.Buttons) + btn.Checked = false; + } + _selectedItem = item; + + SelectedChanged?.Invoke(item.Value); + item.Selected?.Invoke(); + + foreach (var btn in item.Buttons) + btn.Checked = true; + } + } +} diff --git a/Source/Editor/GUI/ToolStrip.cs b/Source/Editor/GUI/ToolStrip.cs index 6a881281f..0dac241ed 100644 --- a/Source/Editor/GUI/ToolStrip.cs +++ b/Source/Editor/GUI/ToolStrip.cs @@ -23,10 +23,15 @@ namespace FlaxEditor.GUI public const int DefaultMarginH = 2; /// - /// Event fired when button gets clicked. + /// Event fired when button gets clicked with the primary mouse button. /// public Action ButtonClicked; + /// + /// Event fired when button gets clicked with the secondary mouse button. + /// + public Action SecondaryButtonClicked; + /// /// Tries to get the last button. /// @@ -146,6 +151,11 @@ namespace FlaxEditor.GUI ButtonClicked?.Invoke(button); } + internal void OnSecondaryButtonClicked(ToolStripButton button) + { + SecondaryButtonClicked?.Invoke(button); + } + /// protected override void PerformLayoutBeforeChildren() { diff --git a/Source/Editor/GUI/ToolStripButton.cs b/Source/Editor/GUI/ToolStripButton.cs index 09a26b940..e839a7356 100644 --- a/Source/Editor/GUI/ToolStripButton.cs +++ b/Source/Editor/GUI/ToolStripButton.cs @@ -20,13 +20,19 @@ namespace FlaxEditor.GUI private SpriteHandle _icon; private string _text; - private bool _mouseDown; + private bool _primaryMouseDown; + private bool _secondaryMouseDown; /// /// Event fired when user clicks the button. /// public Action Clicked; + /// + /// Event fired when user clicks the button. + /// + public Action SecondaryClicked; + /// /// The checked state. /// @@ -63,6 +69,11 @@ namespace FlaxEditor.GUI } } + /// + /// A reference to a context menu to raise when the secondary mouse button is pressed. + /// + public ContextMenu.ContextMenu ContextMenu; + /// /// Initializes a new instance of the class. /// @@ -108,10 +119,11 @@ namespace FlaxEditor.GUI var iconRect = new Rectangle(DefaultMargin, DefaultMargin, iconSize, iconSize); var textRect = new Rectangle(DefaultMargin, 0, 0, Height); bool enabled = EnabledInHierarchy; + bool mouseButtonDown = _primaryMouseDown || _secondaryMouseDown; // Draw background if (enabled && (IsMouseOver || IsNavFocused || Checked)) - Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : _mouseDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f)); + Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : mouseButtonDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f)); // Draw icon if (_icon.IsValid) @@ -124,13 +136,7 @@ namespace FlaxEditor.GUI if (!string.IsNullOrEmpty(_text)) { textRect.Size.X = Width - DefaultMargin - textRect.Left; - Render2D.DrawText( - style.FontMedium, - _text, - textRect, - enabled ? style.Foreground : style.ForegroundDisabled, - TextAlignment.Near, - TextAlignment.Center); + Render2D.DrawText(style.FontMedium, _text, textRect, enabled ? style.Foreground : style.ForegroundDisabled, TextAlignment.Near, TextAlignment.Center); } } @@ -155,9 +161,13 @@ namespace FlaxEditor.GUI { if (button == MouseButton.Left) { - // Set flag - _mouseDown = true; - + _primaryMouseDown = true; + Focus(); + return true; + } + if (button == MouseButton.Right) + { + _secondaryMouseDown = true; Focus(); return true; } @@ -168,12 +178,9 @@ namespace FlaxEditor.GUI /// public override bool OnMouseUp(Float2 location, MouseButton button) { - if (button == MouseButton.Left && _mouseDown) + if (button == MouseButton.Left && _primaryMouseDown) { - // Clear flag - _mouseDown = false; - - // Fire events + _primaryMouseDown = false; if (AutoCheck) Checked = !Checked; Clicked?.Invoke(); @@ -181,6 +188,14 @@ namespace FlaxEditor.GUI return true; } + if (button == MouseButton.Right && _secondaryMouseDown) + { + _secondaryMouseDown = false; + SecondaryClicked?.Invoke(); + (Parent as ToolStrip)?.OnSecondaryButtonClicked(this); + ContextMenu?.Show(this, new Float2(0, Height)); + return true; + } return base.OnMouseUp(location, button); } @@ -188,8 +203,8 @@ namespace FlaxEditor.GUI /// public override void OnMouseLeave() { - // Clear flag - _mouseDown = false; + _primaryMouseDown = false; + _secondaryMouseDown = false; base.OnMouseLeave(); } @@ -197,8 +212,8 @@ namespace FlaxEditor.GUI /// public override void OnLostFocus() { - // Clear flag - _mouseDown = false; + _primaryMouseDown = false; + _secondaryMouseDown = false; base.OnLostFocus(); } diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs index 858ef2b1a..38c61942a 100644 --- a/Source/Editor/Modules/UIModule.cs +++ b/Source/Editor/Modules/UIModule.cs @@ -20,6 +20,8 @@ using FlaxEngine.GUI; using FlaxEngine.Json; using DockHintWindow = FlaxEditor.GUI.Docking.DockHintWindow; using MasterDockPanel = FlaxEditor.GUI.Docking.MasterDockPanel; +using FlaxEditor.Content.Settings; +using FlaxEditor.Options; namespace FlaxEditor.Modules { @@ -36,6 +38,9 @@ namespace FlaxEditor.Modules private ContentStats _contentStats; private bool _progressFailed; + ContextMenuSingleSelectGroup _numberOfClientsGroup = new ContextMenuSingleSelectGroup(); + private Scene[] _scenesToReload; + private ContextMenuButton _menuFileSaveScenes; private ContextMenuButton _menuFileCloseScenes; private ContextMenuButton _menuFileGenerateScriptsProjectFiles; @@ -54,7 +59,9 @@ namespace FlaxEditor.Modules private ContextMenuButton _menuSceneAlignViewportWithActor; private ContextMenuButton _menuScenePilotActor; private ContextMenuButton _menuSceneCreateTerrain; - private ContextMenuButton _menuGamePlay; + private ContextMenuButton _menuGamePlayGame; + private ContextMenuButton _menuGamePlayCurrentScenes; + private ContextMenuButton _menuGameStop; private ContextMenuButton _menuGamePause; private ContextMenuButton _menuToolsBuildScenes; private ContextMenuButton _menuToolsBakeLightmaps; @@ -74,6 +81,7 @@ namespace FlaxEditor.Modules private ToolStripButton _toolStripRotate; private ToolStripButton _toolStripScale; private ToolStripButton _toolStripBuildScenes; + private ToolStripButton _toolStripCook; private ToolStripButton _toolStripPlay; private ToolStripButton _toolStripPause; private ToolStripButton _toolStripStep; @@ -195,6 +203,7 @@ namespace FlaxEditor.Modules _toolStripScale.Checked = gizmoMode == TransformGizmoBase.Mode.Scale; // _toolStripBuildScenes.Enabled = (canEditScene && !isPlayMode) || Editor.StateMachine.BuildingScenesState.IsActive; + _toolStripCook.Enabled = Editor.Windows.GameCookerWin.CanBuild(Platform.PlatformType) && !GameCooker.IsRunning; // var play = _toolStripPlay; var pause = _toolStripPause; @@ -351,6 +360,7 @@ namespace FlaxEditor.Modules // Update window background mainWindow.BackgroundColor = Style.Current.Background; + InitSharedMenus(); InitMainMenu(mainWindow); InitToolstrip(mainWindow); InitStatusBar(mainWindow); @@ -409,6 +419,7 @@ namespace FlaxEditor.Modules Editor.Undo.UndoDone += OnUndoEvent; Editor.Undo.RedoDone += OnUndoEvent; Editor.Undo.ActionDone += OnUndoEvent; + GameCooker.Event += OnGameCookerEvent; UpdateToolstrip(); } @@ -424,6 +435,11 @@ namespace FlaxEditor.Modules UpdateStatusBar(); } + private void OnGameCookerEvent(GameCooker.EventType type) + { + UpdateToolstrip(); + } + /// public override void OnExit() { @@ -466,6 +482,22 @@ namespace FlaxEditor.Modules return dialog; } + private void InitSharedMenus() + { + for (int i = 1; i <= 4; i++) + _numberOfClientsGroup.AddItem(i.ToString(), i); + + _numberOfClientsGroup.Selected = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; + _numberOfClientsGroup.SelectedChanged = value => + { + var options = Editor.Options.Options; + options.Interface.NumberOfGameClientsToLaunch = value; + Editor.Options.Apply(options); + }; + + Editor.Options.OptionsChanged += options => { _numberOfClientsGroup.Selected = options.Interface.NumberOfGameClientsToLaunch; }; + } + private void InitMainMenu(RootControl mainWindow) { MainMenu = new MainMenu(mainWindow) @@ -523,11 +555,19 @@ namespace FlaxEditor.Modules MenuGame = MainMenu.AddButton("Game"); cm = MenuGame.ContextMenu; cm.VisibleChanged += OnMenuGameShowHide; - _menuGamePlay = cm.AddButton("Play", inputOptions.Play.ToString(), Editor.Simulation.RequestStartPlay); + + _menuGamePlayGame = cm.AddButton("Play Game", PlayGame); + _menuGamePlayCurrentScenes = cm.AddButton("Play Current Scenes", inputOptions.Play.ToString(), PlayScenes); + _menuGameStop = cm.AddButton("Stop Game", Editor.Simulation.RequestStopPlay); _menuGamePause = cm.AddButton("Pause", inputOptions.Pause.ToString(), Editor.Simulation.RequestPausePlay); + cm.AddSeparator(); - cm.AddButton("Cook & Run", Editor.Windows.GameCookerWin.BuildAndRun).LinkTooltip("Runs Game Cooker to build the game for this platform and runs the game after."); - cm.AddButton("Run cooked game", Editor.Windows.GameCookerWin.RunCooked).LinkTooltip("Runs the game build from the last cooking output. Use Cook&Play or Game Cooker first."); + var numberOfClientsMenu = cm.AddChildMenu("Number of game clients"); + _numberOfClientsGroup.AddItemsToContextMenu(numberOfClientsMenu.ContextMenu); + + cm.AddSeparator(); + cm.AddButton("Cook & Run", CookAndRun).LinkTooltip("Runs Game Cooker to build the game for this platform and runs the game after."); + cm.AddButton("Run cooked game", RunCookedGame).LinkTooltip("Runs the game build from the last cooking output. Use Cook&Play or Game Cooker first."); // Tools MenuTools = MainMenu.AddButton("Tools"); @@ -603,7 +643,7 @@ namespace FlaxEditor.Modules _menuEditDuplicate.ShortKeys = inputOptions.Duplicate.ToString(); _menuEditSelectAll.ShortKeys = inputOptions.SelectAll.ToString(); _menuEditFind.ShortKeys = inputOptions.Search.ToString(); - _menuGamePlay.ShortKeys = inputOptions.Play.ToString(); + _menuGamePlayCurrentScenes.ShortKeys = inputOptions.Play.ToString(); _menuGamePause.ShortKeys = inputOptions.Pause.ToString(); MainMenuShortcutKeysUpdated?.Invoke(); @@ -611,6 +651,8 @@ namespace FlaxEditor.Modules private void InitToolstrip(RootControl mainWindow) { + var inputOptions = Editor.Options.Options.Input; + ToolStrip = new ToolStrip(34.0f, MainMenu.Bottom) { Parent = mainWindow, @@ -625,10 +667,33 @@ namespace FlaxEditor.Modules _toolStripRotate = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Rotate32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)"); _toolStripScale = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Scale32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)"); ToolStrip.AddSeparator(); + + // Cook scenes _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build64, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)"); + + // Cook and run + _toolStripCook = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.ShipIt64, CookAndRun).LinkTooltip("Cook & Run - build game for the current platform and run it locally"); + _toolStripCook.ContextMenu = new ContextMenu(); + _toolStripCook.ContextMenu.AddButton("Run cooked game", RunCookedGame); + _toolStripCook.ContextMenu.AddSeparator(); + var numberOfClientsMenu = _toolStripCook.ContextMenu.AddChildMenu("Number of game clients"); + _numberOfClientsGroup.AddItemsToContextMenu(numberOfClientsMenu.ContextMenu); + ToolStrip.AddSeparator(); - _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, Editor.Simulation.RequestPlayOrStopPlay).LinkTooltip("Start/Stop game (F5)"); - _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip("Pause/Resume game(F6)"); + + // Play + _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, OnPlayPressed).LinkTooltip("Play Game"); + _toolStripPlay.ContextMenu = new ContextMenu(); + var playSubMenu = _toolStripPlay.ContextMenu.AddChildMenu("Play button action"); + var playActionGroup = new ContextMenuSingleSelectGroup(); + playActionGroup.AddItem("Play Game", InterfaceOptions.PlayAction.PlayGame, null, "Launches the game from the First Scene defined in the project settings."); + playActionGroup.AddItem("Play Scenes", InterfaceOptions.PlayAction.PlayScenes, null, "Launches the game using the scenes currently loaded in the editor."); + playActionGroup.AddItemsToContextMenu(playSubMenu.ContextMenu); + playActionGroup.Selected = Editor.Options.Options.Interface.PlayButtonAction; + playActionGroup.SelectedChanged = SetPlayAction; + Editor.Options.OptionsChanged += options => { playActionGroup.Selected = options.Interface.PlayButtonAction; }; + + _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip($"Pause/Resume game({inputOptions.Pause})"); _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Skip64, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game"); UpdateToolstrip(); @@ -663,10 +728,7 @@ namespace FlaxEditor.Modules var defaultTextColor = StatusBar.TextColor; _outputLogButton.HoverBegin += () => StatusBar.TextColor = Style.Current.BackgroundSelected; _outputLogButton.HoverEnd += () => StatusBar.TextColor = defaultTextColor; - _outputLogButton.Clicked += () => - { - Editor.Windows.OutputLogWin.FocusOrShow(); - }; + _outputLogButton.Clicked += () => { Editor.Windows.OutputLogWin.FocusOrShow(); }; // Progress bar with label const float progressBarWidth = 120.0f; @@ -786,7 +848,9 @@ namespace FlaxEditor.Modules var isPlayMode = Editor.StateMachine.IsPlayMode; var canPlay = Level.IsAnySceneLoaded; - _menuGamePlay.Enabled = !isPlayMode && canPlay; + _menuGamePlayGame.Enabled = !isPlayMode && canPlay; + _menuGamePlayCurrentScenes.Enabled = !isPlayMode && canPlay; + _menuGameStop.Enabled = isPlayMode && canPlay; _menuGamePause.Enabled = isPlayMode && canPlay; c.PerformLayout(); @@ -968,6 +1032,72 @@ namespace FlaxEditor.Modules projectInfo.Save(); } + private void SetPlayAction(InterfaceOptions.PlayAction newPlayAction) + { + var options = Editor.Options.Options; + options.Interface.PlayButtonAction = newPlayAction; + Editor.Options.Apply(options); + } + + private void OnPlayPressed() + { + switch (Editor.Options.Options.Interface.PlayButtonAction) + { + case InterfaceOptions.PlayAction.PlayGame: + if (Editor.IsPlayMode) + Editor.Simulation.RequestStopPlay(); + else + PlayGame(); + return; + case InterfaceOptions.PlayAction.PlayScenes: + PlayScenes(); + return; + } + } + + private void PlayGame() + { + var firstScene = GameSettings.Load().FirstScene; + if (firstScene == Guid.Empty) + { + if (Level.IsAnySceneLoaded) + Editor.Simulation.RequestStartPlay(); + return; + } + + _scenesToReload = Level.Scenes; + Level.UnloadAllScenes(); + Level.LoadScene(firstScene); + + Editor.PlayModeEnd += OnPlayGameSceneEnding; + Editor.Simulation.RequestPlayOrStopPlay(); + } + + private void OnPlayGameSceneEnding() + { + Editor.PlayModeEnd -= OnPlayGameSceneEnding; + + Level.UnloadAllScenes(); + + foreach (var scene in _scenesToReload) + Level.LoadScene(scene.ID); + } + + private void PlayScenes() + { + Editor.Simulation.RequestPlayOrStopPlay(); + } + + private void CookAndRun() + { + Editor.Windows.GameCookerWin.BuildAndRun(); + } + + private void RunCookedGame() + { + Editor.Windows.GameCookerWin.RunCooked(); + } + private void OnMainWindowClosing() { // Clear UI references (GUI cannot be used after window closing) diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs index acfb7f5e8..5fd8c31c7 100644 --- a/Source/Editor/Options/InterfaceOptions.cs +++ b/Source/Editor/Options/InterfaceOptions.cs @@ -74,6 +74,22 @@ namespace FlaxEditor.Options DockBottom = DockState.DockBottom } + /// + /// Options for the action taken by the play button. + /// + public enum PlayAction + { + /// + /// Launches the game from the First Scene defined in the project settings. + /// + PlayGame, + + /// + /// Launches the game using the scenes currently loaded in the editor. + /// + PlayScenes, + } + /// /// Gets or sets the Editor User Interface scale. Applied to all UI elements, windows and text. Can be used to scale the interface up on a bigger display. Editor restart required. /// @@ -82,14 +98,12 @@ namespace FlaxEditor.Options public float InterfaceScale { get; set; } = 1.0f; #if PLATFORM_WINDOWS - /// /// Gets or sets a value indicating whether use native window title bar. Editor restart required. /// [DefaultValue(false)] [EditorDisplay("Interface"), EditorOrder(70), Tooltip("Determines whether use native window title bar. Editor restart required.")] public bool UseNativeWindowSystem { get; set; } = false; - #endif /// @@ -196,30 +210,44 @@ namespace FlaxEditor.Options [EditorDisplay("Play In-Editor", "Focus Game Window On Play"), EditorOrder(400), Tooltip("Determines whether auto-focus game window on play mode start.")] public bool FocusGameWinOnPlay { get; set; } = true; + /// + /// Gets or sets a value indicating what action should be taken upon pressing the play button. + /// + [DefaultValue(PlayAction.PlayScenes)] + [EditorDisplay("Play In-Editor", "Play Button Action"), EditorOrder(410)] + public PlayAction PlayButtonAction { get; set; } = PlayAction.PlayScenes; + + /// + /// Gets or sets a value indicating the number of game clients to launch when building and/or running cooked game. + /// + [DefaultValue(1), Range(1, 4)] + [EditorDisplay("Cook & Run"), EditorOrder(500)] + public int NumberOfGameClientsToLaunch = 1; + private static FontAsset DefaultFont => FlaxEngine.Content.LoadAsyncInternal(EditorAssets.PrimaryFont); /// /// Gets or sets the title font for editor UI. /// - [EditorDisplay("Fonts"), EditorOrder(500), Tooltip("The title font for editor UI.")] + [EditorDisplay("Fonts"), EditorOrder(600), Tooltip("The title font for editor UI.")] public FontReference TitleFont { get; set; } = new FontReference(DefaultFont, 18); /// /// Gets or sets the large font for editor UI. /// - [EditorDisplay("Fonts"), EditorOrder(510), Tooltip("The large font for editor UI.")] + [EditorDisplay("Fonts"), EditorOrder(610), Tooltip("The large font for editor UI.")] public FontReference LargeFont { get; set; } = new FontReference(DefaultFont, 14); /// /// Gets or sets the medium font for editor UI. /// - [EditorDisplay("Fonts"), EditorOrder(520), Tooltip("The medium font for editor UI.")] + [EditorDisplay("Fonts"), EditorOrder(620), Tooltip("The medium font for editor UI.")] public FontReference MediumFont { get; set; } = new FontReference(DefaultFont, 9); /// /// Gets or sets the small font for editor UI. /// - [EditorDisplay("Fonts"), EditorOrder(530), Tooltip("The small font for editor UI.")] + [EditorDisplay("Fonts"), EditorOrder(630), Tooltip("The small font for editor UI.")] public FontReference SmallFont { get; set; } = new FontReference(DefaultFont, 9); } } diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs index f3fd753d1..5ece067a0 100644 --- a/Source/Editor/Windows/GameCookerWindow.cs +++ b/Source/Editor/Windows/GameCookerWindow.cs @@ -238,6 +238,7 @@ namespace FlaxEditor.Windows { [EditorDisplay(null, "arm64")] ARM64, + [EditorDisplay(null, "x64")] x64, } @@ -614,6 +615,18 @@ namespace FlaxEditor.Windows _exitOnBuildEnd = true; } + /// + /// Returns true if can build for the given platform (both supported and available). + /// + /// The platform. + /// True if can build, otherwise false. + public bool CanBuild(PlatformType platformType) + { + if (_buildTabProxy.PerPlatformOptions.TryGetValue(platformType, out var platform)) + return platform.IsAvailable && platform.IsSupported; + return false; + } + /// /// Builds all the targets from the given preset. /// @@ -659,16 +672,24 @@ namespace FlaxEditor.Windows { Editor.Log("Building and running"); GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration); - _buildingQueue.Enqueue(new QueueItem + var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; + for (int i = 0; i < numberOfClients; i++) { - Target = new BuildTarget + var buildOptions = BuildOptions.AutoRun; + if (i > 0) + buildOptions |= BuildOptions.NoCook; + + _buildingQueue.Enqueue(new QueueItem { - Output = _buildTabProxy.PerPlatformOptions[platform].Output, - Platform = buildPlatform, - Mode = buildConfiguration, - }, - Options = BuildOptions.AutoRun, - }); + Target = new BuildTarget + { + Output = _buildTabProxy.PerPlatformOptions[platform].Output, + Platform = buildPlatform, + Mode = buildConfiguration, + }, + Options = buildOptions, + }); + } } /// @@ -678,16 +699,20 @@ namespace FlaxEditor.Windows { Editor.Log("Running cooked build"); GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration); - _buildingQueue.Enqueue(new QueueItem + var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch; + for (int i = 0; i < numberOfClients; i++) { - Target = new BuildTarget + _buildingQueue.Enqueue(new QueueItem { - Output = _buildTabProxy.PerPlatformOptions[platform].Output, - Platform = buildPlatform, - Mode = buildConfiguration, - }, - Options = BuildOptions.AutoRun | BuildOptions.NoCook, - }); + Target = new BuildTarget + { + Output = _buildTabProxy.PerPlatformOptions[platform].Output, + Platform = buildPlatform, + Mode = buildConfiguration, + }, + Options = BuildOptions.AutoRun | BuildOptions.NoCook, + }); + } } private void BuildTarget()