epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Promote map generators to stand-alone editor tools.

Browse Source
This commit is contained in:
Paul Chote
2025-04-14 13:48:05 +01:00
committed by Gustas Kažukauskas
parent 78f660124c
commit b2acc653a0
15 changed files with 498 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Widgets/Logic/Editor/MapEditorTabsLogic.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets.Logic
@@ -17,6 +18,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
enum MenuType { Select, Tiles, Layers, Actors, Tools, History }
readonly World world;
readonly Widget panelContainer;
readonly Widget tabContainer;
readonly EditorViewportControllerWidget editor;
@@ -25,8 +27,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
MenuType lastSelectedTab = MenuType.Tiles;
[ObjectCreator.UseCtor]
public MapEditorTabsLogic(Widget widget)
public MapEditorTabsLogic(Widget widget, World world)
{
this.world = world;
panelContainer = widget.Parent;
tabContainer = widget.Get("MAP_EDITOR_TAB_CONTAINER");
@@ -67,6 +70,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (tabType == MenuType.Select)
tab.IsDisabled = () => !editor.DefaultBrush.Selection.HasSelection;
if (tabType == MenuType.Tools)
{
var toolsAvailable = world.Map.Rules.Actors[SystemActors.EditorWorld].HasTraitInfo<IEditorToolInfo>();
tab.IsDisabled = () => !toolsAvailable;
}
var container = panelContainer.Get<ContainerWidget>(tabId);
container.IsVisible = () => menuType == tabType;
}

64
OpenRA.Mods.Common/Widgets/Logic/Editor/MapGeneratorToolLogic.cs
View File

@@ -35,10 +35,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly World world;
readonly WorldRenderer worldRenderer;
readonly ModData modData;
// nullable
IMapGeneratorInfo selectedGenerator;
IMapGeneratorSettings selectedSettings;
readonly IMapGeneratorInfo generator;
readonly IMapGeneratorSettings settings;
readonly ScrollPanelWidget settingsPanel;
readonly Widget checkboxSettingTemplate;
@@ -46,13 +44,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly Widget dropDownSettingTemplate;
[ObjectCreator.UseCtor]
public MapGeneratorToolLogic(Widget widget, World world, WorldRenderer worldRenderer, ModData modData)
public MapGeneratorToolLogic(Widget widget, World world, WorldRenderer worldRenderer, ModData modData,
IMapGeneratorInfo tool)
{
editorActionManager = world.WorldActor.Trait<EditorActionManager>();
this.world = world;
this.worldRenderer = worldRenderer;
this.modData = modData;
generator = tool;
settings = generator.GetSettings();
settingsPanel = widget.Get<ScrollPanelWidget>("SETTINGS_PANEL");
checkboxSettingTemplate = settingsPanel.Get<Widget>("CHECKBOX_TEMPLATE");
@@ -65,40 +66,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var generateRandomButtonWidget = widget.Get<ButtonWidget>("GENERATE_RANDOM_BUTTON");
generateRandomButtonWidget.OnClick = () =>
{
selectedSettings?.Randomize(world.LocalRandom);
settings?.Randomize(world.LocalRandom);
UpdateSettingsUi();
GenerateMap();
};
var generatorDropDown = widget.Get<DropDownButtonWidget>("GENERATOR");
var mapGenerators = world.Map.Rules.Actors[SystemActors.EditorWorld].TraitInfos<IMapGeneratorInfo>();
if (mapGenerators.Count > 0)
{
var label = new CachedTransform<IMapGeneratorInfo, string>(g => FluentProvider.GetMessage(g.Name));
generatorDropDown.GetText = () => label.Update(selectedGenerator);
generatorDropDown.OnMouseDown = _ =>
{
ScrollItemWidget SetupItem(IMapGeneratorInfo g, ScrollItemWidget template)
{
bool IsSelected() => g.Type == selectedGenerator.Type;
void OnClick() => ChangeGenerator(g);
var item = ScrollItemWidget.Setup(template, IsSelected, OnClick);
var label = FluentProvider.GetMessage(g.Name);
item.Get<LabelWidget>("LABEL").GetText = () => label;
return item;
}
generatorDropDown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", mapGenerators.Count * 30, mapGenerators, SetupItem);
};
}
else
{
generateButtonWidget.IsDisabled = () => true;
generateRandomButtonWidget.IsDisabled = () => true;
generatorDropDown.IsDisabled = () => true;
}
ChangeGenerator(mapGenerators.FirstOrDefault());
UpdateSettingsUi();
}
sealed class RandomMapEditorAction : IEditorAction
@@ -130,23 +103,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
}
// newGenerator may be null.
void ChangeGenerator(IMapGeneratorInfo newGenerator)
{
selectedGenerator = newGenerator;
selectedSettings = newGenerator?.GetSettings();
UpdateSettingsUi();
}
void UpdateSettingsUi()
{
settingsPanel.RemoveChildren();
settingsPanel.ContentHeight = 0;
if (selectedGenerator == null)
if (generator == null)
return;
foreach (var o in selectedSettings.Options)
foreach (var o in settings.Options)
{
Widget settingWidget = null;
switch (o)
@@ -296,12 +260,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var bounds = map.Bounds;
generatedMap.SetBounds(new PPos(bounds.Left, bounds.Top), new PPos(bounds.Right - 1, bounds.Bottom - 1));
var settings = selectedSettings.Compile(terrainInfo);
var settings = this.settings.Compile(terrainInfo);
// Run main generator logic. May throw.
var generateStopwatch = Stopwatch.StartNew();
Log.Write("debug", $"Running '{selectedGenerator.Type}' map generator with settings:\n{MiniYamlExts.WriteToString(settings.Nodes)}\n\n");
selectedGenerator.Generate(generatedMap, settings);
Log.Write("debug", $"Running '{generator.Type}' map generator with settings:\n{MiniYamlExts.WriteToString(settings.Nodes)}\n\n");
generator.Generate(generatedMap, settings);
Log.Write("debug", $"Generator finished, taking {generateStopwatch.ElapsedMilliseconds}ms");
var editorActorLayer = world.WorldActor.Trait<EditorActorLayer>();
@@ -347,7 +311,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
false);
var description = FluentProvider.GetMessage(StrGenerated,
"name", FluentProvider.GetMessage(selectedGenerator.Name));
"name", FluentProvider.GetMessage(generator.Name));
var action = new RandomMapEditorAction(editorBlit, description);
editorActionManager.Add(action);
}

78
OpenRA.Mods.Common/Widgets/Logic/Editor/MapToolsLogic.cs
View File

@@ -10,7 +10,7 @@
#endregion
using System.Collections.Generic;
using OpenRA.Graphics;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
@@ -18,77 +18,53 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
public class MapToolsLogic : ChromeLogic
{
[FluentReference]
const string MarkerTiles = "label-tool-marker-tiles";
[FluentReference]
const string MapGenerator = "label-tool-map-generator";
enum MapTool
{
MarkerTiles,
MapGenerator
}
readonly DropDownButtonWidget toolsDropdown;
readonly Dictionary<MapTool, string> toolNames = new()
{
{ MapTool.MarkerTiles, MarkerTiles },
{ MapTool.MapGenerator, MapGenerator }
};
readonly Dictionary<MapTool, Widget> toolPanels = [];
MapTool selectedTool = MapTool.MarkerTiles;
readonly List<Widget> toolPanels = [];
readonly Dictionary<Widget, string> toolLabels = [];
Widget selectedPanel;
[ObjectCreator.UseCtor]
public MapToolsLogic(Widget widget, World world, ModData modData, WorldRenderer worldRenderer, Dictionary<string, MiniYaml> logicArgs)
public MapToolsLogic(Widget widget, World world)
{
toolsDropdown = widget.Get<DropDownButtonWidget>("TOOLS_DROPDOWN");
var markerToolPanel = widget.Get("MARKER_TOOL_PANEL");
toolPanels.Add(MapTool.MarkerTiles, markerToolPanel);
if (world.Map.Rules.Actors[SystemActors.EditorWorld].HasTraitInfo<IMapGeneratorInfo>())
var toolDropdownWidget = widget.Get<DropDownButtonWidget>("TOOLS_DROPDOWN");
var tools = world.Map.Rules.Actors[SystemActors.EditorWorld].TraitInfos<IEditorToolInfo>();
foreach (var tool in tools)
{
var mapGeneratorToolPanel = widget.GetOrNull("MAP_GENERATOR_TOOL_PANEL");
if (mapGeneratorToolPanel != null)
toolPanels.Add(MapTool.MapGenerator, mapGeneratorToolPanel);
var panel = Game.LoadWidget(world, tool.PanelWidget, widget, new WidgetArgs() { { "tool", tool } });
toolPanels.Add(panel);
toolLabels.Add(panel, FluentProvider.GetMessage(tool.Label));
}
toolsDropdown.OnMouseDown = _ => ShowToolsDropDown(toolsDropdown);
toolsDropdown.GetText = () => FluentProvider.GetMessage(toolNames[selectedTool]);
if (toolPanels.Count <= 1)
toolsDropdown.Disabled = true;
SelectTool(toolPanels.FirstOrDefault());
toolDropdownWidget.OnMouseDown = _ => ShowToolsDropDown(toolDropdownWidget);
toolDropdownWidget.GetText = () => toolLabels[selectedPanel];
if (toolPanels.Count == 1)
toolDropdownWidget.Disabled = true;
}
void ShowToolsDropDown(DropDownButtonWidget dropdown)
{
ScrollItemWidget SetupItem(MapTool tool, ScrollItemWidget itemTemplate)
ScrollItemWidget SetupItem(Widget panel, ScrollItemWidget itemTemplate)
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => selectedTool == tool,
() => SelectTool(tool));
() => selectedPanel == panel,
() => SelectTool(panel));
item.Get<LabelWidget>("LABEL").GetText = () => FluentProvider.GetMessage(toolNames[tool]);
item.Get<LabelWidget>("LABEL").GetText = () => toolLabels[panel];
return item;
}
var options = new[] { MapTool.MarkerTiles, MapTool.MapGenerator };
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, options, SetupItem);
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 150, toolPanels, SetupItem);
}
void SelectTool(MapTool tool)
void SelectTool(Widget panel)
{
if (tool != selectedTool)
{
var currentToolPanel = toolPanels[selectedTool];
currentToolPanel.Visible = false;
}
if (panel != selectedPanel && selectedPanel != null)
selectedPanel.Visible = false;
selectedTool = tool;
var toolPanel = toolPanels[selectedTool];
toolPanel.Visible = true;
selectedPanel = panel;
if (panel != null)
selectedPanel.Visible = true;
}
}
}