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

Pass WorldRenderer to Render().

Browse Source
This commit is contained in:
Paul Chote
2013-02-24 14:17:41 +13:00
parent d6fcaafd78
commit 3380817865
11 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Render/RenderEditorOnly.cs
View File

@@ -9,6 +9,7 @@
#endregion
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
@@ -23,6 +24,6 @@ namespace OpenRA.Mods.RA.Render
public RenderEditorOnly(Actor self) : base(self, () => 0) { }
static readonly Renderable[] Nothing = { };
public override IEnumerable<Renderable> Render(Actor self) { return Nothing; }
public override IEnumerable<Renderable> Render(Actor self, WorldRenderer wr) { return Nothing; }
}
}

2
OpenRA.Mods.RA/Render/RenderSpy.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Render
public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
{
return spy.disguisedAsPlayer != null ? r.Select(a => a.WithPalette(Palette(spy.disguisedAsPlayer))) : r;
return spy.disguisedAsPlayer != null ? r.Select(a => a.WithPalette(Palette(spy.disguisedAsPlayer, wr))) : r;
}
public override void Tick(Actor self)

4
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -57,11 +57,11 @@ namespace OpenRA.Mods.RA.Render
mf.Animation.PlayThen("muzzle", () => isShowing = false);
}
public IEnumerable<Renderable> Render(Actor self)
public IEnumerable<Renderable> Render(Actor self, WorldRenderer wr)
{
foreach (var a in muzzleFlashes.Values)
if (a.DisableFunc == null || !a.DisableFunc())
yield return a.Image(self, PaletteReference.FromName("effect"));
yield return a.Image(self, wr.Palette("effect"));
}
public void Tick(Actor self)