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

Replace highlight palette with tint effects.

Browse Source
This commit is contained in:
Paul Chote
2020-12-19 22:31:15 +00:00
committed by abcdefg30
parent 8edd9de278
commit 96641873ae
10 changed files with 55 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -187,9 +187,12 @@ namespace OpenRA.Traits
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;

47
OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs
View File

@@ -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);
}
}
}

10
OpenRA.Mods.Common/Effects/FlashTarget.cs
View File

@@ -49,10 +49,14 @@ namespace OpenRA.Mods.Common.Effects
{
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;

10
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -117,9 +117,13 @@ namespace OpenRA.Mods.Common.Traits
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);
}

34
OpenRA.Mods.Common/UpdateRules/Rules/20201213/RemovePlayerHighlightPalette.cs Normal file
View File

@@ -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<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
{
actorNode.RemoveNodes("PlayerHighlightPalette");
yield break;
}
}
}

1
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -85,6 +85,7 @@ namespace OpenRA.Mods.Common.UpdateRules
{
// Bleed only changes here
new RenameMPTraits(),
new RemovePlayerHighlightPalette(),
})
};

7
mods/cnc/rules/palettes.yaml
View File

@@ -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:

7
mods/d2k/rules/palettes.yaml
View File

@@ -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

7
mods/ra/rules/palettes.yaml
View File

@@ -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

7
mods/ts/rules/palettes.yaml
View File

@@ -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