Cache ProjectedCellBounds during load time

OpenRA.Game/Map/Map.cs

@@ -233,7 +233,7 @@ namespace OpenRA
 		public CellLayer<byte> Ramp { get; private set; }
 		public CellLayer<byte> CustomTerrain { get; private set; }
 
-		public ProjectedCellRegion ProjectedCellBounds { get; private set; }
+		public PPos[] ProjectedCells { get; private set; }
 		public CellRegion AllCells { get; private set; }
 		public List<CPos> AllEdgeCells { get; private set; }
 
@@ -822,6 +822,7 @@ namespace OpenRA
 			foreach (var puv in projectedCells)
 				if (!Contains(puv))
 					return false;
+
 			return true;
 		}
 
@@ -1017,7 +1018,8 @@ namespace OpenRA
 				ProjectedBottomRight = new WPos(br.U * 1024 - 1, (br.V + 1) * 1024 - 1, 0);
 			}
 
-			ProjectedCellBounds = new ProjectedCellRegion(this, tl, br);
+			// PERF: This enumeration isn't going to change during the game
+			ProjectedCells = new ProjectedCellRegion(this, tl, br).ToArray();
 		}
 
 		public void FixOpenAreas()

OpenRA.Game/Traits/Player/Shroud.cs

@@ -162,7 +162,7 @@ namespace OpenRA.Traits
 			if (OnShroudChanged == null)
 				return;
 
-			foreach (var puv in map.ProjectedCellBounds)
+			foreach (var puv in map.ProjectedCells)
 			{
 				if (!touched[puv])
 					continue;
@@ -298,7 +298,7 @@ namespace OpenRA.Traits
 			if (map.Bounds != s.map.Bounds)
 				throw new ArgumentException("The map bounds of these shrouds do not match.", "s");
 
-			foreach (var puv in map.ProjectedCellBounds)
+			foreach (var puv in map.ProjectedCells)
 			{
 				if (!explored[puv] && s.explored[puv])
 				{
@@ -310,7 +310,7 @@ namespace OpenRA.Traits
 
 		public void ExploreAll()
 		{
-			foreach (var puv in map.ProjectedCellBounds)
+			foreach (var puv in map.ProjectedCells)
 			{
 				if (!explored[puv])
 				{
@@ -322,7 +322,7 @@ namespace OpenRA.Traits
 
 		public void ResetExploration()
 		{
-			foreach (var puv in map.ProjectedCellBounds)
+			foreach (var puv in map.ProjectedCells)
 			{
 				touched[puv] = true;
 				explored[puv] = (visibleCount[puv] + passiveVisibleCount[puv]) > 0;

OpenRA.Mods.Common/Traits/RevealsMap.cs

@@ -49,8 +49,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		protected PPos[] ProjectedCells(Actor self)
 		{
-			var map = self.World.Map;
-			return map.ProjectedCellBounds.ToArray();
+			return self.World.Map.ProjectedCells;
 		}
 
 		void INotifyActorDisposing.Disposing(Actor self)

OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs

@@ -271,7 +271,7 @@ namespace OpenRA.Mods.Common.Traits
 			UpdateShroud(new ProjectedCellRegion(map, tl, br));
 		}
 
-		void UpdateShroud(ProjectedCellRegion region)
+		void UpdateShroud(IEnumerable<PPos> region)
 		{
 			foreach (var puv in region)
 			{
@@ -299,7 +299,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		void IRenderShroud.RenderShroud(WorldRenderer wr)
 		{
-			UpdateShroud(map.ProjectedCellBounds);
+			UpdateShroud(map.ProjectedCells);
 			fogLayer.Draw(wr.Viewport);
 			shroudLayer.Draw(wr.Viewport);
 		}

OpenRA.Mods.Common/Widgets/RadarWidget.cs

@@ -134,7 +134,7 @@ namespace OpenRA.Mods.Common.Widgets
 				if (newShroud != null)
 				{
 					newShroud.OnShroudChanged += UpdateShroudCell;
-					foreach (var puv in world.Map.ProjectedCellBounds)
+					foreach (var puv in world.Map.ProjectedCells)
 						UpdateShroudCell(puv);
 				}