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

Replace GlobalLightingPaletteEffect with a post-processing shader.

Browse Source
This commit is contained in:
Paul Chote
2023-10-21 23:50:16 +01:00
committed by Gustas
parent a51a9700cf
commit cb55039ec9
15 changed files with 103 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Scripting/Global/LightingGlobal.cs
View File

@@ -19,15 +19,13 @@ namespace OpenRA.Mods.Common.Scripting
public class LightingGlobal : ScriptGlobal
{
readonly IEnumerable<FlashPostProcessEffect> flashEffects;
readonly GlobalLightingPaletteEffect lighting;
readonly bool hasLighting;
readonly TintPostProcessEffect tintEffect;
public LightingGlobal(ScriptContext context)
: base(context)
{
flashEffects = context.World.WorldActor.TraitsImplementing<FlashPostProcessEffect>();
lighting = context.World.WorldActor.TraitOrDefault<GlobalLightingPaletteEffect>();
hasLighting = lighting != null;
tintEffect = context.World.WorldActor.TraitOrDefault<TintPostProcessEffect>();
}
[Desc("Controls the `" + nameof(FlashPostProcessEffect) + "` trait.")]
@@ -40,26 +38,26 @@ namespace OpenRA.Mods.Common.Scripting
public double Red
{
get => hasLighting ? lighting.Red : 1d;
set { if (hasLighting) lighting.Red = (float)value; }
get => tintEffect?.Red ?? 1;
set { if (tintEffect != null) tintEffect.Red = (float)value; }
}
public double Green
{
get => hasLighting ? lighting.Green : 1d;
set { if (hasLighting) lighting.Green = (float)value; }
get => tintEffect?.Green ?? 1;
set { if (tintEffect != null) tintEffect.Green = (float)value; }
}
public double Blue
{
get => hasLighting ? lighting.Blue : 1d;
set { if (hasLighting) lighting.Blue = (float)value; }
get => tintEffect?.Blue ?? 1;
set { if (tintEffect != null) tintEffect.Blue = (float)value; }
}
public double Ambient
{
get => hasLighting ? lighting.Ambient : 1d;
set { if (hasLighting) lighting.Ambient = (float)value; }
get => tintEffect?.Ambient ?? 1;
set { if (tintEffect != null) tintEffect.Ambient = (float)value; }
}
}
}

111
OpenRA.Mods.Common/Traits/PaletteEffects/GlobalLightingPaletteEffect.cs
View File

@@ -1,111 +0,0 @@
#region Copyright & License Information
/*
* Copyright (c) The OpenRA Developers and Contributors
* 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;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Used for day/night effects.")]
[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
public class GlobalLightingPaletteEffectInfo : TraitInfo, ILobbyCustomRulesIgnore
{
[Desc("Do not modify graphics that use any palette in this list.")]
public readonly HashSet<string> ExcludePalettes = new() { "cursor", "chrome", "colorpicker", "fog", "shroud", "alpha" };
[Desc("Do not modify graphics that start with these letters.")]
public readonly HashSet<string> ExcludePalettePrefixes = new();
public readonly float Red = 1f;
public readonly float Green = 1f;
public readonly float Blue = 1f;
public readonly float Ambient = 1f;
public override object Create(ActorInitializer init) { return new GlobalLightingPaletteEffect(this); }
}
public class GlobalLightingPaletteEffect : IPaletteModifier
{
readonly GlobalLightingPaletteEffectInfo info;
public float Red;
public float Green;
public float Blue;
public float Ambient;
public GlobalLightingPaletteEffect(GlobalLightingPaletteEffectInfo info)
{
this.info = info;
Red = info.Red;
Green = info.Green;
Blue = info.Blue;
Ambient = info.Ambient;
}
public void AdjustPalette(IReadOnlyDictionary<string, MutablePalette> palettes)
{
// Calculate ambient color multipliers as integers for speed. To handle fractional ambiance, we'll increase
// the magnitude of the result by 8 bits.
var ar = (uint)((1 << 8) * Ambient * Red);
var ag = (uint)((1 << 8) * Ambient * Green);
var ab = (uint)((1 << 8) * Ambient * Blue);
foreach (var kvp in palettes)
{
if (info.ExcludePalettes.Contains(kvp.Key))
continue;
if (info.ExcludePalettePrefixes.Any(kvp.Key.StartsWith))
continue;
var palette = kvp.Value;
for (var x = 0; x < Palette.Size; x++)
{
/* Here is the reference code for the operation we are performing.
var from = palette.GetColor(x);
var r = (int)(from.R * Ambient * Red).Clamp(0, 255);
var g = (int)(from.G * Ambient * Green).Clamp(0, 255);
var b = (int)(from.B * Ambient * Blue).Clamp(0, 255);
palette.SetColor(x, Color.FromArgb(from.A, r, g, b));
*/
// PERF: Use integer arithmetic to avoid costly conversions to and from floating point values.
var from = palette[x];
// 1: Extract each color component and shift it to the lower bits, then multiply with ambiance.
// 2: Because the ambiance was increased by 8 bits, our result has been shifted 8 bits up.
// If the multiply overflowed we clamp the value, otherwise we mask out the fractional bits.
// 3: Finally, we shift the color component back to its correct place. We're already 8 bits higher
// than expected due to the multiply, so we don't have to shift as far to get back.
var r1 = ((from & 0x00FF0000) >> 16) * ar;
var r2 = r1 >= 0x0000FF00 ? 0x0000FF00 : r1 & 0x0000FF00;
var r3 = r2 << 8;
var g1 = ((from & 0x0000FF00) >> 8) * ag;
var g2 = g1 >= 0x0000FF00 ? 0x0000FF00 : g1 & 0x0000FF00;
var g3 = g2 << 0;
var b1 = ((from & 0x000000FF) >> 0) * ab;
var b2 = b1 >= 0x0000FF00 ? 0x0000FF00 : b1 & 0x0000FF00;
var b3 = b2 >> 8;
// Combine all the adjusted components back together.
var a = from & 0xFF000000;
palette[x] = a | r3 | g3 | b3;
}
}
}
}
}

51
OpenRA.Mods.Common/Traits/PaletteEffects/TintPostProcessEffect.cs Normal file
View File

@@ -0,0 +1,51 @@
#region Copyright & License Information
/*
* Copyright (c) The OpenRA Developers and Contributors
* 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 OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Used for day/night effects.")]
[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
public class TintPostProcessEffectInfo : TraitInfo, ILobbyCustomRulesIgnore
{
public readonly float Red = 1f;
public readonly float Green = 1f;
public readonly float Blue = 1f;
public readonly float Ambient = 1f;
public override object Create(ActorInitializer init) { return new TintPostProcessEffect(this); }
}
public class TintPostProcessEffect : RenderPostProcessPassBase
{
public float Red;
public float Green;
public float Blue;
public float Ambient;
public TintPostProcessEffect(TintPostProcessEffectInfo info)
: base("tint", PostProcessPassType.AfterActors)
{
Red = info.Red;
Green = info.Green;
Blue = info.Blue;
Ambient = info.Ambient;
}
protected override bool Enabled => true;
protected override void PrepareRender(WorldRenderer wr, IShader shader)
{
shader.SetVec("Tint", Ambient * Red, Ambient * Green, Ambient * Blue);
}
}
}

4
OpenRA.Mods.Common/UpdateRules/Rules/20230801/ReplacePaletteModifiers.cs
View File

@@ -20,13 +20,15 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
public override string Description =>
"MenuPaletteEffect is renamed to MenuPostProcessEffect\n" +
"ChronoshiftPaletteEffect is renamed to ChronoshiftPostProcessEffect\n" +
"FlashPaletteEffect is renamed to FlashPostProcessEffect";
"FlashPaletteEffect is renamed to FlashPostProcessEffect\n" +
"GlobalLightingPaletteEffect is renamed to TintPostProcessEffect";
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNodeBuilder actorNode)
{
actorNode.RenameChildrenMatching("MenuPaletteEffect", "MenuPostProcessEffect");
actorNode.RenameChildrenMatching("ChronoshiftPaletteEffect", "ChronoshiftPostProcessEffect");
actorNode.RenameChildrenMatching("FlashPaletteEffect", "FlashPostProcessEffect");
actorNode.RenameChildrenMatching("GlobalLightingPaletteEffect", "TintPostProcessEffect");
yield break;
}

30
glsl/postprocess_tint.frag Normal file
View File

@@ -0,0 +1,30 @@
#version {VERSION}
#ifdef GL_ES
precision mediump float;
#endif
uniform vec3 Tint;
uniform sampler2D WorldTexture;
#if __VERSION__ == 120
uniform vec2 WorldTextureSize;
#else
out vec4 fragColor;
#endif
void main()
{
#if __VERSION__ == 120
vec4 c = texture2D(WorldTexture, gl_FragCoord.xy / WorldTextureSize);
#else
vec4 c = texture(WorldTexture, gl_FragCoord.xy / textureSize(WorldTexture, 0));
#endif
c = vec4(min(c.r * Tint.r, 1.0), min(c.g * Tint.g, 1.0), min(c.b * Tint.b, 1.0), c.a);
#if __VERSION__ == 120
gl_FragColor = c;
#else
fragColor = c;
#endif
}

2
mods/cnc/maps/desert-rats-cnc/rules.yaml
View File

@@ -1,5 +1,5 @@
World:
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 1.1
Green: 0.95
Blue: 1.051

2
mods/cnc/maps/gdi06/rules.yaml
View File

@@ -16,7 +16,7 @@ World:
ParticleColors: 304074, 28386C, 202C60, 182C54
LineTailAlphaValue: 150
ParticleSize: 1, 1
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 0.75
Green: 0.85
Blue: 1.5

2
mods/ra/maps/a-nuclear-winter/rules.yaml
View File

@@ -7,7 +7,7 @@ World:
ScatterDirection: -1, 1
ParticleColors: ECECEC, E4E4E4, D0D0D0, BCBCBC
LineTailAlphaValue: 0
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 0.88
Green: 0.93
Blue: 1.06

2
mods/ra/maps/chernobyl/rules.yaml
View File

@@ -1,5 +1,5 @@
World:
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 1
Green: 0.90
Blue: 0.83

2
mods/ra/maps/desert-rats/rules.yaml
View File

@@ -1,5 +1,5 @@
World:
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 1.1
Green: 0.92
Blue: 1.051

2
mods/ra/maps/fort-lonestar/rules.yaml
View File

@@ -17,7 +17,7 @@ World:
ParticleColors: 304074, 28386C, 202C60, 182C54
LineTailAlphaValue: 150
ParticleSize: 1, 1
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 0.75
Green: 0.85
Blue: 1.5

2
mods/ra/maps/infiltration/rules.yaml
View File

@@ -1,5 +1,5 @@
World:
GlobalLightingPaletteEffect@HAZE:
TintPostProcessEffect@HAZE:
Red: 1
Green: 0.55
Blue: 0

BIN
mods/ra/maps/ritual-circle.oramap
View File

Binary file not shown.

2
mods/ra/maps/shattered-mountain/rules.yaml
View File

@@ -7,7 +7,7 @@ World:
ParticleDensityFactor: 8
ParticleColors: ECECEC, E4E4E4, D0D0D0, BCBCBC
LineTailAlphaValue: 0
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 0.88
Green: 0.92
Blue: 1.06

2
mods/ra/maps/snow-town/rules.yaml
View File

@@ -5,7 +5,7 @@ World:
UseSquares: true
ParticleColors: ECECEC, E4E4E4, D0D0D0, BCBCBC
LineTailAlphaValue: 0
GlobalLightingPaletteEffect:
TintPostProcessEffect:
Red: 0.9
Green: 0.9
Blue: 1.0