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

Change IPostRenderSelection and IPlaceBuildingDecoration to return renderables.

Browse Source
This commit is contained in:
Paul Chote
2014-07-22 17:41:35 +12:00
parent 8ac9477cd9
commit da6ecbf92e
13 changed files with 146 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
OpenRA.Mods.RA/RenderJammerCircle.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 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. For more information,
@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Graphics;
@@ -18,19 +19,36 @@ namespace OpenRA.Mods.RA
//todo: remove all the Render*Circle duplication
class RenderJammerCircleInfo : ITraitInfo, IPlaceBuildingDecoration
{
public void Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
var jamsMissiles = ai.Traits.GetOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
RenderJammerCircle.DrawRangeCircle(wr, centerPosition, jamsMissiles.Range, Color.Red);
{
yield return new RangeCircleRenderable(
centerPosition,
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black)
);
}
var jamsRadar = ai.Traits.GetOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
RenderJammerCircle.DrawRangeCircle(wr, centerPosition, jamsRadar.Range, Color.Blue);
{
yield return new RangeCircleRenderable(
centerPosition,
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black)
);
}
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner == a.Actor.World.LocalPlayer)
a.Trait.RenderAfterWorld(wr);
foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r;
}
public object Create(ActorInitializer init) { return new RenderJammerCircle(init.self); }
@@ -42,29 +60,34 @@ namespace OpenRA.Mods.RA
public RenderJammerCircle(Actor self) { this.self = self; }
public void RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
{
if (self.Owner != self.World.LocalPlayer)
return;
yield break;
var jamsMissiles = self.Info.Traits.GetOrDefault<JamsMissilesInfo>();
if (jamsMissiles != null)
DrawRangeCircle(wr, self.CenterPosition, jamsMissiles.Range, Color.Red);
{
yield return new RangeCircleRenderable(
self.CenterPosition,
WRange.FromCells(jamsMissiles.Range),
0,
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black)
);
}
var jamsRadar = self.Info.Traits.GetOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
DrawRangeCircle(wr, self.CenterPosition, jamsRadar.Range, Color.Blue);
}
public static void DrawRangeCircle(WorldRenderer wr, WPos pos, int range, Color color)
{
new RangeCircleRenderable(
pos,
WRange.FromCells(range),
0,
Color.FromArgb(128, color),
Color.FromArgb(96, Color.Black)
).Render(wr);
{
yield return new RangeCircleRenderable(
self.CenterPosition,
WRange.FromCells(jamsRadar.Range),
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black)
);
}
}
}
}