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

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