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

Merge pull request #10462 from RoosterDragon/partition-no-empty

Browse Source 
Prevent items without size from being added to SpatiallyPartitioned.
This commit is contained in:
Oliver Brakmann
2016-01-24 20:59:25 +01:00
parent 3de5e7fea1 1bc3a7395f
commit 8fe90999a5
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Primitives/SpatiallyPartitioned.cs
View File

@@ -30,14 +30,22 @@ namespace OpenRA.Primitives
itemBoundsBins = Exts.MakeArray(rows * cols, _ => new Dictionary<T, Rectangle>()); itemBoundsBins = Exts.MakeArray(rows * cols, _ => new Dictionary<T, Rectangle>());
} }
void ValidateBounds(Rectangle bounds)
{
if (bounds.Width <= 0 || bounds.Height <= 0)
throw new ArgumentException("bounds must be non-empty.", "bounds");
}
public void Add(T item, Rectangle bounds) public void Add(T item, Rectangle bounds)
{ {
ValidateBounds(bounds);
itemBounds.Add(item, bounds); itemBounds.Add(item, bounds);
MutateBins(item, bounds, addItem); MutateBins(item, bounds, addItem);
} }
public void Update(T item, Rectangle bounds) public void Update(T item, Rectangle bounds)
{ {
ValidateBounds(bounds);
MutateBins(item, itemBounds[item], removeItem); MutateBins(item, itemBounds[item], removeItem);
MutateBins(item, itemBounds[item] = bounds, addItem); MutateBins(item, itemBounds[item] = bounds, addItem);
} }

8
OpenRA.Mods.Common/Traits/Immobile.cs
View File

@@ -55,14 +55,18 @@ namespace OpenRA.Mods.Common.Traits
{ {
self.World.ActorMap.AddInfluence(self, this); self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this); self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
if (!self.Bounds.Size.IsEmpty)
self.World.ScreenMap.Add(self);
} }
public void RemovedFromWorld(Actor self) public void RemovedFromWorld(Actor self)
{ {
self.World.ActorMap.RemoveInfluence(self, this); self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this); self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
if (!self.Bounds.Size.IsEmpty)
self.World.ScreenMap.Remove(self);
} }
} }
} }