From 6e3a3661e095c29985a11e0ef9545d98e7760854 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 19 Dec 2020 22:31:15 +0000 Subject: [PATCH] Replace highlight palette with tint effects. --- OpenRA.Game/Traits/Player/FrozenActorLayer.cs | 9 ++-- .../Traits/Player/PlayerHighlightPalette.cs | 47 ------------------- OpenRA.Mods.Common/Effects/FlashTarget.cs | 10 ++-- .../Traits/World/EditorActorPreview.cs | 10 ++-- .../20201213/RemovePlayerHighlightPalette.cs | 34 ++++++++++++++ OpenRA.Mods.Common/UpdateRules/UpdatePath.cs | 1 + mods/cnc/rules/palettes.yaml | 7 --- mods/d2k/rules/palettes.yaml | 7 --- mods/ra/rules/palettes.yaml | 7 --- mods/ts/rules/palettes.yaml | 7 --- 10 files changed, 55 insertions(+), 84 deletions(-) delete mode 100644 OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs create mode 100644 OpenRA.Mods.Common/UpdateRules/Rules/20201213/RemovePlayerHighlightPalette.cs diff --git a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs index bb97bcb413c5..ba1fac9c5fd6 100644 --- a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs +++ b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs @@ -187,9 +187,12 @@ public IEnumerable Render(WorldRenderer wr) if (flashTicks > 0 && flashTicks % 2 == 0) { - var highlight = wr.Palette("highlight"); - return Renderables.Concat(Renderables.Where(r => !r.IsDecoration && r is IPalettedRenderable) - .Select(r => ((IPalettedRenderable)r).WithPalette(highlight))); + return Renderables.Concat(Renderables.Where(r => !r.IsDecoration && r is IModifyableRenderable) + .Select(r => + { + var mr = (IModifyableRenderable)r; + return mr.WithTint(float3.Ones, mr.TintModifiers | TintModifiers.ReplaceColor).WithAlpha(0.5f); + })); } return Renderables; diff --git a/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs b/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs deleted file mode 100644 index fa49fc86485e..000000000000 --- a/OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs +++ /dev/null @@ -1,47 +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 System.Linq; -using OpenRA.Graphics; -using OpenRA.Primitives; - -namespace OpenRA.Traits -{ - [Desc("Add this to the Player actor definition.")] - public class PlayerHighlightPaletteInfo : TraitInfo - { - [PaletteDefinition(true)] - [Desc("The prefix for the resulting player palettes")] - public readonly string BaseName = "highlight"; - - [Desc("Index set to be fully transparent/invisible.")] - public readonly int TransparentIndex = 0; - - public override object Create(ActorInitializer init) { return new PlayerHighlightPalette(this); } - } - - public class PlayerHighlightPalette : ILoadsPlayerPalettes - { - readonly PlayerHighlightPaletteInfo info; - - public PlayerHighlightPalette(PlayerHighlightPaletteInfo info) - { - this.info = info; - } - - public void LoadPlayerPalettes(WorldRenderer wr, string playerName, Color color, bool replaceExisting) - { - var argb = (uint)Color.FromArgb(128, color).ToArgb(); - var pal = new ImmutablePalette(Enumerable.Range(0, Palette.Size).Select(i => i == info.TransparentIndex ? 0 : argb)); - wr.AddPalette(info.BaseName + playerName, pal, false, replaceExisting); - } - } -} diff --git a/OpenRA.Mods.Common/Effects/FlashTarget.cs b/OpenRA.Mods.Common/Effects/FlashTarget.cs index 317e5499b73c..95431eb8a1ac 100644 --- a/OpenRA.Mods.Common/Effects/FlashTarget.cs +++ b/OpenRA.Mods.Common/Effects/FlashTarget.cs @@ -49,10 +49,14 @@ public IEnumerable Render(WorldRenderer wr) { if (target.IsInWorld && tick >= 0 && tick % interval == 0) { - var palette = wr.Palette(player == null ? "highlight" : "highlight" + player.InternalName); + var color = player == null ? float3.Ones : new float3(player.Color.R, player.Color.G, player.Color.B) / 255f; return target.Render(wr) - .Where(r => !r.IsDecoration && r is IPalettedRenderable) - .Select(r => ((IPalettedRenderable)r).WithPalette(palette)); + .Where(r => !r.IsDecoration && r is IModifyableRenderable) + .Select(r => + { + var mr = (IModifyableRenderable)r; + return mr.WithTint(color, mr.TintModifiers | TintModifiers.ReplaceColor).WithAlpha(0.5f); + }); } return SpriteRenderable.None; diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs index 8bd95a76f1ab..65f1e5429752 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs +++ b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs @@ -117,9 +117,13 @@ public IEnumerable Render() var items = previews.SelectMany(p => p.Render(worldRenderer, CenterPosition)); if (Selected) { - var highlight = worldRenderer.Palette("highlight"); - var overlay = items.Where(r => !r.IsDecoration && r is IPalettedRenderable) - .Select(r => ((IPalettedRenderable)r).WithPalette(highlight)); + var overlay = items.Where(r => !r.IsDecoration && r is IModifyableRenderable) + .Select(r => + { + var mr = (IModifyableRenderable)r; + return mr.WithTint(float3.Ones, mr.TintModifiers | TintModifiers.ReplaceColor).WithAlpha(0.5f); + }); + return items.Concat(overlay); } diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20201213/RemovePlayerHighlightPalette.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20201213/RemovePlayerHighlightPalette.cs new file mode 100644 index 000000000000..8e7fe0210296 --- /dev/null +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20201213/RemovePlayerHighlightPalette.cs @@ -0,0 +1,34 @@ +#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 System.Collections.Generic; + +namespace OpenRA.Mods.Common.UpdateRules.Rules +{ + public class RemovePlayerHighlightPalette : UpdateRule + { + public override string Name { get { return "PlayerHighlightPalette trait has been removed."; } } + + public override string Description + { + get + { + return "PlayerHighlightPalette trait has been removed. Its functionality is now automatically provided by the engine."; + } + } + + public override IEnumerable UpdateActorNode(ModData modData, MiniYamlNode actorNode) + { + actorNode.RemoveNodes("PlayerHighlightPalette"); + yield break; + } + } +} diff --git a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs index 201bc94b84e2..8ebb8689f065 100644 --- a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs +++ b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs @@ -85,6 +85,7 @@ public class UpdatePath { // Bleed only changes here new RenameMPTraits(), + new RemovePlayerHighlightPalette(), }) }; diff --git a/mods/cnc/rules/palettes.yaml b/mods/cnc/rules/palettes.yaml index 60265e4a644a..dbc891ba3cb2 100644 --- a/mods/cnc/rules/palettes.yaml +++ b/mods/cnc/rules/palettes.yaml @@ -84,12 +84,6 @@ G: 0 B: 0 A: 140 - PaletteFromRGBA@highlight: - Name: highlight - R: 255 - G: 255 - B: 255 - A: 128 PaletteFromRGBA@moveflash: Name: moveflash R: 255 @@ -115,7 +109,6 @@ PlayerColorPalette: BasePalette: terrain RemapIndex: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 - PlayerHighlightPalette: MenuPaletteEffect: MenuEffect: Desaturated CloakPaletteEffect: diff --git a/mods/d2k/rules/palettes.yaml b/mods/d2k/rules/palettes.yaml index b7855a63fb08..cf5c2594ca6e 100644 --- a/mods/d2k/rules/palettes.yaml +++ b/mods/d2k/rules/palettes.yaml @@ -28,12 +28,6 @@ G: 0 B: 0 A: 140 - PaletteFromRGBA@highlight: - Name: highlight - R: 255 - G: 255 - B: 255 - A: 128 PaletteFromEmbeddedSpritePalette@moveflash-base: Name: moveflash-base Image: moveflsh @@ -78,7 +72,6 @@ BasePalette: player Alpha: 0.68 Premultiply: false - PlayerHighlightPalette: FlashPaletteEffect: PaletteFromPlayerPaletteWithAlpha@cloak: BaseName: cloak diff --git a/mods/ra/rules/palettes.yaml b/mods/ra/rules/palettes.yaml index fa830bbdd67a..9706943b2aa5 100644 --- a/mods/ra/rules/palettes.yaml +++ b/mods/ra/rules/palettes.yaml @@ -58,12 +58,6 @@ G: 0 B: 0 A: 140 - PaletteFromRGBA@highlight: - Name: highlight - R: 255 - G: 255 - B: 255 - A: 128 PaletteFromRGBA@moveflash: Name: moveflash R: 255 @@ -100,7 +94,6 @@ BaseName: cloak BasePalette: player Alpha: 0.55 - PlayerHighlightPalette: MenuPaletteEffect: RotationPaletteEffect@defaultwater: Palettes: terrain diff --git a/mods/ts/rules/palettes.yaml b/mods/ts/rules/palettes.yaml index 09833d589460..06369e3c0f58 100644 --- a/mods/ts/rules/palettes.yaml +++ b/mods/ts/rules/palettes.yaml @@ -105,12 +105,6 @@ G: 0 B: 0 A: 140 - PaletteFromRGBA@highlight: - Name: highlight - R: 255 - G: 255 - B: 255 - A: 128 PaletteFromRGBA@moveflash: Name: moveflash R: 255 @@ -161,7 +155,6 @@ BasePalette: terraindecoration Name: terrainalpha Alpha: 0.55 - PlayerHighlightPalette: MenuPaletteEffect: GlobalLightingPaletteEffect: ExcludePalettes: cursor, chrome, colorpicker, fog, shroud, alpha, effect-ignore-lighting, effect-ignore-lighting-alpha25, effect-ignore-lighting-alpha50, effect-ignore-lighting-alpha75, greentiberium, bluetiberium