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

Replace IOrderGenerator.RenderBeforeWorld with world-sorted .Render.

Browse Source 
Range circles have been moved to RenderAfterWorld for now.
This commit is contained in:
Paul Chote
2013-08-10 21:28:39 +12:00
parent b02fd0d002
commit 4754cbb768
21 changed files with 86 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
View File

@@ -140,20 +140,18 @@ namespace OpenRA.Mods.RA
{
var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos);
var targetUnits = power.UnitsInRange(xy);
foreach (var unit in targetUnits) {
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility()) {
foreach (var unit in targetUnits)
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility())
wr.DrawSelectionBox(unit, Color.Red);
}
}
}
public void RenderBeforeWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos);
var tiles = world.FindTilesInCircle(xy, range);
var pal = wr.Palette("terrain");
foreach (var t in tiles)
tile.DrawAt(t.ToPPos().ToFloat2(), pal);
yield return new SpriteRenderable(tile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);
}
public string GetCursor(World world, CPos xy, MouseInput mi)
@@ -221,25 +219,23 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr, World world)
{
foreach (var unit in power.UnitsInRange(sourceLocation)) {
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility()) {
foreach (var unit in power.UnitsInRange(sourceLocation))
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility())
wr.DrawSelectionBox(unit, Color.Red);
}
}
}
public void RenderBeforeWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos);
var pal = wr.Palette("terrain");
// Source tiles
foreach (var t in world.FindTilesInCircle(sourceLocation, range))
sourceTile.DrawAt(t.ToPPos().ToFloat2(), pal);
yield return new SpriteRenderable(sourceTile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);
// Destination tiles
foreach (var t in world.FindTilesInCircle(xy, range))
sourceTile.DrawAt(t.ToPPos().ToFloat2(), pal);
yield return new SpriteRenderable(sourceTile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);
// Unit previews
foreach (var unit in power.UnitsInRange(sourceLocation))
@@ -247,7 +243,7 @@ namespace OpenRA.Mods.RA
var offset = (xy - sourceLocation).ToWVec();
if (manager.self.Owner.Shroud.IsTargetable(unit))
foreach (var r in unit.Render(wr))
r.OffsetBy(offset).Render(wr);
yield return r.OffsetBy(offset);
}
// Unit tiles
@@ -259,7 +255,7 @@ namespace OpenRA.Mods.RA
var canEnter = ((manager.self.Owner.Shroud.IsExplored(targetCell) || manager.self.Owner.HasFogVisibility()) &&
unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell));
var tile = canEnter ? validTile : invalidTile;
tile.DrawAt(targetCell.ToPPos().ToFloat2(), pal);
yield return new SpriteRenderable(tile, targetCell.CenterPosition, WVec.Zero, -511, pal, 1f, true);
}
}
}
@@ -276,7 +272,8 @@ namespace OpenRA.Mods.RA
break;
}
}
if (!canTeleport) {
if (!canTeleport)
{
// Check the terrain types. This will allow chronoshifts to occur on empty terrain to terrain of
// a similar type. This also keeps the cursor from changing in non-visible property, alerting the
// chronoshifter of enemy unit presence

4
OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
View File

@@ -95,12 +95,12 @@ namespace OpenRA.Mods.RA
wr.DrawSelectionBox(unit, Color.Red);
}
public void RenderBeforeWorld(WorldRenderer wr, World world)
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos);
var pal = wr.Palette("terrain");
foreach (var t in world.FindTilesInCircle(xy, range))
tile.DrawAt(t.ToPPos().ToFloat2(), pal);
yield return new SpriteRenderable(tile, t.CenterPosition, WVec.Zero, -511, pal, 1f, true);
}
public string GetCursor(World world, CPos xy, MouseInput mi)

2
OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
View File

@@ -221,7 +221,7 @@ namespace OpenRA.Mods.RA
world.CancelInputMode();
}
public void RenderBeforeWorld(WorldRenderer wr, World world) { }
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
public void RenderAfterWorld(WorldRenderer wr, World world) { }
public string GetCursor(World world, CPos xy, MouseInput mi) { return world.Map.IsInMap(xy) ? cursor : "generic-blocked"; }
}