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

Refactored WaterPaletteRotation

Browse Source 
Moved RotationBase from tileset definition to WaterPaletteRotation effect.
Unhardcoded rotation range and rotation rate.
Added possibility to exclude Tilesets from effect.

Fixed RA water palette rotation for actors on desert maps (#8872).
This commit is contained in:
reaperrr
2015-08-18 19:54:50 +02:00
parent 7912e3c7ff
commit ca055eb7bb
10 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
OpenRA.Mods.Common/Traits/PaletteEffects/WaterPaletteRotation.cs
View File

@@ -15,11 +15,24 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Palette effect used for sprinkle \"animations\" on terrain tiles.")]
[Desc("Palette effect used for sprinkle \"animations\".")]
class WaterPaletteRotationInfo : ITraitInfo
{
[Desc("Defines which palettes should be excluded from this effect.")]
public readonly HashSet<string> ExcludePalettes = new HashSet<string>();
[Desc("Don't apply the effect for these tileset IDs.")]
public readonly string[] ExcludeTilesets = { };
[Desc("Palette index of first RotationRange color.")]
public readonly int RotationBase = 0x60;
[Desc("Range of colors to rotate.")]
public readonly int RotationRange = 7;
[Desc("Step towards next color index per tick.")]
public readonly float RotationStep = .25f;
public object Create(ActorInitializer init) { return new WaterPaletteRotation(init.World, this); }
}
@@ -28,35 +41,39 @@ namespace OpenRA.Mods.Common.Traits
readonly WaterPaletteRotationInfo info;
readonly World world;
float t = 0;
uint[] temp;
public WaterPaletteRotation(World world, WaterPaletteRotationInfo info)
{
this.world = world;
this.info = info;
temp = new uint[info.RotationRange]; /* allocating this on the fly actually hurts our profile */
}
public void Tick(Actor self) { t += .25f; }
uint[] temp = new uint[7]; /* allocating this on the fly actually hurts our profile */
public void Tick(Actor self)
{
t += info.RotationStep;
}
public void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> palettes)
{
var rotate = (int)t % 7;
var rotate = (int)t % info.RotationRange;
if (rotate == 0)
return;
foreach (var kvp in palettes)
{
if (info.ExcludePalettes.Contains(kvp.Key))
if (info.ExcludePalettes.Contains(kvp.Key) || info.ExcludeTilesets.Contains(world.TileSet.Id))
continue;
var palette = kvp.Value;
for (var i = 0; i < 7; i++)
temp[(rotate + i) % 7] = palette[world.TileSet.WaterPaletteRotationBase + i];
for (var i = 0; i < info.RotationRange; i++)
temp[(rotate + i) % info.RotationRange] = palette[info.RotationBase + i];
for (var i = 0; i < 7; i++)
palette[world.TileSet.WaterPaletteRotationBase + i] = temp[i];
for (var i = 0; i < info.RotationRange; i++)
palette[info.RotationBase + i] = temp[i];
}
}
}