-using System;\r
+\r
+// Uncomment this to disable diagonal movemet.\r
+//#define ALLOW_DIAGONAL_MOVEMENT\r
+\r
+using System;\r
using System.Collections.Generic;\r
using System.Linq;\r
using System.Text;\r
mFringe = new BinaryHeap<Cell>();\r
mCells = new Cell[mGridWidth, mGridHeight];\r
\r
- Cell startCell = new Cell(start, 0, GetManhattanDistance(start, finish));\r
+ Cell startCell = new Cell(start, 0, heuristic(start, finish));\r
mFringe.Add(startCell);\r
mCells[start.X, start.Y] = startCell;\r
while (mFringe.Count > 0)\r
}\r
\r
List<Point> neighbors = new List<Point>(8);\r
+ neighbors.Add(new Point(cell.Point.X, cell.Point.Y - 1));\r
+ neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y));\r
+ neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y));\r
+ neighbors.Add(new Point(cell.Point.X, cell.Point.Y + 1));\r
+#if ALLOW_DIAGONAL_MOVEMENT\r
neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y - 1));\r
- neighbors.Add(new Point(cell.Point.X + 0, cell.Point.Y - 1));\r
neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y - 1));\r
- neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y + 0));\r
- neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y + 0));\r
neighbors.Add(new Point(cell.Point.X - 1, cell.Point.Y + 1));\r
- neighbors.Add(new Point(cell.Point.X + 0, cell.Point.Y + 1));\r
neighbors.Add(new Point(cell.Point.X + 1, cell.Point.Y + 1));\r
+#endif\r
foreach (Point point in neighbors)\r
{\r
Cell inQueue = mCells[point.X, point.Y];\r
if (0 <= point.X && point.X < mGridWidth && 0 <= point.Y && point.Y < mGridHeight &&\r
mGrid[point.X, point.Y])\r
{\r
- int cost = cell.G + GetCost(cell.Point, point);\r
+ int cost = cell.G + costFunction(cell.Point, point);\r
\r
if (inQueue == null)\r
{\r
- Cell neighbor = new Cell(point, cost, GetManhattanDistance(point, finish), cell);\r
+ Cell neighbor = new Cell(point, cost, heuristic(point, finish), cell);\r
mFringe.Add(neighbor);\r
mCells[point.X, point.Y] = neighbor;\r
}\r