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

Merge pull request #7093 from RoosterDragon/frozen-stream

Browse Source 
Make FrozenActorsInBox a streaming enumerable.
This commit is contained in:
obrakmann
2014-12-11 00:10:40 +01:00
parent 2d5b41338e 1116f578a3
commit c8ad2d4911
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/World/ScreenMap.cs
View File

@@ -175,15 +175,17 @@ namespace OpenRA.Traits
var right = (r.Right / info.BinSize).Clamp(0, cols - 1);
var top = (r.Top / info.BinSize).Clamp(0, rows - 1);
var bottom = (r.Bottom / info.BinSize).Clamp(0, rows - 1);
var bins = frozen[p];
var frozenInBox = new List<FrozenActor>();
var actorsChecked = new HashSet<FrozenActor>();
for (var j = top; j <= bottom; j++)
for (var i = left; i <= right; i++)
frozenInBox.AddRange(frozen[p][j * cols + i]
.Where(kv => kv.Key.IsValid && kv.Value.IntersectsWith(r))
.Select(kv => kv.Key));
return frozenInBox.Distinct();
foreach (var kvp in bins[j * cols + i])
{
var actor = kvp.Key;
if (actor.IsValid && kvp.Value.IntersectsWith(r) && actorsChecked.Add(actor))
yield return actor;
}
}
}
}