From 86ba26e013db660905e9ce2c13316a724538d6da Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 1 Apr 2015 20:03:51 +0100 Subject: [PATCH] Convert shroud calculations and rendering to PPos. --- OpenRA.Game/Traits/Player/FrozenActorLayer.cs | 4 +- OpenRA.Game/Traits/World/Shroud.cs | 156 ++++++++++-------- OpenRA.Game/World.cs | 29 +--- OpenRA.Mods.Common/Traits/CreatesShroud.cs | 2 +- .../Traits/Modifiers/FrozenUnderFog.cs | 6 +- OpenRA.Mods.Common/Traits/RevealsShroud.cs | 32 ++-- .../Traits/World/MPStartLocations.cs | 4 +- .../Traits/World/ShroudRenderer.cs | 63 +++---- .../Traits/World/TerrainGeometryOverlay.cs | 3 + OpenRA.Mods.Common/Widgets/RadarWidget.cs | 27 +-- 10 files changed, 161 insertions(+), 165 deletions(-) diff --git a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs index b1330efcae..d68bcb0d33 100644 --- a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs +++ b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs @@ -24,7 +24,7 @@ namespace OpenRA.Traits public class FrozenActor { - public readonly MPos[] Footprint; + public readonly PPos[] Footprint; public readonly WPos CenterPosition; public readonly Rectangle Bounds; readonly Actor actor; @@ -42,7 +42,7 @@ namespace OpenRA.Traits public bool NeedRenderables; public bool IsRendering { get; private set; } - public FrozenActor(Actor self, MPos[] footprint, Shroud shroud) + public FrozenActor(Actor self, PPos[] footprint, Shroud shroud) { actor = self; this.shroud = shroud; diff --git a/OpenRA.Game/Traits/World/Shroud.cs b/OpenRA.Game/Traits/World/Shroud.cs index dec63f0282..de47db980d 100644 --- a/OpenRA.Game/Traits/World/Shroud.cs +++ b/OpenRA.Game/Traits/World/Shroud.cs @@ -24,7 +24,7 @@ namespace OpenRA.Traits { [Sync] public bool Disabled; - public event Action> CellsChanged; + public event Action> CellsChanged; readonly Actor self; readonly Map map; @@ -35,15 +35,15 @@ namespace OpenRA.Traits // Cache of visibility that was added, so no matter what crazy trait code does, it // can't make us invalid. - readonly Dictionary visibility = new Dictionary(); - readonly Dictionary generation = new Dictionary(); + readonly Dictionary visibility = new Dictionary(); + readonly Dictionary generation = new Dictionary(); public int Hash { get; private set; } - static readonly Func TruthPredicate = _ => true; - readonly Func shroudEdgeTest; - readonly Func isExploredTest; - readonly Func isVisibleTest; + static readonly Func TruthPredicate = _ => true; + readonly Func shroudEdgeTest; + readonly Func isExploredTest; + readonly Func isVisibleTest; public Shroud(Actor self) { @@ -55,11 +55,12 @@ namespace OpenRA.Traits explored = new CellLayer(map); shroudEdgeTest = map.Contains; - isExploredTest = IsExploredCore; - isVisibleTest = IsVisibleCore; + + isExploredTest = IsExplored; + isVisibleTest = IsVisible; } - void Invalidate(IEnumerable changed) + void Invalidate(IEnumerable changed) { if (CellsChanged != null) CellsChanged(changed); @@ -72,35 +73,38 @@ namespace OpenRA.Traits Hash += 1; } - public static IEnumerable CellsInRange(Map map, WPos pos, WDist range) + public static IEnumerable ProjectedCellsInRange(Map map, WPos pos, WDist range) { - var r = (range.Length + 1023) / 1024; + // Account for potential extra half-cell from odd-height terrain + var r = (range.Length + 1023 + 512) / 1024; var limit = range.LengthSquared; - var cell = map.CellContaining(pos); - foreach (var c in map.FindTilesInCircle(cell, r, true)) - if ((map.CenterOfCell(c) - pos).HorizontalLengthSquared <= limit) - yield return c; + // Project actor position into the shroud plane + var projectedPos = pos - new WVec(0, pos.Z, pos.Z); + var projectedCell = map.CellContaining(projectedPos); + + foreach (var c in map.FindTilesInCircle(projectedCell, r, true)) + if ((map.CenterOfCell(c) - projectedPos).HorizontalLengthSquared <= limit) + yield return (PPos)c.ToMPos(map); } - public static IEnumerable CellsInRange(Map map, CPos cell, WDist range) + public static IEnumerable ProjectedCellsInRange(Map map, CPos cell, WDist range) { - return CellsInRange(map, map.CenterOfCell(cell), range); + return ProjectedCellsInRange(map, map.CenterOfCell(cell), range); } - public void AddVisibility(Actor a, CPos[] visible) + public void AddProjectedVisibility(Actor a, PPos[] visible) { if (!a.Owner.IsAlliedWith(self.Owner)) return; - foreach (var c in visible) + foreach (var puv in visible) { - var uv = c.ToMPos(map); - // Force cells outside the visible bounds invisible - if (!map.Contains(uv)) + if (!map.Contains(puv)) continue; + var uv = (MPos)puv; visibleCount[uv]++; explored[uv] = true; } @@ -114,28 +118,28 @@ namespace OpenRA.Traits public void RemoveVisibility(Actor a) { - CPos[] visible; + PPos[] visible; if (!visibility.TryGetValue(a, out visible)) return; - foreach (var c in visible) + foreach (var puv in visible) { // Cells outside the visible bounds don't increment visibleCount - if (map.Contains(c)) - visibleCount[c.ToMPos(map)]--; + if (map.Contains(puv)) + visibleCount[(MPos)puv]--; } visibility.Remove(a); Invalidate(visible); } - public void AddShroudGeneration(Actor a, CPos[] shrouded) + public void AddProjectedShroudGeneration(Actor a, PPos[] shrouded) { if (a.Owner.IsAlliedWith(self.Owner)) return; - foreach (var c in shrouded) - generatedShroudCount[c]++; + foreach (var uv in shrouded) + generatedShroudCount[(MPos)uv]++; if (generation.ContainsKey(a)) throw new InvalidOperationException("Attempting to add duplicate shroud generation"); @@ -146,12 +150,12 @@ namespace OpenRA.Traits public void RemoveShroudGeneration(Actor a) { - CPos[] shrouded; + PPos[] shrouded; if (!generation.TryGetValue(a, out shrouded)) return; - foreach (var c in shrouded) - generatedShroudCount[c]--; + foreach (var uv in shrouded) + generatedShroudCount[(MPos)uv]--; generation.Remove(a); Invalidate(shrouded); @@ -164,34 +168,35 @@ namespace OpenRA.Traits foreach (var a in w.Actors.Where(a => a.Owner == player)) { - CPos[] visible = null; - CPos[] shrouded = null; + PPos[] visible = null; + PPos[] shrouded = null; foreach (var p in self.World.Players) { if (p.Shroud.visibility.TryGetValue(self, out visible)) { p.Shroud.RemoveVisibility(self); - p.Shroud.AddVisibility(self, visible); + p.Shroud.AddProjectedVisibility(self, visible); } if (p.Shroud.generation.TryGetValue(self, out shrouded)) { p.Shroud.RemoveShroudGeneration(self); - p.Shroud.AddShroudGeneration(self, shrouded); + p.Shroud.AddProjectedShroudGeneration(self, shrouded); } } } } - public void Explore(World world, IEnumerable cells) + public void ExploreProjectedCells(World world, IEnumerable cells) { - var changed = new HashSet(); - foreach (var c in cells) + var changed = new HashSet(); + foreach (var puv in cells) { - if (!explored[c]) + var uv = (MPos)puv; + if (!explored[uv]) { - explored[c] = true; - changed.Add(c); + explored[uv] = true; + changed.Add(puv); } } @@ -203,13 +208,14 @@ namespace OpenRA.Traits if (map.Bounds != s.map.Bounds) throw new ArgumentException("The map bounds of these shrouds do not match.", "s"); - var changed = new List(); - foreach (var uv in map.ProjectedCellBounds.CandidateMapCoords) + var changed = new List(); + foreach (var puv in map.ProjectedCellBounds) { + var uv = (MPos)puv; if (!explored[uv] && s.explored[uv]) { explored[uv] = true; - changed.Add(uv.ToCPos(map)); + changed.Add(puv); } } @@ -218,13 +224,14 @@ namespace OpenRA.Traits public void ExploreAll(World world) { - var changed = new List(); - foreach (var uv in map.ProjectedCellBounds.CandidateMapCoords) + var changed = new List(); + foreach (var puv in map.ProjectedCellBounds) { + var uv = (MPos)puv; if (!explored[uv]) { explored[uv] = true; - changed.Add(uv.ToCPos(map)); + changed.Add(puv); } } @@ -233,14 +240,15 @@ namespace OpenRA.Traits public void ResetExploration() { - var changed = new List(); - foreach (var uv in map.ProjectedCellBounds.CandidateMapCoords) + var changed = new List(); + foreach (var puv in map.ProjectedCellBounds) { + var uv = (MPos)puv; var visible = visibleCount[uv] > 0; if (explored[uv] != visible) { explored[uv] = visible; - changed.Add(uv.ToCPos(map)); + changed.Add(puv); } } @@ -249,7 +257,7 @@ namespace OpenRA.Traits public bool IsExplored(WPos pos) { - return IsExplored(map.CellContaining(pos)); + return IsExplored(map.ProjectedCellCovering(pos)); } public bool IsExplored(CPos cell) @@ -262,25 +270,26 @@ namespace OpenRA.Traits if (!map.Contains(uv)) return false; + return map.ProjectedCellsCovering(uv).Any(isExploredTest); + } + + public bool IsExplored(PPos puv) + { if (!ShroudEnabled) return true; - return IsExploredCore(uv); + var uv = (MPos)puv; + return explored.Contains(uv) && explored[uv] && (generatedShroudCount[uv] == 0 || visibleCount[uv] > 0); } bool ShroudEnabled { get { return !Disabled && self.World.LobbyInfo.GlobalSettings.Shroud; } } - bool IsExploredCore(MPos uv) - { - return explored[uv] && (generatedShroudCount[uv] == 0 || visibleCount[uv] > 0); - } - /// /// Returns a fast exploration lookup that skips the usual validation. /// The return value should not be cached across ticks, and should not /// be called with cells outside the map bounds. /// - public Func IsExploredTest + public Func IsExploredTest { get { @@ -294,39 +303,40 @@ namespace OpenRA.Traits public bool IsVisible(WPos pos) { - return IsVisible(map.CellContaining(pos)); + return IsVisible(map.ProjectedCellCovering(pos)); } public bool IsVisible(CPos cell) { - var uv = cell.ToMPos(map); - return IsVisible(uv); + return IsVisible(cell.ToMPos(map)); } public bool IsVisible(MPos uv) { - if (!map.Contains(uv)) + if (!visibleCount.Contains(uv)) return false; + return map.ProjectedCellsCovering(uv).Any(isVisibleTest); + } + + // In internal shroud coords + public bool IsVisible(PPos puv) + { if (!FogEnabled) return true; - return IsVisibleCore(uv); + var uv = (MPos)puv; + return visibleCount.Contains(uv) && visibleCount[uv] > 0; } bool FogEnabled { get { return !Disabled && self.World.LobbyInfo.GlobalSettings.Fog; } } - bool IsVisibleCore(MPos uv) - { - return visibleCount[uv] > 0; - } - /// /// Returns a fast visibility lookup that skips the usual validation. /// The return value should not be cached across ticks, and should not /// be called with cells outside the map bounds. /// - public Func IsVisibleTest + public Func IsVisibleTest { get { @@ -339,11 +349,11 @@ namespace OpenRA.Traits } } - public bool Contains(MPos uv) + public bool Contains(PPos uv) { // Check that uv is inside the map area. There is nothing special // about explored here: any of the CellLayers would have been suitable. - return explored.Contains(uv); + return explored.Contains((MPos)uv); } } } diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs index 35aa9974bf..94ce263507 100644 --- a/OpenRA.Game/World.cs +++ b/OpenRA.Game/World.cs @@ -33,7 +33,6 @@ namespace OpenRA public int Compare(Actor x, Actor y) { return x.ActorID.CompareTo(y.ActorID); } } - static readonly Func FalsePredicate = _ => false; internal readonly TraitDictionary TraitDict = new TraitDictionary(); readonly SortedSet actors = new SortedSet(ActorIDComparer.Instance); readonly List effects = new List(); @@ -78,33 +77,7 @@ namespace OpenRA public bool FogObscures(WPos pos) { return RenderPlayer != null && !RenderPlayer.Shroud.IsVisible(pos); } public bool ShroudObscures(CPos p) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(p); } public bool ShroudObscures(WPos pos) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(pos); } - public bool ShroudObscures(MPos uv) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(uv); } - - public Func FogObscuresTest - { - get - { - var rp = RenderPlayer; - if (rp == null) - return FalsePredicate; - - var predicate = rp.Shroud.IsVisibleTest; - return uv => !predicate(uv); - } - } - - public Func ShroudObscuresTest - { - get - { - var rp = RenderPlayer; - if (rp == null) - return FalsePredicate; - - var predicate = rp.Shroud.IsExploredTest; - return uv => !predicate(uv); - } - } + public bool ShroudObscures(PPos uv) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(uv); } public bool IsReplay { diff --git a/OpenRA.Mods.Common/Traits/CreatesShroud.cs b/OpenRA.Mods.Common/Traits/CreatesShroud.cs index 862a599175..f00d0143b3 100644 --- a/OpenRA.Mods.Common/Traits/CreatesShroud.cs +++ b/OpenRA.Mods.Common/Traits/CreatesShroud.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits public CreatesShroud(Actor self, CreatesShroudInfo info) : base(self, info) { - addCellsToPlayerShroud = (p, c) => p.Shroud.AddShroudGeneration(self, c); + addCellsToPlayerShroud = (p, uv) => p.Shroud.AddProjectedShroudGeneration(self, uv); removeCellsFromPlayerShroud = p => p.Shroud.RemoveShroudGeneration(self); isDisabled = () => self.IsDisabled(); } diff --git a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs index e911a02c7e..60728770d9 100644 --- a/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs +++ b/OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits readonly FrozenUnderFogInfo info; readonly bool startsRevealed; - readonly MPos[] footprint; + readonly PPos[] footprint; readonly Lazy tooltip; readonly Lazy health; @@ -47,10 +47,12 @@ namespace OpenRA.Mods.Common.Traits { this.info = info; + var map = init.World.Map; + // Spawned actors (e.g. building husks) shouldn't be revealed startsRevealed = info.StartsRevealed && !init.Contains(); var footprintCells = FootprintUtils.Tiles(init.Self).ToList(); - footprint = footprintCells.Select(cell => cell.ToMPos(init.World.Map)).ToArray(); + footprint = footprintCells.SelectMany(c => map.ProjectedCellsCovering(c.ToMPos(map))).ToArray(); tooltip = Exts.Lazy(() => init.Self.TraitsImplementing().FirstOrDefault()); health = Exts.Lazy(() => init.Self.TraitOrDefault()); diff --git a/OpenRA.Mods.Common/Traits/RevealsShroud.cs b/OpenRA.Mods.Common/Traits/RevealsShroud.cs index 1ae7491b6b..535e710ff2 100644 --- a/OpenRA.Mods.Common/Traits/RevealsShroud.cs +++ b/OpenRA.Mods.Common/Traits/RevealsShroud.cs @@ -27,14 +27,14 @@ namespace OpenRA.Mods.Common.Traits public class RevealsShroud : ITick, ISync, INotifyAddedToWorld, INotifyRemovedFromWorld { - static readonly CPos[] NoCells = { }; + static readonly PPos[] NoCells = { }; readonly RevealsShroudInfo info; readonly bool lobbyShroudFogDisabled; [Sync] CPos cachedLocation; [Sync] bool cachedDisabled; - protected Action addCellsToPlayerShroud; + protected Action addCellsToPlayerShroud; protected Action removeCellsFromPlayerShroud; protected Func isDisabled; @@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Traits this.info = info; lobbyShroudFogDisabled = !self.World.LobbyInfo.GlobalSettings.Shroud && !self.World.LobbyInfo.GlobalSettings.Fog; - addCellsToPlayerShroud = (p, c) => p.Shroud.AddVisibility(self, c); + addCellsToPlayerShroud = (p, uv) => p.Shroud.AddProjectedVisibility(self, uv); removeCellsFromPlayerShroud = p => p.Shroud.RemoveVisibility(self); isDisabled = () => false; } - CPos[] Cells(Actor self) + PPos[] ProjectedCells(Actor self) { var map = self.World.Map; var range = Range; @@ -57,10 +57,10 @@ namespace OpenRA.Mods.Common.Traits if (info.Type == VisibilityType.Footprint) return self.OccupiesSpace.OccupiedCells() - .SelectMany(kv => Shroud.CellsInRange(map, kv.First, range)) - .Distinct().ToArray(); + .SelectMany(kv => Shroud.ProjectedCellsInRange(map, kv.First, range)) + .Distinct().ToArray(); - return Shroud.CellsInRange(map, self.CenterPosition, range) + return Shroud.ProjectedCellsInRange(map, self.CenterPosition, range) .ToArray(); } @@ -69,15 +69,18 @@ namespace OpenRA.Mods.Common.Traits if (lobbyShroudFogDisabled || !self.IsInWorld) return; - var location = self.Location; + var centerPosition = self.CenterPosition; + var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z); + var projectedLocation = self.World.Map.CellContaining(projectedPos); var disabled = isDisabled(); - if (cachedLocation == location && cachedDisabled == disabled) + + if (cachedLocation == projectedLocation && cachedDisabled == disabled) return; - cachedLocation = location; + cachedLocation = projectedLocation; cachedDisabled = disabled; - var cells = Cells(self); + var cells = ProjectedCells(self); foreach (var p in self.World.Players) { removeCellsFromPlayerShroud(p); @@ -87,10 +90,11 @@ namespace OpenRA.Mods.Common.Traits public void AddedToWorld(Actor self) { - cachedLocation = self.Location; + var centerPosition = self.CenterPosition; + var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z); + cachedLocation = self.World.Map.CellContaining(projectedPos); cachedDisabled = isDisabled(); - - var cells = Cells(self); + var cells = ProjectedCells(self); foreach (var p in self.World.Players) addCellsToPlayerShroud(p, cells); } diff --git a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs index 08d940b4ec..4779337a7a 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs +++ b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs @@ -64,10 +64,10 @@ namespace OpenRA.Mods.Common.Traits var map = world.Map; foreach (var p in Start.Keys) { - var cells = Shroud.CellsInRange(map, Start[p], info.InitialExploreRange); + var cells = Shroud.ProjectedCellsInRange(map, Start[p], info.InitialExploreRange); foreach (var q in world.Players) if (p.IsAlliedWith(q)) - q.Shroud.Explore(world, cells); + q.Shroud.ExploreProjectedCells(world, cells); } // Set viewport diff --git a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs index 05f4e608c8..e948a68034 100644 --- a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs +++ b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs @@ -91,11 +91,11 @@ namespace OpenRA.Mods.Common.Traits readonly CellLayer tileInfos; readonly Sprite[] fogSprites, shroudSprites; - readonly HashSet cellsDirty = new HashSet(); - readonly HashSet cellsAndNeighborsDirty = new HashSet(); + readonly HashSet cellsDirty = new HashSet(); + readonly HashSet cellsAndNeighborsDirty = new HashSet(); Shroud currentShroud; - Func visibleUnderShroud, visibleUnderFog; + Func visibleUnderShroud, visibleUnderFog; TerrainSpriteLayer shroudLayer, fogLayer; public ShroudRenderer(World world, ShroudRendererInfo info) @@ -158,20 +158,22 @@ namespace OpenRA.Mods.Common.Traits // This includes the region outside the visible area to cover any sprites peeking outside the map foreach (var uv in w.Map.AllCells.MapCoords) { - var screen = wr.ScreenPosition(w.Map.CenterOfCell(uv.ToCPos(map))); + var pos = w.Map.CenterOfCell(uv.ToCPos(map)); + var screen = wr.ScreenPosition(pos - new WVec(0, 0, pos.Z)); var variant = (byte)Game.CosmeticRandom.Next(info.ShroudVariants.Length); tileInfos[uv] = new TileInfo(screen, variant); } - DirtyCells(map.AllCells); + // Dirty the whole projected space + DirtyCells(map.AllCells.MapCoords.Select(uv => (PPos)uv)); // All tiles are visible in the editor if (w.Type == WorldType.Editor) visibleUnderShroud = _ => true; else - visibleUnderShroud = map.Contains; + visibleUnderShroud = puv => map.Contains(puv); - visibleUnderFog = map.Contains; + visibleUnderFog = puv => map.Contains(puv); var shroudSheet = shroudSprites[0].Sheet; if (shroudSprites.Any(s => s.Sheet != shroudSheet)) @@ -193,25 +195,25 @@ namespace OpenRA.Mods.Common.Traits fogLayer = new TerrainSpriteLayer(w, wr, fogSheet, fogBlend, wr.Palette(info.FogPalette), false); } - Edges GetEdges(MPos uv, Func isVisible) + Edges GetEdges(PPos puv, Func isVisible) { - if (!isVisible(uv)) + if (!isVisible(puv)) return notVisibleEdges; - var cell = uv.ToCPos(map); + var cell = ((MPos)puv).ToCPos(map); // If a side is shrouded then we also count the corners. var edge = Edges.None; - if (!isVisible((cell + new CVec(0, -1)).ToMPos(map))) edge |= Edges.Top; - if (!isVisible((cell + new CVec(1, 0)).ToMPos(map))) edge |= Edges.Right; - if (!isVisible((cell + new CVec(0, 1)).ToMPos(map))) edge |= Edges.Bottom; - if (!isVisible((cell + new CVec(-1, 0)).ToMPos(map))) edge |= Edges.Left; + if (!isVisible((PPos)(cell + new CVec(0, -1)).ToMPos(map))) edge |= Edges.Top; + if (!isVisible((PPos)(cell + new CVec(1, 0)).ToMPos(map))) edge |= Edges.Right; + if (!isVisible((PPos)(cell + new CVec(0, 1)).ToMPos(map))) edge |= Edges.Bottom; + if (!isVisible((PPos)(cell + new CVec(-1, 0)).ToMPos(map))) edge |= Edges.Left; var ucorner = edge & Edges.AllCorners; - if (!isVisible((cell + new CVec(-1, -1)).ToMPos(map))) edge |= Edges.TopLeft; - if (!isVisible((cell + new CVec(1, -1)).ToMPos(map))) edge |= Edges.TopRight; - if (!isVisible((cell + new CVec(1, 1)).ToMPos(map))) edge |= Edges.BottomRight; - if (!isVisible((cell + new CVec(-1, 1)).ToMPos(map))) edge |= Edges.BottomLeft; + if (!isVisible((PPos)(cell + new CVec(-1, -1)).ToMPos(map))) edge |= Edges.TopLeft; + if (!isVisible((PPos)(cell + new CVec(1, -1)).ToMPos(map))) edge |= Edges.TopRight; + if (!isVisible((PPos)(cell + new CVec(1, 1)).ToMPos(map))) edge |= Edges.BottomRight; + if (!isVisible((PPos)(cell + new CVec(-1, 1)).ToMPos(map))) edge |= Edges.BottomLeft; // RA provides a set of frames for tiles with shrouded // corners but unshrouded edges. We want to detect this @@ -222,7 +224,7 @@ namespace OpenRA.Mods.Common.Traits return info.UseExtendedIndex ? edge ^ ucorner : edge & Edges.AllCorners; } - void DirtyCells(IEnumerable cells) + void DirtyCells(IEnumerable cells) { cellsDirty.UnionWith(cells); } @@ -244,38 +246,37 @@ namespace OpenRA.Mods.Common.Traits } else { - visibleUnderShroud = map.Contains; - visibleUnderFog = map.Contains; + visibleUnderShroud = puv => map.Contains(puv); + visibleUnderFog = puv => map.Contains(puv); } currentShroud = shroud; - var dirty = map.ProjectedCellBounds - .SelectMany(puv => map.Unproject(puv).Select(uv => uv.ToCPos(map))); - DirtyCells(dirty); + DirtyCells(map.ProjectedCellBounds); } // We need to update newly dirtied areas of the shroud. // Expand the dirty area to cover the neighboring cells, since shroud is affected by neighboring cells. - foreach (var cell in cellsDirty) + foreach (var uv in cellsDirty) { - cellsAndNeighborsDirty.Add(cell); + cellsAndNeighborsDirty.Add(uv); + var cell = ((MPos)uv).ToCPos(map); foreach (var direction in CVec.Directions) - cellsAndNeighborsDirty.Add(cell + direction); + cellsAndNeighborsDirty.Add((PPos)(cell + direction).ToMPos(map)); } - foreach (var cell in cellsAndNeighborsDirty) + foreach (var puv in cellsAndNeighborsDirty) { - var uv = cell.ToMPos(map.TileShape); + var uv = (MPos)puv; if (!tileInfos.Contains(uv)) continue; var tileInfo = tileInfos[uv]; - var shroudSprite = GetSprite(shroudSprites, GetEdges(uv, visibleUnderShroud), tileInfo.Variant); + var shroudSprite = GetSprite(shroudSprites, GetEdges(puv, visibleUnderShroud), tileInfo.Variant); var shroudPos = tileInfo.ScreenPosition; if (shroudSprite != null) shroudPos += shroudSprite.Offset - 0.5f * shroudSprite.Size; - var fogSprite = GetSprite(fogSprites, GetEdges(uv, visibleUnderFog), tileInfo.Variant); + var fogSprite = GetSprite(fogSprites, GetEdges(puv, visibleUnderFog), tileInfo.Variant); var fogPos = tileInfo.ScreenPosition; if (fogSprite != null) fogPos += fogSprite.Offset - 0.5f * fogSprite.Size; diff --git a/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs index b2eb65b127..d801f44fb6 100644 --- a/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs +++ b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs @@ -59,6 +59,9 @@ namespace OpenRA.Mods.Common.Traits foreach (var uv in wr.Viewport.AllVisibleCells.CandidateMapCoords) { + if (!map.MapHeight.Value.Contains(uv)) + continue; + var height = (int)map.MapHeight.Value[uv]; var tile = map.MapTiles.Value[uv]; var ti = tileSet.GetTileInfo(tile); diff --git a/OpenRA.Mods.Common/Widgets/RadarWidget.cs b/OpenRA.Mods.Common/Widgets/RadarWidget.cs index 742e02b0a5..02c27ac013 100644 --- a/OpenRA.Mods.Common/Widgets/RadarWidget.cs +++ b/OpenRA.Mods.Common/Widgets/RadarWidget.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Widgets readonly WorldRenderer worldRenderer; readonly RadarPings radarPings; - readonly HashSet dirtyShroudCells = new HashSet(); + readonly HashSet dirtyShroudCells = new HashSet(); float radarMinimapHeight; int frame; @@ -120,35 +120,38 @@ namespace OpenRA.Mods.Common.Widgets } } - void UpdateShroudCell(CPos cell) + void UpdateShroudCell(PPos projectedCell) { - if (!world.Map.Contains(cell)) + if (!world.Map.Bounds.Contains(projectedCell.U, projectedCell.V)) return; var stride = radarSheet.Size.Width; - var uv = cell.ToMPos(world.Map); var dx = shroudSprite.Bounds.Left - world.Map.Bounds.Left; var dy = shroudSprite.Bounds.Top - world.Map.Bounds.Top; var color = 0; - if (world.ShroudObscures(cell)) - color = Color.Black.ToArgb(); - else if (world.FogObscures(cell)) - color = Color.FromArgb(128, Color.Black).ToArgb(); + var rp = world.RenderPlayer; + if (rp != null) + { + if (!rp.Shroud.IsExplored(projectedCell)) + color = Color.Black.ToArgb(); + else if (!rp.Shroud.IsVisible(projectedCell)) + color = Color.FromArgb(128, Color.Black).ToArgb(); + } unsafe { fixed (byte* colorBytes = &radarData[0]) { var colors = (int*)colorBytes; - colors[(uv.V + dy) * stride + uv.U + dx] = color; + colors[(projectedCell.V + dy) * stride + projectedCell.U + dx] = color; } } } - void MarkShroudDirty(IEnumerable cellsChanged) + void MarkShroudDirty(IEnumerable projectedCellsChanged) { - dirtyShroudCells.UnionWith(cellsChanged); + dirtyShroudCells.UnionWith(projectedCellsChanged); } public override string GetCursor(int2 pos) @@ -290,7 +293,7 @@ namespace OpenRA.Mods.Common.Widgets if (newRenderShroud != null) { // Redraw the full shroud sprite - MarkShroudDirty(world.Map.AllCells); + MarkShroudDirty(world.Map.AllCells.MapCoords.Select(uv => (PPos)uv)); // Update the notification binding newRenderShroud.CellsChanged += MarkShroudDirty;