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

Migrate traits to IRenderAnnotations.

Browse Source
This commit is contained in:
Paul Chote
2019-09-14 09:26:14 +01:00
committed by abcdefg30
parent edaa7918fc
commit 1dc84f48de
19 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Cnc/Traits/Render/RenderJammerCircle.cs
View File

@@ -36,14 +36,14 @@ namespace OpenRA.Mods.Cnc.Traits
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
foreach (var r in a.Trait.RenderAboveShroud(a.Actor, wr))
foreach (var r in a.Trait.RenderAnnotations(a.Actor, wr))
yield return r;
}
}
class RenderJammerCircle : IRenderAboveShroudWhenSelected
class RenderJammerCircle : IRenderAnnotationsWhenSelected
{
public IEnumerable<IRenderable> RenderAboveShroud(Actor self, WorldRenderer wr)
public IEnumerable<IRenderable> RenderAnnotations(Actor self, WorldRenderer wr)
{
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
yield break;
@@ -60,6 +60,6 @@ namespace OpenRA.Mods.Cnc.Traits
}
}
bool IRenderAboveShroudWhenSelected.SpatiallyPartitionable { get { return false; } }
bool IRenderAnnotationsWhenSelected.SpatiallyPartitionable { get { return false; } }
}
}

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

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.Cnc.Traits
public object Create(ActorInitializer init) { return new RenderShroudCircle(init.Self, this); }
}
class RenderShroudCircle : INotifyCreated, IRenderAboveShroudWhenSelected
class RenderShroudCircle : INotifyCreated, IRenderAnnotationsWhenSelected
{
readonly RenderShroudCircleInfo info;
WDist range;
@@ -82,11 +82,11 @@ namespace OpenRA.Mods.Cnc.Traits
info.ContrastColor);
}
IEnumerable<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
IEnumerable<IRenderable> IRenderAnnotationsWhenSelected.RenderAnnotations(Actor self, WorldRenderer wr)
{
return RangeCircleRenderables(self, wr);
}
bool IRenderAboveShroudWhenSelected.SpatiallyPartitionable { get { return false; } }
bool IRenderAnnotationsWhenSelected.SpatiallyPartitionable { get { return false; } }
}
}