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

6
OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual object Create(ActorInitializer init) { return new EditorSelectionLayer(init.Self, this); }
}
public class EditorSelectionLayer : IWorldLoaded, IPostRender
public class EditorSelectionLayer : IWorldLoaded, IRenderAboveWorld
{
readonly EditorSelectionLayerInfo info;
readonly Map map;
@@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Traits
pasteSprite = map.Rules.Sequences.GetSequence(info.Image, info.PasteSequence).GetSprite(0);
}
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
if (w.Type != WorldType.Editor)
return;
@@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits
CopyRegion = PasteRegion = null;
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (wr.World.Type != WorldType.Editor)
return;

4
OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Mods.Common.Traits
notVisibleEdges = info.UseExtendedIndex ? Edges.AllSides : Edges.AllCorners;
}
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
// Initialize tile cache
// This includes the region outside the visible area to cover any sprites peeking outside the map
@@ -230,7 +230,7 @@ namespace OpenRA.Mods.Common.Traits
cellsDirty.UnionWith(cells);
}
public void RenderShroud(WorldRenderer wr, Shroud shroud)
void IRenderShroud.RenderShroud(Shroud shroud, WorldRenderer wr)
{
if (currentShroud != shroud)
{

8
OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
View File

@@ -20,14 +20,14 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Renders a debug overlay showing the terrain cells. Attach this to the world actor.")]
public class TerrainGeometryOverlayInfo : TraitInfo<TerrainGeometryOverlay> { }
public class TerrainGeometryOverlay : IPostRender, IWorldLoaded, IChatCommand
public class TerrainGeometryOverlay : IRenderAboveWorld, IWorldLoaded, IChatCommand
{
const string CommandName = "terrainoverlay";
const string CommandDesc = "Toggles the terrain geometry overlay";
public bool Enabled;
public void WorldLoaded(World w, WorldRenderer wr)
void IWorldLoaded.WorldLoaded(World w, WorldRenderer wr)
{
var console = w.WorldActor.TraitOrDefault<ChatCommands>();
var help = w.WorldActor.TraitOrDefault<HelpCommand>();
@@ -39,13 +39,13 @@ namespace OpenRA.Mods.Common.Traits
help.RegisterHelp(CommandName, CommandDesc);
}
public void InvokeCommand(string name, string arg)
void IChatCommand.InvokeCommand(string name, string arg)
{
if (name == CommandName)
Enabled ^= true;
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (!Enabled)
return;

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

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new WarheadDebugOverlay(this); }
}
public class WarheadDebugOverlay : IPostRender
public class WarheadDebugOverlay : IRenderAboveWorld
{
class WHImpact
{
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
impacts.Add(new WHImpact(pos, range, info.DisplayDuration, color));
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
foreach (var i in impacts)
{

6
OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new WeatherOverlay(init.World, this); }
}
public class WeatherOverlay : ITick, IPostRender
public class WeatherOverlay : ITick, IRenderAboveWorld
{
readonly WeatherOverlayInfo info;
readonly World world;
@@ -201,7 +201,7 @@ namespace OpenRA.Mods.Common.Traits
tempParticle.SwingOffset += tempParticle.SwingDirection * tempParticle.SwingSpeed;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
windTickCountdown--;
}
@@ -298,7 +298,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void RenderAfterWorld(WorldRenderer wr, Actor self)
void IRenderAboveWorld.RenderAboveWorld(Actor self, WorldRenderer wr)
{
if (!world.Paused)
UpdateWeatherOverlay(wr);