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

Improve RenderShroudCircle configuration.

Browse Source
This commit is contained in:
Chris Forbes
2018-12-23 21:48:39 +00:00
committed by reaperrr
parent 680ffffff2
commit e292e88bff
1 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
OpenRA.Mods.Cnc/Traits/Render/RenderShroudCircle.cs
View File

@@ -19,26 +19,56 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits namespace OpenRA.Mods.Cnc.Traits
{ {
class RenderShroudCircleInfo : TraitInfo<RenderShroudCircle>, IPlaceBuildingDecorationInfo class RenderShroudCircleInfo : ITraitInfo, IPlaceBuildingDecorationInfo
{ {
[Desc("Color of the circle.")]
public readonly Color Color = Color.FromArgb(128, Color.Cyan);
[Desc("Contrast color of the circle.")]
public readonly Color ContrastColor = Color.FromArgb(96, Color.Black);
public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition) public IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition)
{ {
var localRange = new RangeCircleRenderable( var localRange = ai.TraitInfos<CreatesShroudInfo>()
centerPosition, .Where(csi => csi.EnabledByDefault)
ai.TraitInfo<CreatesShroudInfo>().Range, .Select(csi => csi.Range)
0, .DefaultIfEmpty(WDist.Zero)
Color.FromArgb(128, Color.Cyan), .Max();
Color.FromArgb(96, Color.Black));
var otherRanges = w.ActorsWithTrait<RenderShroudCircle>() var localRangeRenderable = new RangeCircleRenderable(
centerPosition,
localRange,
0,
Color,
ContrastColor);
var otherRangeRenderables = w.ActorsWithTrait<RenderShroudCircle>()
.SelectMany(a => a.Trait.RangeCircleRenderables(a.Actor, wr)); .SelectMany(a => a.Trait.RangeCircleRenderables(a.Actor, wr));
return otherRanges.Append(localRange); return otherRangeRenderables.Append(localRangeRenderable);
}
} }
class RenderShroudCircle : IRenderAboveShroudWhenSelected public object Create(ActorInitializer init) { return new RenderShroudCircle(init.Self, this); }
}
class RenderShroudCircle : INotifyCreated, IRenderAboveShroudWhenSelected
{ {
readonly RenderShroudCircleInfo info;
WDist range;
public RenderShroudCircle(Actor self, RenderShroudCircleInfo info)
{
this.info = info;
}
void INotifyCreated.Created(Actor self)
{
range = self.TraitsImplementing<CreatesShroud>()
.Select(cs => cs.Info.Range)
.DefaultIfEmpty(WDist.Zero)
.Max();
}
public IEnumerable<IRenderable> RangeCircleRenderables(Actor self, WorldRenderer wr) public IEnumerable<IRenderable> RangeCircleRenderables(Actor self, WorldRenderer wr)
{ {
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
@@ -46,10 +76,10 @@ namespace OpenRA.Mods.Cnc.Traits
yield return new RangeCircleRenderable( yield return new RangeCircleRenderable(
self.CenterPosition, self.CenterPosition,
self.Info.TraitInfo<CreatesShroudInfo>().Range, range,
0, 0,
Color.FromArgb(128, Color.Cyan), info.Color,
Color.FromArgb(96, Color.Black)); info.ContrastColor);
} }
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr) IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)