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

Use a TerrainSpriteLayer for smudges.

Browse Source
This commit is contained in:
Paul Chote
2015-07-06 21:07:44 +01:00
parent fe41ee0346
commit ce4bdced47
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects; using OpenRA.Mods.Common.Effects;
@@ -37,7 +38,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new SmudgeLayer(init.Self, this); } public object Create(ActorInitializer init) { return new SmudgeLayer(init.Self, this); }
} }
public class SmudgeLayer : IRenderOverlay, IWorldLoaded, ITickRender public class SmudgeLayer : IRenderOverlay, IWorldLoaded, ITickRender, INotifyActorDisposing
{ {
struct Smudge struct Smudge
{ {
@@ -52,6 +53,8 @@ namespace OpenRA.Mods.Common.Traits
readonly Dictionary<string, Sprite[]> smudges = new Dictionary<string, Sprite[]>(); readonly Dictionary<string, Sprite[]> smudges = new Dictionary<string, Sprite[]>();
readonly World world; readonly World world;
TerrainSpriteLayer render;
public SmudgeLayer(Actor self, SmudgeLayerInfo info) public SmudgeLayer(Actor self, SmudgeLayerInfo info)
{ {
Info = info; Info = info;
@@ -68,6 +71,18 @@ namespace OpenRA.Mods.Common.Traits
public void WorldLoaded(World w, WorldRenderer wr) public void WorldLoaded(World w, WorldRenderer wr)
{ {
var first = smudges.First().Value.First();
var sheet = first.Sheet;
if (smudges.Values.Any(sprites => sprites.Any(s => s.Sheet != sheet)))
throw new InvalidDataException("Resource sprites span multiple sheets. Try loading their sequences earlier.");
var blendMode = first.BlendMode;
if (smudges.Values.Any(sprites => sprites.Any(s => s.BlendMode != blendMode)))
throw new InvalidDataException("Smudges specify different blend modes. "
+ "Try using different smudge types for smudges that use different blend modes.");
render = new TerrainSpriteLayer(w, wr, sheet, blendMode, wr.Palette(Info.Palette), wr.World.Type != WorldType.Editor);
// Add map smudges // Add map smudges
foreach (var s in w.Map.SmudgeDefinitions) foreach (var s in w.Map.SmudgeDefinitions)
{ {
@@ -90,6 +105,7 @@ namespace OpenRA.Mods.Common.Traits
}; };
tiles.Add(cell, smudge); tiles.Add(cell, smudge);
render.Update(cell, smudge.Sprite);
} }
} }
@@ -127,6 +143,8 @@ namespace OpenRA.Mods.Common.Traits
if (!self.World.FogObscures(kv.Key)) if (!self.World.FogObscures(kv.Key))
{ {
tiles[kv.Key] = kv.Value; tiles[kv.Key] = kv.Value;
render.Update(kv.Key, kv.Value.Sprite);
remove.Add(kv.Key); remove.Add(kv.Key);
} }
} }
@@ -137,19 +155,17 @@ namespace OpenRA.Mods.Common.Traits
public void Render(WorldRenderer wr) public void Render(WorldRenderer wr)
{ {
var pal = wr.Palette(Info.Palette); render.Draw(wr.Viewport);
}
foreach (var kv in tiles) bool disposed;
{ public void Disposing(Actor self)
if (!wr.Viewport.VisibleCellsInsideBounds.Contains(kv.Key)) {
continue; if (disposed)
return;
if (world.ShroudObscures(kv.Key)) render.Dispose();
continue; disposed = true;
new SpriteRenderable(kv.Value.Sprite, world.Map.CenterOfCell(kv.Key),
WVec.Zero, -511, pal, 1f, true).Render(wr); // TODO ZOffset is ignored
}
} }
} }
} }