xevion/Paths
1
0
Fork 0
mirror of https://github.com/Xevion/Paths.git synced 2025-12-10 14:08:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

change NodeGrid/GridState to use 2d arrays for performance

Browse Source
This commit is contained in:
Xevion
2020-11-14 00:13:31 -06:00
parent 792a8fa452
commit 665604bafc
3 changed files with 25 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
Paths/Assets/Scripts/Algorithms/NodeGrid.cs
View File

@@ -6,7 +6,7 @@ using Random = UnityEngine.Random;
namespace Algorithms { namespace Algorithms {
public class NodeGrid { public class NodeGrid {
private List<List<Node>> grid; public readonly Node[,] Grid;
public readonly int Width; public readonly int Width;
public readonly int Height; public readonly int Height;
public int CellCount => this.Width * this.Height; public int CellCount => this.Width * this.Height;
@@ -19,26 +19,22 @@ namespace Algorithms {
throw new ArgumentOutOfRangeException(nameof(height), throw new ArgumentOutOfRangeException(nameof(height),
"The height of the grid must be a positive non-zero integer."); "The height of the grid must be a positive non-zero integer.");
grid = new List<List<Node>>(width);
// Fill grid with width*height nodes, zero-indexed // Fill grid with width*height nodes, zero-indexed
for (int x = 0; x < width; x++) { Grid = new Node[width, height];
List<Node> list = new List<Node>(height); for (int x = 0; x < width; x++)
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
list.Add(new Node(new Vector2Int(x, y), true)); Grid[x, y] = new Node(new Vector2Int(x, y), true);
grid.Add(list); Width = width;
} Height = height;
Width = this.grid.Count;
Height = this.grid[0].Count;
} }
public NodeGrid(List<List<Node>> grid) { public NodeGrid(Node[,] grid) {
this.grid = grid; this.Grid = grid;
Height = this.grid[0].Count; Height = this.Grid.GetLength(0);
Width = this.grid.Count; Width = this.Grid.GetLength(1);
} }
public List<Node> GetAdjacentNodesList(Node node) { public List<Node> GetAdjacentNodesList(Node node) {
@@ -47,10 +43,10 @@ namespace Algorithms {
int col = node.Position.x; int col = node.Position.x;
int row = node.Position.y; int row = node.Position.y;
if (row + 1 < Height) temp.Add(grid[col][row + 1]); if (row + 1 < Height) temp.Add(Grid[col, row + 1]);
if (row - 1 >= 0) temp.Add(grid[col][row - 1]); if (row - 1 >= 0) temp.Add(Grid[col, row - 1]);
if (col - 1 >= 0) temp.Add(grid[col - 1][row]); if (col - 1 >= 0) temp.Add(Grid[col - 1, row]);
if (col + 1 < Width) temp.Add(grid[col + 1][row]); if (col + 1 < Width) temp.Add(Grid[col + 1, row]);
return temp; return temp;
} }
@@ -60,54 +56,15 @@ namespace Algorithms {
int row = node.Position.y; int row = node.Position.y;
return new Node[] { return new Node[] {
row + 1 < Height ? grid[col][row + 1] : null, row + 1 < Height ? Grid[col, row + 1] : null,
row - 1 >= 0 ? grid[col][row - 1] : null, row - 1 >= 0 ? Grid[col, row - 1] : null,
col - 1 >= 0 ? grid[col - 1][row] : null, col - 1 >= 0 ? Grid[col - 1, row] : null,
col + 1 < Width ? grid[col + 1][row] : null col + 1 < Width ? Grid[col + 1, row] : null
}; };
} }
/// <summary>
/// Tests whether a coordinate is valid on the NodeGrid
/// </summary>
/// <param name="x">The X (column) coordinate</param>
/// <param name="y">The Y (row) coordinate</param>
/// <returns></returns>
public bool IsValid(int x, int y) {
return x > 0 && x < Width && y > 0 && y < Height;
}
/// <summary>
/// Retrieves a node at a given coordinate.
/// </summary>
/// <param name="x">the X (column) coordinate</param>
/// <param name="y">the Y (row) coordinate</param>
/// <returns>A Node object</returns>
/// <exception cref="ArgumentOutOfRangeException">when the coordinate given does not exist on the grid</exception>
public Node GetNode(int x, int y) {
// if(!IsValid(x, y))
// throw new ArgumentOutOfRangeException();
return grid[x][y];
}
public Node GetNode(Vector2Int position) { public Node GetNode(Vector2Int position) {
return GetNode(position.x, position.y); return Grid[position.x, position.y];
}
/// <summary>
/// Finds one random walkable cell and turns it into a wall.
/// </summary>
public void AddRandomWall() {
while (true) {
int x = Random.Range(0, Width);
int y = Random.Range(0, Height);
if (grid[x][y].Walkable) {
grid[x][y].Walkable = false;
return;
}
}
} }
public static float Manhattan(Node a, Node b) { public static float Manhattan(Node a, Node b) {
@@ -135,9 +92,9 @@ namespace Algorithms {
} }
public IEnumerable<Node> Iterator() { public IEnumerable<Node> Iterator() {
for (int x = 0; x < this.grid.Count; x++) for (int x = 0; x < Width; x++)
for (int y = 0; y < this.grid[0].Count; y++) for (int y = 0; y < Height; y++)
yield return this.grid[x][y]; yield return this.Grid[x, y];
} }
public IEnumerable<Node> Walls() { public IEnumerable<Node> Walls() {
@@ -153,7 +110,7 @@ namespace Algorithms {
/// </summary> /// </summary>
/// <returns>A Node object.</returns> /// <returns>A Node object.</returns>
public Node GetRandomNode() { public Node GetRandomNode() {
return grid[Random.Range(0, Width)][Random.Range(0, Height)]; return Grid[Random.Range(0, Width), Random.Range(0, Height)];
} }
} }
} }

3
Paths/Assets/Scripts/GridState.cs
View File

@@ -15,8 +15,7 @@ public class GridState {
// Add walls and empty tiles // Add walls and empty tiles
for (int x = 0; x < grid.Width; x++) { for (int x = 0; x < grid.Width; x++) {
for (int y = 0; y < grid.Height; y++) { for (int y = 0; y < grid.Height; y++) {
Node node = grid.GetNode(x, y); Grid[x, y] = grid.Grid[x, y].Walkable ? GridNodeType.Empty : GridNodeType.Wall;
Grid[x, y] = node.Walkable ? GridNodeType.Empty : GridNodeType.Wall;
} }
} }

2
Paths/Assets/Shaders/GridShader Material.mat
View File

@@ -64,7 +64,7 @@ Material:
- _Glossiness: 0.5 - _Glossiness: 0.5
- _GlossyReflections: 1 - _GlossyReflections: 1
- _GridSize: 32 - _GridSize: 32
- _LineSize: 0.05 - _LineSize: 0
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1