Rename existing fields that are caching TraitsImplementing calls for consistency.
This commit is contained in:
@@ -83,8 +83,8 @@ namespace OpenRA
|
||||
}
|
||||
}
|
||||
|
||||
readonly IRenderModifier[] traitsImplementingRenderModifier;
|
||||
readonly IRender[] traitsImplementingRender;
|
||||
readonly IRenderModifier[] renderModifiers;
|
||||
readonly IRender[] renders;
|
||||
|
||||
internal Actor(World world, string name, TypeDictionary initDict)
|
||||
{
|
||||
@@ -126,8 +126,8 @@ namespace OpenRA
|
||||
return new Rectangle(offset.X, offset.Y, size.X, size.Y);
|
||||
});
|
||||
|
||||
traitsImplementingRenderModifier = TraitsImplementing<IRenderModifier>().ToArray();
|
||||
traitsImplementingRender = TraitsImplementing<IRender>().ToArray();
|
||||
renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
|
||||
renders = TraitsImplementing<IRender>().ToArray();
|
||||
}
|
||||
|
||||
public void Tick()
|
||||
@@ -143,14 +143,14 @@ namespace OpenRA
|
||||
public IEnumerable<IRenderable> Render(WorldRenderer wr)
|
||||
{
|
||||
var renderables = Renderables(wr);
|
||||
foreach (var modifier in traitsImplementingRenderModifier)
|
||||
foreach (var modifier in renderModifiers)
|
||||
renderables = modifier.ModifyRender(this, wr, renderables);
|
||||
return renderables;
|
||||
}
|
||||
|
||||
IEnumerable<IRenderable> Renderables(WorldRenderer wr)
|
||||
{
|
||||
foreach (var render in traitsImplementingRender)
|
||||
foreach (var render in renders)
|
||||
foreach (var renderable in render.Render(this, wr))
|
||||
yield return renderable;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user