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

Rename and tweak post-render interfaces.

Browse Source
This commit is contained in:
Paul Chote
2016-08-22 16:50:49 +01:00
parent f1990853df
commit 11805bb567
24 changed files with 129 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/Traits/Render/RenderRangeCircle.cs
View File

@@ -32,23 +32,24 @@ namespace OpenRA.Mods.Common.Traits.Render
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{
if (range == WDist.Zero)
yield break;
return SpriteRenderable.None;
yield return new RangeCircleRenderable(
var localRange = new RangeCircleRenderable(
centerPosition,
range,
0,
Color.FromArgb(128, Color.Yellow),
Color.FromArgb(96, Color.Black));
foreach (var a in w.ActorsWithTrait<RenderRangeCircle>())
if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
if (a.Actor.Info.TraitInfo<RenderRangeCircleInfo>().RangeCircleType == RangeCircleType)
foreach (var r in a.Trait.RenderAfterWorld(wr))
yield return r;
var otherRanges = w.ActorsWithTrait<RenderRangeCircle>()
.Where(a => a.Trait.Info.RangeCircleType == RangeCircleType)
.SelectMany(a => a.Trait.RangeCircleRenderables(wr));
return otherRanges.Append(localRange);
}
public object Create(ActorInitializer init) { return new RenderRangeCircle(init.Self); }
public object Create(ActorInitializer init) { return new RenderRangeCircle(init.Self, this); }
public void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
var armaments = ai.TraitInfos<ArmamentInfo>().Where(a => a.UpgradeMinEnabledLevel == 0);
@@ -60,18 +61,21 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
class RenderRangeCircle : IPostRenderSelection
class RenderRangeCircle : IRenderAboveShroudWhenSelected
{
public readonly RenderRangeCircleInfo Info;
readonly Actor self;
readonly AttackBase attack;
public RenderRangeCircle(Actor self)
public RenderRangeCircle(Actor self, RenderRangeCircleInfo info)
{
Info = info;
this.self = self;
attack = self.Trait<AttackBase>();
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr)
public IEnumerable<IRenderable> RangeCircleRenderables(WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
@@ -87,5 +91,10 @@ namespace OpenRA.Mods.Common.Traits.Render
Color.FromArgb(128, Color.Yellow),
Color.FromArgb(96, Color.Black));
}
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
{
return RangeCircleRenderables(wr);
}
}
}