Minor fixes.

Made result of Get(Rectangle) only containing unique Ts.

Author: psilo

CollisionGrid/CollisionGrid.Point.cs

@@ -98,7 +98,7 @@ private void AddToGrid(T item, Point cell)
 		private void AddToItems(T item, Point cell)
 		{
 			List<Point> pl;
-			Items.TryGetValue(item, out pl);
+			ItemDictionary.TryGetValue(item, out pl);
 			if (pl == null)
 			{
 				if (ListOfPointQueue.Count > 0)
@@ -110,7 +110,7 @@ private void AddToItems(T item, Point cell)
 					pl = new List<Point>();
 				}
 				pl.Add(cell);
-				Items.Add(item, pl);
+				ItemDictionary.Add(item, pl);
 			}
 			else
 			{
@@ -139,14 +139,14 @@ public void Remove(Point cell)
 					foreach (T i in l)
 					{
 						List<Point> pl;
-						Items.TryGetValue(i, out pl);
+						ItemDictionary.TryGetValue(i, out pl);
 						if (pl != null)
 						{
 							pl.Remove(c);
 							if (pl.Count == 0)
 							{
 								ListOfPointQueue.Enqueue(pl);
-								Items.Remove(i);
+								ItemDictionary.Remove(i);
 							}
 						}
 					}

CollisionGrid/CollisionGrid.Rectangle.cs

@@ -43,7 +43,13 @@ public T[] Get(Rectangle aabb)
 				result.Clear();
 				foreach (Point p in lop)
 				{
-					result.AddRange(Get(p));
+					foreach (T i in Get(p))
+					{
+						if (!result.Contains(i))
+						{
+							result.Add(i);
+						}
+					}
 				}
 				return result.ToArray();
 			}

CollisionGrid/CollisionGrid.cs

@@ -33,7 +33,7 @@ public partial class CollisionGrid<T>
 		public int NumberOfCellsY { get; private set; }
 
 		private Dictionary<Point, List<T>> Grid { get; set; }
-		private Dictionary<T, List<Point>> Items { get; set; }
+		private Dictionary<T, List<Point>> ItemDictionary { get; set; }
 		private Queue<List<Point>> ListOfPointQueue { get; set; }
 		private Queue<List<T>> ListOfItemQueue { get; set; }
 
@@ -46,7 +46,7 @@ public CollisionGrid(float width, float height, int numberOfCellsX, int numberOf
 			CellWidth = Width/NumberOfCellsX;
 			CellHeight = Height/NumberOfCellsY;
 
-			Items = new Dictionary<T, List<Point>>();
+			ItemDictionary = new Dictionary<T, List<Point>>();
 			Grid = new Dictionary<Point, List<T>>();
 
 			ListOfPointQueue = new Queue<List<Point>>();
@@ -58,7 +58,7 @@ public Point[] Get(T item)
 			lock (lockObject)
 			{
 				List<Point> pl;
-				Items.TryGetValue(item, out pl);
+				ItemDictionary.TryGetValue(item, out pl);
 				if (pl == null)
 				{
 					return new Point[0];
@@ -76,7 +76,7 @@ public void Remove(T item)
 			lock (lockObject)
 			{
 				List<Point> pl;
-				Items.TryGetValue(item, out pl);
+				ItemDictionary.TryGetValue(item, out pl);
 				if (pl == null)
 				{
 					return;
@@ -89,7 +89,7 @@ public void Remove(T item)
 
 				pl.Clear();
 				ListOfPointQueue.Enqueue(pl);
-				Items.Remove(item);
+				ItemDictionary.Remove(item);
 			}
 		}
 
@@ -102,25 +102,31 @@ private void RemoveFromGrid(T item, Point cell)
 				tl.Remove(item);
 				if (tl.Count == 0)
 				{
-					if (ListOfItemQueue.Count == 0)
-					{
-						Console.Out.WriteLine("Yippie!");
-					}
 					ListOfItemQueue.Enqueue(tl);
 					Grid.Remove(cell);
 				}
 			}
 		}
 
-		public IEnumerable<T> AllItems()
+		public IEnumerable<T> Items
 		{
-			return Items.Keys;
+			get { return ItemDictionary.Keys; }
 		}
 
-		public IEnumerable<Point> AllOccupiedCells()
+		public IEnumerable<Point> OccupiedCells
 		{
-			return Grid.Keys;
-		} 
+			get { return Grid.Keys; }
+		}
+
+		public int OccupiedCellCount
+		{
+			get { return ItemDictionary.Keys.Count; }
+		}
+
+		public int ItemCount
+		{
+			get { return Grid.Keys.Count; }
+		}
 
 		private Rectangle Rectangle(Rect rect)
 		{
@@ -177,8 +183,8 @@ public void Dispose()
 				ListOfItemQueue = null;
 				Grid.Clear();
 				Grid = null;
-				Items.Clear();
-				Items = null;
+				ItemDictionary.Clear();
+				ItemDictionary = null;
 			}
 		}
 	}