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

fix perf of floodfill in editor

Browse Source
This commit is contained in:
Chris Forbes
2010-12-05 11:31:24 +13:00
parent 5617465294
commit 2618a7dadc
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Editor/Surface.cs
View File

@@ -143,6 +143,16 @@ namespace OpenRA.Editor
{ {
var queue = new Queue<int2>(); var queue = new Queue<int2>();
var replace = Map.MapTiles[pos.X, pos.Y]; var replace = Map.MapTiles[pos.X, pos.Y];
var touched = new bool[Map.MapSize.X, Map.MapSize.Y];
Action<int, int> MaybeEnqueue = (x, y) =>
{
if (Map.IsInMap(x, y) && !touched[x, y])
{
queue.Enqueue(new int2(x, y));
touched[x, y] = true;
}
};
queue.Enqueue(pos); queue.Enqueue(pos);
while (queue.Count > 0) while (queue.Count > 0)
@@ -157,10 +167,10 @@ namespace OpenRA.Editor
for (var x = a.X; x <= b.X; x++) for (var x = a.X; x <= b.X; x++)
{ {
Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 }; Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 };
if (Map.MapTiles[x, p.Y - 1].Equals(replace) && Map.IsInMap(x, p.Y - 1)) if (Map.MapTiles[x, p.Y - 1].Equals(replace))
queue.Enqueue(new int2(x, p.Y - 1)); MaybeEnqueue(x, p.Y - 1);
if (Map.MapTiles[x, p.Y + 1].Equals(replace) && Map.IsInMap(x, p.Y + 1)) if (Map.MapTiles[x, p.Y + 1].Equals(replace))
queue.Enqueue(new int2(x, p.Y + 1)); MaybeEnqueue(x, p.Y + 1);
} }
} }