Removed references to external utility-library.

Added nuget package MonoGame.Extended.
Replaced some methods because of that change.

Author: psilo

CollisionGrid/CollisionGrid.Point.cs

@@ -75,7 +75,7 @@ public void Add(T item, Point cell)
         {
             lock (lockObject)
             {
-                var c = Clamp(cell);
+                Point c = Clamp(cell);
                 AddToGrid(item, c);
                 AddToItems(item, c);
             }
@@ -142,13 +142,13 @@ public void Remove(Point cell)
         {
             lock (lockObject)
             {
-                var c = Clamp(cell);
+                Point c = Clamp(cell);
                 List<T> l;
                 Grid.TryGetValue(c, out l);
 
                 if (l != null)
                 {
-                    foreach (var i in l)
+                    foreach (T i in l)
                     {
                         List<Point> pl;
                         ItemDictionary.TryGetValue(i, out pl);

CollisionGrid/CollisionGrid.Rect.cs

@@ -25,13 +25,13 @@
 // For more information, please refer to <http://unlicense.org>
 // ***************************************************************************
 
-using Utilities.Geometry;
+using MonoGame.Extended.Shapes;
 
 namespace CollisionGrid
 {
     public partial class CollisionGrid<T>
     {
-        public T[] Get(Rect aabb)
+        public T[] Get(RectangleF aabb)
         {
             lock (lockObject)
             {
@@ -46,7 +46,7 @@ public T[] Get(Rect aabb)
         /// <returns>
         ///     The item or default(T)
         /// </returns>
-        public T First(Rect aabb)
+        public T First(RectangleF aabb)
         {
             lock (lockObject)
             {
@@ -60,7 +60,7 @@ public T First(Rect aabb)
         /// </summary>
         /// <param name="item">The item to add</param>
         /// <param name="aabb">The Axis-Aligned-Bounding-Box given in float-grid-coordinates.</param>
-        public void Add(T item, Rect aabb)
+        public void Add(T item, RectangleF aabb)
         {
             lock (lockObject)
             {
@@ -73,7 +73,7 @@ public void Add(T item, Rect aabb)
         ///     If the items don't occupy another cell, they are removed as well.
         /// </summary>
         /// <param name="aabb">The Axis-Aligned-Bounding-Box given in float-grid-coordinates.</param>
-        public void Remove(Rect aabb)
+        public void Remove(RectangleF aabb)
         {
             lock (lockObject)
             {
@@ -88,15 +88,15 @@ public void Remove(Rect aabb)
         /// </summary>
         /// <param name="item">The item to move</param>
         /// <param name="aabb">The Axis-Aligned-Bounding-Box given in float-grid-coordinates.</param>
-        public void Move(T item, Rect aabb)
+        public void Move(T item, RectangleF aabb)
         {
             lock (lockObject)
             {
                 Move(item, Rectangle(aabb));
             }
         }
 
-        public bool IsEmpty(Rect aabb)
+        public bool IsEmpty(RectangleF aabb)
         {
             lock (lockObject)
             {

CollisionGrid/CollisionGrid.Rectangle.cs

@@ -37,11 +37,11 @@ public partial class CollisionGrid<T>
 
         private void FillList(Rectangle aabb)
         {
-            var r = Clamp(aabb);
+            Rectangle r = Clamp(aabb);
             lop.Clear();
-            for (var y = 0; y < r.Size.Y; y++)
+            for (int y = 0; y < r.Size.Y; y++)
             {
-                for (var x = 0; x < r.Size.X; x++)
+                for (int x = 0; x < r.Size.X; x++)
                 {
                     lop.Add(new Point(r.X + x, r.Y + y));
                 }
@@ -54,9 +54,9 @@ public T[] Get(Rectangle aabb)
             {
                 FillList(aabb);
                 result.Clear();
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
-                    foreach (var i in Get(p))
+                    foreach (T i in Get(p))
                     {
                         if (!result.Contains(i))
                         {
@@ -81,9 +81,9 @@ public T First(Rectangle aabb)
             {
                 FillList(aabb);
                 result.Clear();
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
-                    var content = First(p);
+                    T content = First(p);
                     if (!content.Equals(default(T)))
                     {
                         return content;
@@ -104,7 +104,7 @@ public void Add(T item, Rectangle aabb)
             lock (lockObject)
             {
                 FillList(aabb);
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
                     Add(item, p);
                 }
@@ -121,7 +121,7 @@ public void Remove(Rectangle aabb)
             lock (lockObject)
             {
                 FillList(aabb);
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
                     Remove(p);
                 }
@@ -141,7 +141,7 @@ public void Move(T item, Rectangle aabb)
             {
                 Remove(item);
                 FillList(aabb);
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
                     Add(item, p);
                 }
@@ -153,7 +153,7 @@ public bool IsEmpty(Rectangle aabb)
             lock (lockObject)
             {
                 FillList(aabb);
-                foreach (var p in lop)
+                foreach (Point p in lop)
                 {
                     if (!IsEmpty(p))
                     {

CollisionGrid/CollisionGrid.cs

@@ -26,11 +26,13 @@
 // ***************************************************************************
 
 using System.Collections.Generic;
+using JetBrains.Annotations;
 using Microsoft.Xna.Framework;
-using Utilities.Geometry;
+using MonoGame.Extended.Shapes;
 
 namespace CollisionGrid
 {
+    [PublicAPI]
     public partial class CollisionGrid<T>
     {
         private readonly object lockObject = new object();
@@ -94,7 +96,7 @@ public void Remove(T item)
                     return;
                 }
 
-                foreach (var p in pl)
+                foreach (Point p in pl)
                 {
                     RemoveFromGrid(item, p);
                 }
@@ -128,11 +130,11 @@ private void RemoveFromGrid(T item, Point cell)
 
         public int ItemCount => Grid.Keys.Count;
 
-        private Rectangle Rectangle(Rect rect)
+        private Rectangle Rectangle(RectangleF rect)
         {
-            var tl = Cell(rect.TopLeft);
-            var br = Cell(rect.BottomRight);
-            var s = br - tl + new Point(1, 1);
+            Point tl = Cell(rect.Location);
+            Point br = Cell(rect.Location + rect.Size);
+            Point s = br - tl + new Point(1, 1);
             return new Rectangle(tl, s);
         }
 
@@ -143,15 +145,15 @@ private Point Cell(Vector2 position)
 
         private Rectangle Clamp(Rectangle rectangle)
         {
-            var tl = Clamp(rectangle.Location);
-            var br = Clamp(rectangle.Location + rectangle.Size - new Point(1, 1));
-            var s = br - tl + new Point(1, 1);
+            Point tl = Clamp(rectangle.Location);
+            Point br = Clamp(rectangle.Location + rectangle.Size - new Point(1, 1));
+            Point s = br - tl + new Point(1, 1);
             return new Rectangle(tl, s);
         }
 
         private Point Clamp(Point p)
         {
-            var nx = p.X;
+            int nx = p.X;
             if (nx >= NumberOfCellsX)
             {
                 nx = NumberOfCellsX - 1;
@@ -161,7 +163,7 @@ private Point Clamp(Point p)
                 nx = 0;
             }
 
-            var ny = p.Y;
+            int ny = p.Y;
             if (ny >= NumberOfCellsY)
             {
                 ny = NumberOfCellsY - 1;

CollisionGrid/CollisionGrid.csproj

@@ -30,6 +30,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JetBrains.Annotations, Version=10.1.4.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.1.4\lib\net20\JetBrains.Annotations.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MonoGame.Extended, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MonoGame.Extended.0.5.149\lib\MonoGame.Extended.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>..\Test\_EXTERNAL_LIBRARIES\MonoGame\MonoGame.Framework.dll</HintPath>
     </Reference>
@@ -40,9 +48,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Utilities">
-      <HintPath>_EXTERNAL_LIBRARIES\Utilities.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CollisionGrid.Rect.cs" />
@@ -53,7 +58,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="_EXTERNAL_LIBRARIES\Utilities.dll" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

CollisionGrid/_EXTERNAL_LIBRARIES/Utilities.dll

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="JetBrains.Annotations" version="10.1.4" targetFramework="net45" />
+  <package id="MonoGame.Extended" version="0.5.149" targetFramework="net45" />
+  <package id="System.Runtime" version="4.0.0" targetFramework="net45" />
+</packages>

CollisionGrid/packages.config

@@ -25,12 +25,12 @@
 // For more information, please refer to <http://unlicense.org>
 // ***************************************************************************
 
+using System;
 using System.Collections.Generic;
 using CollisionGrid;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Utilities;
-using Utilities.Randomizing;
+using MonoGame.Extended.Shapes;
 
 namespace Test
 {
@@ -58,16 +58,16 @@ public DrawableGrid(Game game, SpriteBatch spriteBatch, float width, float heigh
         public override void Initialize()
         {
             base.Initialize();
-            var rand = RandomizerController.Randomizer;
-            for (var i = 0; i < NUMBER_OF_SPRITES; i++)
+            Random rand = new Random(1);
+            for (int i = 0; i < NUMBER_OF_SPRITES; i++)
             {
-                var s = new Sprite(Game, SpriteBatch, new Point((int) width, (int) height));
-                s.Trajectory = new Vector2(rand.RandomBetween(-1f, 1f), rand.RandomBetween(-1f, 1f));
+                Sprite s = new Sprite(Game, SpriteBatch, new Point((int) width, (int) height));
+                s.Trajectory = new Vector2(rand.Next(-1000, 1000)/1000f, rand.Next(-1000, 1000)/1000f);
                 s.Trajectory.Normalize();
-                s.Position = new Vector2(rand.RandomBetween(0f, 700f), rand.RandomBetween(0f, 700f));
-                s.Velocity = rand.RandomBetween(.1f, 4f);
-                s.Width = rand.RandomBetween(5, 53);
-                s.Height = rand.RandomBetween(5, 53);
+                s.Position = new Vector2(rand.Next(0, 700), rand.Next(0, 700));
+                s.Velocity = rand.Next(100, 4000)/1000f;
+                s.Width = rand.Next(5, 53);
+                s.Height = rand.Next(5, 53);
 
                 s.Initialize();
                 Game.Components.Add(s);
@@ -78,7 +78,7 @@ public override void Initialize()
         public override void Update(GameTime gameTime)
         {
             base.Update(gameTime);
-            foreach (var s in sprites)
+            foreach (Sprite s in sprites)
             {
                 Grid.Move(s, s.GetAabb());
             }
@@ -89,28 +89,34 @@ public override void Draw(GameTime gameTime)
             if (Visible)
             {
                 SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);
-                var r = new Rectangle((int) Position.X, (int) Position.Y, (int) width, (int) height);
+                Rectangle r = new Rectangle((int) Position.X, (int) Position.Y, (int) width, (int) height);
                 SpriteBatch.DrawRectangle(r, Color.Yellow);
-                for (var x = 0; x < Grid.NumberOfCellsX; x++)
+                for (int x = 0; x < Grid.NumberOfCellsX; x++)
                 {
-                    for (var y = 0; y < Grid.NumberOfCellsY; y++)
+                    for (int y = 0; y < Grid.NumberOfCellsY; y++)
                     {
-                        var cell = new Rectangle((int) (Position.X + x*Grid.CellWidth),
+                        Rectangle cell = new Rectangle((int) (Position.X + x*Grid.CellWidth),
                             (int) (Position.Y + y*Grid.CellHeight),
                             (int) Grid.CellWidth, (int) Grid.CellHeight);
-                        var l = Grid.Get(new Point(x, y)).Length;
+                        int l = Grid.Get(new Point(x, y)).Length;
+
+                        Color c;
                         if (l > 0)
                         {
-                            var f = l/4f;
+                            float f = l/4f;
                             if (f > 1)
                             {
                                 f = 1;
                             }
-                            SpriteBatch.FillRectangle(cell, Utils.SetTransparencyOnColor(Color.Red, f));
+                            c = Color.Red;
+                            c.A = (byte) (255f*f);
+                            SpriteBatch.FillRectangle(cell, c);
                         }
                         else
                         {
-                            SpriteBatch.DrawRectangle(cell, Utils.SetTransparencyOnColor(Color.Yellow, .5f));
+                            c = Color.Yellow;
+                            c.A = (byte) (255f*.5f);
+                            SpriteBatch.DrawRectangle(cell, c);
                         }
                     }
                 }

Test/DrawableGrid.cs

@@ -28,7 +28,6 @@
 using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Utilities;
 
 namespace Test
 {
@@ -47,19 +46,14 @@ public Main()
             GraphicsDeviceManager.PreferredBackBufferWidth = MIN_SCREEN_RESOLUTION_WIDTH;
             GraphicsDeviceManager.PreferredBackBufferHeight = MIN_SCREEN_RESOLUTION_HEIGHT;
             GraphicsDeviceManager.IsFullScreen = false;
+
+            Window.AllowUserResizing = true;
+            Window.Position = Point.Zero;
         }
 
         protected override void Initialize()
         {
-            var screenBounds = Utils.InitGraphicsMode(this, GraphicsDeviceManager, MIN_SCREEN_RESOLUTION_WIDTH,
-                MIN_SCREEN_RESOLUTION_HEIGHT, false);
-            if (screenBounds == null)
-            {
-                Console.Out.WriteLine("Severe error opening and initializing window.");
-                Exit();
-            }
-
-            var grid = new DrawableGrid(this, new SpriteBatch(GraphicsDevice), 700, 700, 40, 40);
+            DrawableGrid grid = new DrawableGrid(this, new SpriteBatch(GraphicsDevice), 700, 700, 40, 40);
             Components.Add(grid);
             grid.Initialize();
         }