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

Add DebugOverlayColor to Warhead

Browse Source 
This allows us to render WarheadDebugOverlay circles in a
color-per-warhead fashion.
This commit is contained in:
Taryn Hill
2015-10-31 17:20:51 -05:00
parent 47224bca40
commit 9b9d3c8af5
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/World/WarheadDebugOverlay.cs
View File

@@ -29,6 +29,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
public readonly WPos CenterPosition; public readonly WPos CenterPosition;
public readonly WDist[] Range; public readonly WDist[] Range;
public readonly Color Color;
public int Time; public int Time;
public WDist OuterRange public WDist OuterRange
@@ -36,10 +37,11 @@ namespace OpenRA.Mods.Common.Traits
get { return Range[Range.Length - 1]; } get { return Range[Range.Length - 1]; }
} }
public WHImpact(WPos pos, WDist[] range, int time) public WHImpact(WPos pos, WDist[] range, int time, Color color)
{ {
CenterPosition = pos; CenterPosition = pos;
Range = range; Range = range;
Color = color;
Time = time; Time = time;
} }
} }
@@ -52,9 +54,9 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
} }
public void AddImpact(WPos pos, WDist[] range) public void AddImpact(WPos pos, WDist[] range, Color color)
{ {
impacts.Add(new WHImpact(pos, range, info.DisplayDuration)); impacts.Add(new WHImpact(pos, range, info.DisplayDuration, color));
} }
public void RenderAfterWorld(WorldRenderer wr, Actor self) public void RenderAfterWorld(WorldRenderer wr, Actor self)
@@ -64,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits
var alpha = 255.0f * i.Time / info.DisplayDuration; var alpha = 255.0f * i.Time / info.DisplayDuration;
var rangeStep = alpha / i.Range.Length; var rangeStep = alpha / i.Range.Length;
wr.DrawRangeCircle(i.CenterPosition, i.OuterRange, Color.FromArgb((int)alpha, Color.Red)); wr.DrawRangeCircle(i.CenterPosition, i.OuterRange, Color.FromArgb((int)alpha, i.Color));
foreach (var r in i.Range) foreach (var r in i.Range)
{ {
@@ -72,7 +74,7 @@ namespace OpenRA.Mods.Common.Traits
var br = wr.ScreenPosition(i.CenterPosition + new WVec(r.Length, r.Length, 0)); var br = wr.ScreenPosition(i.CenterPosition + new WVec(r.Length, r.Length, 0));
var rect = RectangleF.FromLTRB(tl.X, tl.Y, br.X, br.Y); var rect = RectangleF.FromLTRB(tl.X, tl.Y, br.X, br.Y);
Game.Renderer.WorldLineRenderer.FillEllipse(rect, Color.FromArgb((int)alpha, Color.Red)); Game.Renderer.WorldLineRenderer.FillEllipse(rect, Color.FromArgb((int)alpha, i.Color));
alpha -= rangeStep; alpha -= rangeStep;
} }

2
OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Warheads
{ {
var devMode = world.LocalPlayer.PlayerActor.TraitOrDefault<DeveloperMode>(); var devMode = world.LocalPlayer.PlayerActor.TraitOrDefault<DeveloperMode>();
if (devMode != null && devMode.ShowCombatGeometry) if (devMode != null && devMode.ShowCombatGeometry)
world.WorldActor.Trait<WarheadDebugOverlay>().AddImpact(pos, Spread); world.WorldActor.Trait<WarheadDebugOverlay>().AddImpact(pos, Spread, DebugOverlayColor);
} }
var range = Spread[0]; var range = Spread[0];

2
OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Warheads
{ {
var devMode = world.LocalPlayer.PlayerActor.TraitOrDefault<DeveloperMode>(); var devMode = world.LocalPlayer.PlayerActor.TraitOrDefault<DeveloperMode>();
if (devMode != null && devMode.ShowCombatGeometry) if (devMode != null && devMode.ShowCombatGeometry)
world.WorldActor.Trait<WarheadDebugOverlay>().AddImpact(pos, Range); world.WorldActor.Trait<WarheadDebugOverlay>().AddImpact(pos, Range, DebugOverlayColor);
} }
// This only finds actors where the center is within the search radius, // This only finds actors where the center is within the search radius,

4
OpenRA.Mods.Common/Warheads/Warhead.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
@@ -33,6 +34,9 @@ namespace OpenRA.Mods.Common.Warheads
public readonly int Delay = 0; public readonly int Delay = 0;
int IWarhead.Delay { get { return Delay; } } int IWarhead.Delay { get { return Delay; } }
[Desc("The color used for this warhead's visualization in the world's `WarheadDebugOverlay` trait.")]
public readonly Color DebugOverlayColor = Color.Red;
public bool IsValidTarget(IEnumerable<string> targetTypes) public bool IsValidTarget(IEnumerable<string> targetTypes)
{ {
return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes); return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);