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

Use RgbaColorRenderer in WeatherOverlay.

Browse Source
This commit is contained in:
Paul Chote
2015-12-10 18:01:45 +00:00
parent f6606afa8b
commit 8fc323602c
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Particles are drawn in squares when enabled, otherwise with lines.")]
public readonly bool UseSquares = true;
[Desc("Works only with squares enabled. Size min. and max. value in pixels.")]
[Desc("Size / width of the particle in px.")]
public readonly int[] ParticleSize = { 1, 3 };
[Desc("Scatters falling direction on the x-axis. Scatter min. and max. value in px/tick.")]
@@ -294,7 +294,7 @@ namespace OpenRA.Mods.Common.Traits
else
{
var tempPosTail = new float2(topLeft.X + item.PosX - currentWindXOffset, item.PosY - (item.Gravity * 2 / 3) + topLeft.Y);
Game.Renderer.WorldLineRenderer.DrawLine(tempPos, tempPosTail, item.Color, item.TailColor);
Game.Renderer.WorldRgbaColorRenderer.DrawLine(tempPos, tempPosTail, item.Size, item.TailColor);
}
}
}

8
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -2694,6 +2694,14 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
// Added width support for line particles
if (engineVersion < 20151220 && node.Key == "WeatherOverlay")
{
var useSquares = node.Value.Nodes.FirstOrDefault(n => n.Key == "UseSquares");
if (useSquares != null && !FieldLoader.GetValue<bool>("UseSquares", useSquares.Value.Value))
node.Value.Nodes.Add(new MiniYamlNode("ParticleSize", "1, 1"));
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}

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

@@ -1055,7 +1055,6 @@ Rules:
WindTick: 150, 550
InstantWindChanges: false
UseSquares: false
ParticleSize: 0, 0
ScatterDirection: 0, 0
Gravity: 8.00, 12.00
SwingOffset: 0, 0
@@ -1063,6 +1062,7 @@ Rules:
SwingAmplitude: 0, 0
ParticleColors: 304074, 28386C, 202C60, 182C54
LineTailAlphaValue: 150
ParticleSize: 1, 1
GlobalLightingPaletteEffect:
Red: 0.75
Green: 0.85

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

@@ -508,7 +508,6 @@ Rules:
WindTick: 150, 550
InstantWindChanges: false
UseSquares: false
ParticleSize: 0, 0
ScatterDirection: 0, 0
Gravity: 8.00, 12.00
SwingOffset: 0, 0
@@ -516,6 +515,7 @@ Rules:
SwingAmplitude: 0, 0
ParticleColors: 304074, 28386C, 202C60, 182C54
LineTailAlphaValue: 150
ParticleSize: 1, 1
GlobalLightingPaletteEffect:
Red: 0.75
Green: 0.85