Merge ColorPreviewManagerWidget into ColorPickerManager.

OpenRA.Mods.Common/Traits/World/ColorPickerManager.cs

@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Graphics;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
@@ -27,6 +28,22 @@ namespace OpenRA.Mods.Common.Traits
 		public readonly float[] HsvValueRange = new[] { 0.2f, 1.0f };
 		public readonly Color[] TeamColorPresets = { };
 
+		[PaletteReference]
+		public readonly string PaletteName = "colorpicker";
+
+		public readonly int[] RemapIndices = { };
+		public readonly float Ramp = 0.05f;
+		public Color Color { get; private set; }
+
+		public void Update(WorldRenderer worldRenderer, Color color)
+		{
+			Color = color;
+
+			var newPalette = new MutablePalette(worldRenderer.Palette(PaletteName).Palette);
+			newPalette.ApplyRemap(new PlayerColorRemap(RemapIndices, Color, Ramp));
+			worldRenderer.ReplacePalette(PaletteName, newPalette);
+		}
+
 		double GetColorDelta(Color colorA, Color colorB)
 		{
 			var rmean = (colorA.R + colorB.R) / 2.0;

OpenRA.Mods.Common/Widgets/ColorPreviewManagerWidget.cs

@@ -1,52 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2020 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version. For more
- * information, see COPYING.
- */
-#endregion
-
-using OpenRA.Graphics;
-using OpenRA.Primitives;
-using OpenRA.Widgets;
-
-namespace OpenRA.Mods.Common.Widgets
-{
-	public class ColorPreviewManagerWidget : Widget
-	{
-		public readonly string PaletteName = "colorpicker";
-		public readonly int[] RemapIndices = ChromeMetrics.Get<int[]>("ColorPickerRemapIndices");
-		public readonly float Ramp = 0.05f;
-		public Color Color;
-
-		Color cachedColor;
-		WorldRenderer worldRenderer;
-		IPalette preview;
-
-		[ObjectCreator.UseCtor]
-		public ColorPreviewManagerWidget(WorldRenderer worldRenderer)
-		{
-			this.worldRenderer = worldRenderer;
-		}
-
-		public override void Initialize(WidgetArgs args)
-		{
-			base.Initialize(args);
-			preview = worldRenderer.Palette(PaletteName).Palette;
-		}
-
-		public override void Tick()
-		{
-			if (cachedColor == Color)
-				return;
-			cachedColor = Color;
-
-			var newPalette = new MutablePalette(preview);
-			newPalette.ApplyRemap(new PlayerColorRemap(RemapIndices, Color, Ramp));
-			worldRenderer.ReplacePalette(PaletteName, newPalette);
-		}
-	}
-}

OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs

@@ -52,9 +52,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		WRot modelOrientation;
 
 		[ObjectCreator.UseCtor]
-		public AssetBrowserLogic(Widget widget, Action onExit, ModData modData, World world, Dictionary<string, MiniYaml> logicArgs)
+		public AssetBrowserLogic(Widget widget, Action onExit, ModData modData, WorldRenderer worldRenderer)
 		{
-			this.world = world;
+			world = worldRenderer.World;
 			this.modData = modData;
 			panel = widget;
 
@@ -111,16 +111,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				paletteDropDown.GetText = () => currentPalette;
 			}
 
-			var colorPreview = panel.GetOrNull<ColorPreviewManagerWidget>("COLOR_MANAGER");
+			var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<ColorPickerManagerInfo>();
-			if (colorPreview != null)
+			colorManager.Update(worldRenderer, Game.Settings.Player.Color);
-				colorPreview.Color = Game.Settings.Player.Color;
 
 			var colorDropdown = panel.GetOrNull<DropDownButtonWidget>("COLOR");
 			if (colorDropdown != null)
 			{
-				colorDropdown.IsDisabled = () => currentPalette != colorPreview.PaletteName;
+				colorDropdown.IsDisabled = () => currentPalette != colorManager.PaletteName;
-				colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, world);
+				colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorManager, worldRenderer);
-				panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => Game.Settings.Player.Color;
+				panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => colorManager.Color;
 			}
 
 			filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");

OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs

@@ -12,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Widgets;
@@ -190,22 +191,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			return h;
 		}
 
-		public static void ShowColorDropDown(DropDownButtonWidget color, ColorPreviewManagerWidget preview, World world)
+		public static void ShowColorDropDown(DropDownButtonWidget color, ColorPickerManagerInfo colorManager, WorldRenderer worldRenderer, Action onExit = null)
 		{
-			Action onExit = () =>
-			{
-				Game.Settings.Player.Color = preview.Color;
-				Game.Settings.Save();
-			};
-
 			color.RemovePanel();
 
-			Action<Color> onChange = c => preview.Color = c;
+			Action<Color> onChange = c => colorManager.Update(worldRenderer, c);
 
-			var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs()
+			var colorChooser = Game.LoadWidget(worldRenderer.World, "COLOR_CHOOSER", null, new WidgetArgs()
 			{
 				{ "onChange", onChange },
-				{ "initialColor", Game.Settings.Player.Color },
+				{ "initialColor", colorManager.Color },
 				{ "initialFaction", null }
 			});
 

OpenRA.Mods.Common/Widgets/Logic/IntroductionPromptLogic.cs

@@ -11,6 +11,7 @@
 
 using System;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Common.Widgets.Logic
@@ -63,8 +64,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				return true;
 			};
 
-			var colorPreview = widget.Get<ColorPreviewManagerWidget>("COLOR_MANAGER");
+			var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<ColorPickerManagerInfo>();
-			colorPreview.Color = ps.Color;
+			colorManager.Update(worldRenderer, ps.Color);
 
 			var mouseControlDescClassic = widget.Get("MOUSE_CONTROL_DESC_CLASSIC");
 			mouseControlDescClassic.IsVisible = () => gs.UseClassicMouseStyle;
@@ -103,7 +104,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			var colorDropdown = widget.Get<DropDownButtonWidget>("PLAYERCOLOR");
 			colorDropdown.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap;
-			colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, worldRenderer.World);
+			colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorManager, worldRenderer);
 			colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => ps.Color;
 
 			var viewportSizes = modData.Manifest.Get<WorldViewportSizes>();

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Primitives;
 using OpenRA.Traits;
@@ -32,7 +33,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		readonly WorldRenderer worldRenderer;
 		readonly bool skirmishMode;
 		readonly Ruleset modRules;
-		readonly World shellmapWorld;
 		readonly WebServices services;
 
 		enum PanelType { Players, Options, Music, Servers, Kick, ForceStart }
@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 		readonly Dictionary<string, LobbyFaction> factions = new Dictionary<string, LobbyFaction>();
 
-		readonly ColorPreviewManagerWidget colorPreview;
+		readonly ColorPickerManagerInfo colorManager;
 
 		readonly TabCompletionLogic tabCompletion = new TabCompletionLogic();
 
@@ -116,7 +116,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 			// TODO: This needs to be reworked to support per-map tech levels, bots, etc.
 			modRules = modData.DefaultRules;
-			shellmapWorld = worldRenderer.World;
 
 			services = modData.Manifest.Get<WebServices>();
 
@@ -159,8 +158,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			editableSpectatorTemplate = players.Get("TEMPLATE_EDITABLE_SPECTATOR");
 			nonEditableSpectatorTemplate = players.Get("TEMPLATE_NONEDITABLE_SPECTATOR");
 			newSpectatorTemplate = players.Get("TEMPLATE_NEW_SPECTATOR");
-			colorPreview = lobby.Get<ColorPreviewManagerWidget>("COLOR_MANAGER");
+			colorManager = modRules.Actors[SystemActors.World].TraitInfo<ColorPickerManagerInfo>();
-			colorPreview.Color = Game.Settings.Player.Color;
+			colorManager.Update(worldRenderer, Game.Settings.Player.Color);
 
 			foreach (var f in modRules.Actors[SystemActors.World].TraitInfos<FactionInfo>())
 				factions.Add(f.InternalName, new LobbyFaction { Selectable = f.Selectable, Name = f.Name, Side = f.Side, Description = f.Description });
@@ -601,7 +600,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					else
 						LobbyUtils.SetupEditableNameWidget(template, slot, client, orderManager, worldRenderer);
 
-					LobbyUtils.SetupEditableColorWidget(template, slot, client, orderManager, shellmapWorld, colorPreview);
+					LobbyUtils.SetupEditableColorWidget(template, slot, client, orderManager, worldRenderer, colorManager);
 					LobbyUtils.SetupEditableFactionWidget(template, slot, client, orderManager, factions);
 					LobbyUtils.SetupEditableTeamWidget(template, slot, client, orderManager, map);
 					LobbyUtils.SetupEditableHandicapWidget(template, slot, client, orderManager, map);

OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs

@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Primitives;
 using OpenRA.Traits;
@@ -220,23 +221,23 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		}
 
 		public static void ShowColorDropDown(DropDownButtonWidget color, Session.Client client,
-			OrderManager orderManager, World world, ColorPreviewManagerWidget preview)
+			OrderManager orderManager, WorldRenderer worldRenderer, ColorPickerManagerInfo colorManager)
 		{
 			Action onExit = () =>
 			{
-				if (client.Bot == null)
+				if (client == orderManager.LocalClient)
 				{
-					Game.Settings.Player.Color = preview.Color;
+					Game.Settings.Player.Color = colorManager.Color;
 					Game.Settings.Save();
 				}
 
 				color.RemovePanel();
-				orderManager.IssueOrder(Order.Command($"color {client.Index} {preview.Color}"));
+				orderManager.IssueOrder(Order.Command($"color {client.Index} {colorManager.Color}"));
 			};
 
-			Action<Color> onChange = c => preview.Color = c;
+			Action<Color> onChange = c => colorManager.Update(worldRenderer, c);
 
-			var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs()
+			var colorChooser = Game.LoadWidget(worldRenderer.World, "COLOR_CHOOSER", null, new WidgetArgs()
 			{
 				{ "onChange", onChange },
 				{ "initialColor", client.Color },
@@ -523,11 +524,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			};
 		}
 
-		public static void SetupEditableColorWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, World world, ColorPreviewManagerWidget colorPreview)
+		public static void SetupEditableColorWidget(Widget parent, Session.Slot s, Session.Client c, OrderManager orderManager, WorldRenderer worldRenderer, ColorPickerManagerInfo colorManager)
 		{
 			var color = parent.Get<DropDownButtonWidget>("COLOR");
 			color.IsDisabled = () => (s != null && s.LockColor) || orderManager.LocalClient.IsReady;
-			color.OnMouseDown = _ => ShowColorDropDown(color, c, orderManager, world, colorPreview);
+			color.OnMouseDown = _ => ShowColorDropDown(color, c, orderManager, worldRenderer, colorManager);
 
 			SetupColorWidget(color, s, c);
 		}

OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs

@@ -13,6 +13,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Widgets;
@@ -179,12 +180,16 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				return true;
 			};
 
-			var colorPreview = panel.Get<ColorPreviewManagerWidget>("COLOR_MANAGER");
+			var colorManager = modData.DefaultRules.Actors[SystemActors.World].TraitInfo<ColorPickerManagerInfo>();
-			colorPreview.Color = ps.Color;
+			colorManager.Update(worldRenderer, ps.Color);
 
 			var colorDropdown = panel.Get<DropDownButtonWidget>("PLAYERCOLOR");
 			colorDropdown.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap;
-			colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, worldRenderer.World);
+			colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorManager, worldRenderer, () =>
+			{
+				Game.Settings.Player.Color = colorManager.Color;
+				Game.Settings.Save();
+			});
 			colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => ps.Color;
 
 			return () =>

mods/cnc/chrome/assetbrowser.yaml

@@ -6,7 +6,6 @@ Container@ASSETBROWSER_PANEL:
 	Height: 435
 	Children:
 		LogicTicker@ANIMATION_TICKER:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@ASSETBROWSER_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 22

mods/cnc/chrome/lobby.yaml

@@ -5,7 +5,6 @@ Container@SERVER_LOBBY:
 	Width: 900
 	Height: 575
 	Children:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
 			Width: PARENT_RIGHT
 			Y: 0 - 22

mods/cnc/chrome/mainmenu-prompts.yaml

@@ -58,7 +58,6 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 					Height: 25
 					Text: Preferred Color:
 					Align: Right
-				ColorPreviewManager@COLOR_MANAGER:
 				DropDownButton@PLAYERCOLOR:
 					X: 415 + 60
 					Y: 90

mods/cnc/chrome/settings-display.yaml

@@ -30,7 +30,6 @@ Container@DISPLAY_PANEL:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415
 			Y: 40

mods/cnc/metrics.yaml

@@ -5,5 +5,4 @@ Metrics:
 	ButtonFont: Bold
 	CheckboxPressedState: true
 	ColorPickerActorType: fact.colorpicker
-	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 	TextfieldColorHighlight: 800000

mods/cnc/rules/world.yaml

@@ -255,6 +255,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 502048, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d
 
 EditorWorld:

mods/common/chrome/assetbrowser.yaml

@@ -6,7 +6,6 @@ Background@ASSETBROWSER_PANEL:
 	Height: 500
 	Children:
 		LogicTicker@ANIMATION_TICKER:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@ASSETBROWSER_TITLE:
 			Y: 21
 			Width: PARENT_RIGHT

mods/common/chrome/lobby.yaml

@@ -5,7 +5,6 @@ Background@SERVER_LOBBY:
 	Width: 900
 	Height: 600
 	Children:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
 			Y: 16
 			Align: Center

mods/common/chrome/mainmenu-prompts.yaml

@@ -53,7 +53,6 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415 + 60
 			Y: 130

mods/common/chrome/settings-display.yaml

@@ -24,7 +24,6 @@ Container@DISPLAY_PANEL:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415
 			Y: 40

mods/d2k/metrics.yaml

@@ -1,7 +1,6 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
 	ColorPickerActorType: carryall.colorpicker
-	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 	FactionSuffix-fremen: atreides
 	FactionSuffix-corrino: harkonnen
 	FactionSuffix-smuggler: ordos

mods/d2k/rules/world.yaml

@@ -236,6 +236,7 @@ World:
 	StartGameNotification:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 		TeamColorPresets: 9023cd, f53333, ffae00, fff830, 87f506, f872ad, da06f3, ddb8ff, def7b2, 39c46f, 200738, 280df6, 2f86f2, 76d2f8, 498221, 392929
 
 EditorWorld:

mods/modcontent/metrics.yaml

@@ -4,7 +4,6 @@ Metrics:
 	ButtonDepth: 0
 	ButtonFont: Bold
 	CheckboxPressedState: true
-	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 	ChatLineSound: ChatLine
 	ClickDisabledSound: ClickDisabledSound
 	ClickSound: ClickSound

mods/ra/metrics.yaml

@@ -2,7 +2,6 @@
 
 Metrics:
 	ColorPickerActorType: fact.colorpicker
-	ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 	FactionSuffix-allies: allies
 	FactionSuffix-england: allies
 	FactionSuffix-france: allies

mods/ra/rules/world.yaml

@@ -281,6 +281,7 @@ World:
 			2: WarningTwoMinutesRemaining
 			1: WarningOneMinuteRemaining
 	ColorPickerManager:
+		RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 		TeamColorPresets: f7b3b3, f50606, 98331f, f57606, f7bb06, f861a4, da06f3, ddb8ff, 06f739, cef7b2, 200738, 280df6, 2f86f2, 76d2f8, 34ba93, 391d1d
 
 EditorWorld:

mods/ts/metrics.yaml

@@ -1,5 +1,4 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
 	ColorPickerActorType: mmch.colorpicker
-	ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 	TextfieldColorHighlight: 1a1a1a

mods/ts/rules/world.yaml

@@ -381,6 +381,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 4A1948, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d
 
 EditorWorld: