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

Draw order generator renderables above the shroud.

Browse Source
This commit is contained in:
Paul Chote
2016-08-22 18:38:25 +01:00
parent b016638ebe
commit d2f5fe7380
13 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.RA.Traits
CPos lastMousePos;
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
if (!minelayers.Any())
yield break;
@@ -194,7 +194,7 @@ namespace OpenRA.Mods.RA.Traits
var pal = wr.Palette(TileSet.TerrainPaletteInternalName);
foreach (var c in minefield)
{
var tile = movement.CanEnterCell(c, null, false) ? tileOk : tileBlocked;
var tile = movement.CanEnterCell(c, null, false) && !world.ShroudObscures(c) ? tileOk : tileBlocked;
yield return new SpriteRenderable(tile, world.Map.CenterOfCell(c),
WVec.Zero, -511, pal, 1f, true);
}

2
OpenRA.Mods.RA/Traits/PortableChrono.cs
View File

@@ -194,7 +194,7 @@ namespace OpenRA.Mods.RA.Traits
yield break;
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
if (!self.IsInWorld || self.Owner != self.World.LocalPlayer)
yield break;

45
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Mods.RA.Traits
world.CancelInputMode();
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var targetUnits = power.UnitsInRange(xy).Where(a => !world.FogObscures(a));
@@ -236,36 +236,19 @@ namespace OpenRA.Mods.RA.Traits
world.CancelInputMode();
}
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
{
foreach (var unit in power.UnitsInRange(sourceLocation))
if (manager.Self.Owner.CanTargetActor(unit))
yield return new SelectionBoxRenderable(unit, Color.Red);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
var palette = wr.Palette(power.Info.IconPalette);
// Source tiles
foreach (var t in world.Map.FindTilesInCircle(sourceLocation, range))
yield return new SpriteRenderable(sourceTile, wr.World.Map.CenterOfCell(t), WVec.Zero, -511, palette, 1f, true);
// Destination tiles
foreach (var t in world.Map.FindTilesInCircle(xy, range))
yield return new SpriteRenderable(sourceTile, wr.World.Map.CenterOfCell(t), WVec.Zero, -511, palette, 1f, true);
// Unit previews
foreach (var unit in power.UnitsInRange(sourceLocation))
{
var offset = world.Map.CenterOfCell(xy) - world.Map.CenterOfCell(sourceLocation);
if (manager.Self.Owner.CanTargetActor(unit))
foreach (var r in unit.Render(wr))
yield return r.OffsetBy(offset);
var tile = manager.Self.Owner.Shroud.IsExplored(t) ? validTile : invalidTile;
yield return new SpriteRenderable(tile, wr.World.Map.CenterOfCell(t), WVec.Zero, -511, palette, 1f, true);
}
// Unit tiles
// Unit previews
foreach (var unit in power.UnitsInRange(sourceLocation))
{
if (manager.Self.Owner.CanTargetActor(unit))
@@ -276,7 +259,25 @@ namespace OpenRA.Mods.RA.Traits
var tile = canEnter ? validTile : invalidTile;
yield return new SpriteRenderable(tile, wr.World.Map.CenterOfCell(targetCell), WVec.Zero, -511, palette, 1f, true);
}
var offset = world.Map.CenterOfCell(xy) - world.Map.CenterOfCell(sourceLocation);
if (manager.Self.Owner.CanTargetActor(unit))
foreach (var r in unit.Render(wr))
yield return r.OffsetBy(offset);
}
foreach (var unit in power.UnitsInRange(sourceLocation))
if (manager.Self.Owner.CanTargetActor(unit))
yield return new SelectionBoxRenderable(unit, Color.Red);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var palette = wr.Palette(power.Info.IconPalette);
// Source tiles
foreach (var t in world.Map.FindTilesInCircle(sourceLocation, range))
yield return new SpriteRenderable(sourceTile, wr.World.Map.CenterOfCell(t), WVec.Zero, -511, palette, 1f, true);
}
bool IsValidTarget(CPos xy)