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

Add FrozenActorLayer.FrozenActorsInRegion.

Browse Source
This commit is contained in:
Paul Chote
2017-12-10 16:56:54 +00:00
committed by abcdefg30
parent b221787350
commit b9e03ac009
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -182,6 +182,7 @@ namespace OpenRA.Traits
readonly SpatiallyPartitioned<uint> partitionedFrozenActorIds; readonly SpatiallyPartitioned<uint> partitionedFrozenActorIds;
readonly bool[] dirtyBins; readonly bool[] dirtyBins;
readonly HashSet<uint> dirtyFrozenActorIds = new HashSet<uint>(); readonly HashSet<uint> dirtyFrozenActorIds = new HashSet<uint>();
readonly int rows, cols;
public FrozenActorLayer(Actor self, FrozenActorLayerInfo info) public FrozenActorLayer(Actor self, FrozenActorLayerInfo info)
{ {
@@ -195,16 +196,17 @@ namespace OpenRA.Traits
// expensive visibility update for frozen actors in these regions. // expensive visibility update for frozen actors in these regions.
partitionedFrozenActorIds = new SpatiallyPartitioned<uint>( partitionedFrozenActorIds = new SpatiallyPartitioned<uint>(
world.Map.MapSize.X, world.Map.MapSize.Y, binSize); world.Map.MapSize.X, world.Map.MapSize.Y, binSize);
var maxX = world.Map.MapSize.X / binSize + 1;
var maxY = world.Map.MapSize.Y / binSize + 1; cols = world.Map.MapSize.X / binSize + 1;
dirtyBins = new bool[maxX * maxY]; rows = world.Map.MapSize.Y / binSize + 1;
dirtyBins = new bool[cols * rows];
self.Trait<Shroud>().CellsChanged += cells => self.Trait<Shroud>().CellsChanged += cells =>
{ {
foreach (var cell in cells) foreach (var cell in cells)
{ {
var x = cell.U / binSize; var x = cell.U / binSize;
var y = cell.V / binSize; var y = cell.V / binSize;
dirtyBins[y * maxX + x] = true; dirtyBins[y * cols + x] = true;
} }
}; };
} }
@@ -281,14 +283,13 @@ namespace OpenRA.Traits
{ {
// Check which bins on the map were dirtied due to changes in the shroud and gather the frozen actors whose // Check which bins on the map were dirtied due to changes in the shroud and gather the frozen actors whose
// footprint overlap with these bins. // footprint overlap with these bins.
var maxX = world.Map.MapSize.X / binSize + 1; for (var y = 0; y < rows; y++)
var maxY = world.Map.MapSize.Y / binSize + 1;
for (var y = 0; y < maxY; y++)
{ {
for (var x = 0; x < maxX; x++) for (var x = 0; x < cols; x++)
{ {
if (!dirtyBins[y * maxX + x]) if (!dirtyBins[y * cols + x])
continue; continue;
var box = new Rectangle(x * binSize, y * binSize, binSize, binSize); var box = new Rectangle(x * binSize, y * binSize, binSize, binSize);
dirtyFrozenActorIds.UnionWith(partitionedFrozenActorIds.InBox(box)); dirtyFrozenActorIds.UnionWith(partitionedFrozenActorIds.InBox(box));
} }
@@ -318,5 +319,12 @@ namespace OpenRA.Traits
return fa; return fa;
} }
public IEnumerable<FrozenActor> FrozenActorsInRegion(CellRegion region)
{
var tl = region.TopLeft;
var br = region.BottomRight;
return partitionedFrozenActorIds.InBox(Rectangle.FromLTRB(tl.X, tl.Y, br.X, br.Y)).Select(FromID);
}
} }
} }