Replace highlight palette with tint effects.

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

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;

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