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

Sped up ActorMap.ActorsInBox.

Browse Source 
- By ensuring both the add and remove actor lists are sets, we ensure the partitioning bins will contain only distinct actors. We can remove the HashSet and Distinct in ActorsInBox and ActorsInWorld which provides a nice speedup for queries. ActorsInBox sees nearly a 3x speedup in the RA shellmap.
This commit is contained in:
RoosterDragon
2014-07-07 02:00:15 +01:00
parent fd68c81b15
commit ffd2e8ea9d
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -43,12 +43,12 @@ namespace OpenRA.Traits
readonly Map map; readonly Map map;
readonly CellLayer<InfluenceNode> influence; readonly CellLayer<InfluenceNode> influence;
List<Actor>[] actors; readonly List<Actor>[] actors;
int rows, cols; readonly int rows, cols;
// Position updates are done in one pass // Position updates are done in one pass
// to ensure consistency during a tick // to ensure consistency during a tick
readonly List<Actor> addActorPosition = new List<Actor>(); readonly HashSet<Actor> addActorPosition = new HashSet<Actor>();
readonly HashSet<Actor> removeActorPosition = new HashSet<Actor>(); readonly HashSet<Actor> removeActorPosition = new HashSet<Actor>();
readonly Predicate<Actor> actorShouldBeRemoved; readonly Predicate<Actor> actorShouldBeRemoved;
@@ -169,7 +169,7 @@ namespace OpenRA.Traits
public void AddPosition(Actor a, IOccupySpace ios) public void AddPosition(Actor a, IOccupySpace ios)
{ {
addActorPosition.Add(a); UpdatePosition(a, ios);
} }
public void RemovePosition(Actor a, IOccupySpace ios) public void RemovePosition(Actor a, IOccupySpace ios)
@@ -180,7 +180,7 @@ namespace OpenRA.Traits
public void UpdatePosition(Actor a, IOccupySpace ios) public void UpdatePosition(Actor a, IOccupySpace ios)
{ {
RemovePosition(a, ios); RemovePosition(a, ios);
AddPosition(a, ios); addActorPosition.Add(a);
} }
public IEnumerable<Actor> ActorsInBox(WPos a, WPos b) public IEnumerable<Actor> ActorsInBox(WPos a, WPos b)
@@ -194,14 +194,13 @@ namespace OpenRA.Traits
var j1 = (top / info.BinSize).Clamp(0, rows - 1); var j1 = (top / info.BinSize).Clamp(0, rows - 1);
var j2 = (bottom / info.BinSize).Clamp(0, rows - 1); var j2 = (bottom / info.BinSize).Clamp(0, rows - 1);
var actorsChecked = new HashSet<Actor>();
for (var j = j1; j <= j2; j++) for (var j = j1; j <= j2; j++)
{ {
for (var i = i1; i <= i2; i++) for (var i = i1; i <= i2; i++)
{ {
foreach (var actor in actors[j * cols + i]) foreach (var actor in actors[j * cols + i])
{ {
if (actor.IsInWorld && actorsChecked.Add(actor)) if (actor.IsInWorld)
{ {
var c = actor.CenterPosition; var c = actor.CenterPosition;
if (left <= c.X && c.X <= right && top <= c.Y && c.Y <= bottom) if (left <= c.X && c.X <= right && top <= c.Y && c.Y <= bottom)
@@ -214,8 +213,7 @@ namespace OpenRA.Traits
public IEnumerable<Actor> ActorsInWorld() public IEnumerable<Actor> ActorsInWorld()
{ {
return actors.SelectMany(a => a.Where(b => b.IsInWorld)) return actors.SelectMany(bin => bin.Where(actor => actor.IsInWorld));
.Distinct();
} }
} }
} }