janis/fps-citybuild-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/fps-citybuild-unity.git synced 2025-10-29 12:22:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pathfinding rework

Browse Source 
Pulled the whole thing apart and glued it back together
This commit is contained in:
juliuse98
2021-09-30 17:38:44 +02:00
parent c2f412b62e
commit 6deadb9c22
5 changed files with 400 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/NPCTest.unity
View File

@@ -342,3 +342,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ef9b1c03bb478e84b931f1cbb3bbab8c, type: 3}
m_Name:
m_EditorClassIdentifier:
startPoint: {x: 0, y: 0, z: 0}
endPoint: {x: 200, y: 0, z: 200}

37
Assets/Scripts/NPC/NPCController.cs
View File

@@ -8,32 +8,31 @@ public class NPCController : MonoBehaviour
PathMap Map;
private GameObject[,] ball;
public List<PathNode> path;
private int rows;
[SerializeField] Vector3 startPoint;
[SerializeField] Vector3 endPoint;
// Start is called before the first frame update
void Start()
{
ball = new GameObject[30, 30];
Map = new PathMap(new Vector3(0, 0, 0), 30, 30, 30);
for (int r = 0; r < 30; r++)
{
for (int c = 0; c < 30; c++)
{
startPoint = new Vector3(0,0,0);
endPoint = new Vector3(100,0,100);
rows = 45;
Map = new PathMap(new Vector3(0, 0, 0), rows, rows, 100);
Debug.Log("yeet");
Map.setupMapWithNextLayer();
//Looking through the low res search
//path = Map.QueryNodes(startPoint,endPoint);
if (path != null) {
for (int i = 0; i < path.Count - 1; i++) {
int x = path[i].index.x;
int y = path[i].index.y;
Debug.Log(path[i].index);
Debug.Log(path[i].Position);
GameObject sphere = GameObject.CreatePrimitive(PrimitiveType.Cube);
sphere.transform.position = Map.map[r, c].Position;
ball[r, c] = sphere;
sphere.transform.position = Map.map[x, y].Position;
}
}
path = Map.QueryNodes(new Vector3(0,0, 0), new Vector3(100, 0,100));
//Debug.Log("yeet");
Debug.Log(path.Count);
Debug.Log((int)path[0].index.x + " "+ (int)path[0].index.y);
for (int i = 0; i < path.Count - 1; i++) {
int x = path[i].index.x;
int y = path[i].index.y;
Destroy(ball[x, y]);
}
}

443
Assets/Scripts/NPC/PathMap.cs
View File

@@ -8,35 +8,56 @@ public class PathMap
private Vector3 position;
public PathNode[,] map;
public PathMap parent;
public Vector2Int parentIndex;
private int rows = 30;
private int cols = 30;
private int rows = 100;
private int cols = 100;
private float spacing = 1f;
private float height = 0;
public Terrain t;
private float w, h;
private bool divided = false;
private PathNode[] uncheckedNodes;
private List<PathNode> openList;
private List<PathNode> closedList;
private List<PathNode> nextList;
private List<PathNode> path;
public PathMap(Vector3 Position, int Rows, int Cols, float Width)
{
setup(Position, Rows, Cols, Width);
}
public void setupMap()
{
Generate();
//Add the references to the neighbors of all nodes
AddAllNeighbors();
}
private void setup(Vector3 Position, int Rows, int Cols, float Width)
{
position = Position;
rows = Rows;
cols = Cols;
w = Width;
spacing = w / rows;
//Array of all pathnodes in this chunk.
map = new PathNode[rows, cols];
//only for debugging
openList = new List<PathNode>();
@@ -45,43 +66,36 @@ public class PathMap
//Path that will be returned at the end.
path = new List<PathNode>();
}
public void setupMapWithNextLayer()
{
Generate();
AddAllNeighbors();
//addNextLayer();
//Add the references to the neighbors of all nodes
}
public void Generate()
{
//Add all nodes into the map.
for (int r = 0; r < rows; r++)
{
for (int c = 0; c < cols; c++)
{
PathNode node = new PathNode(new Vector3(position.x + r * spacing, position.y + height, position.z + c * spacing));
PathNode node = new PathNode();
node.Position = new Vector3(this.position.x + r * spacing, this.position.y + height, this.position.z + c * spacing);
node.index = new Vector2Int(r, c);
node.ConditionWeight = 1 + (float)Random.Range(1, 1000) / 1000;
map[r, c] = node;
}
}
//Add the references to the neighbors of all nodes
AddAllNeighbors();
}
private PathNode FindClosestNode(Vector3 pos)
{
if (pos.x > 0 && pos.x < rows * spacing && pos.z > 0 && pos.z < cols * spacing)
{
return map[Mathf.RoundToInt(pos.x / spacing), Mathf.RoundToInt(pos.z / spacing)];
}
Vector2Int best = new Vector2Int(0,0);
for (int r = 0; r < rows; r++)
{
for (int c = 0; c < cols; c++)
{
if (Vector3.Distance(map[best.x, best.y].Position, pos) > Vector3.Distance(map[r, c].Position, pos)) {
best.Set(r,c);
}
}
}
return map[best.x,best.y];
}
public List<PathNode> QueryNodes(Vector3 Vstart, Vector3 Vend)
{
bool finished = false;
@@ -89,8 +103,8 @@ public class PathMap
PathNode start = FindClosestNode(Vstart);
start.Gscore = 0;
PathNode end = FindClosestNode(Vend);
Debug.Log("Searching a path from " + start.index + " to " + end.index);
Debug.Log(start);
Debug.Log("Searching a path from " + start.Position + " to " + end.Position);
openList.Add(start);
PathNode current;
@@ -100,7 +114,7 @@ public class PathMap
d++;
if (d > 1000)
{
Debug.Log("Mist! Has not found a path");
Debug.Log("Too many trys");
return null;
}
int winner = 0;
@@ -119,9 +133,9 @@ public class PathMap
{
foreach (PathNode p in current.neigbors)
{
if (!closedList.Contains(p))
if (!closedList.Contains(p) && !p.Blocked)
{
float tempG = current.Gscore + heuristic(p.Position, current.Position);
float tempG = current.Gscore + heuristic(p, current);
bool newPath = false;
if (openList.Contains(p))
{
@@ -139,7 +153,7 @@ public class PathMap
}
if (newPath)
{
p.Hscore = heuristic(p.Position, end.Position);
p.Hscore = heuristic(p, end);
p.Fscore = p.Gscore + p.Hscore;
p.Previous = current;
}
@@ -166,12 +180,292 @@ public class PathMap
return null;
}
public List<PathNode> LowerQueryNodes(Vector3 Vstart, Vector3 Vend, PathNode[] parentPath)
{
bool finished = false;
private float heuristic(Vector3 pos1, Vector3 pos2)
PathNode start = FindClosestNode(Vstart);
start.Gscore = 0;
PathNode end = FindClosestNode(Vend);
Debug.Log("Searching a path from " + start.Position + " to " + end.Position + " but through the lower level.");
openList.Add(start);
PathNode current;
int d = 0;
while (!finished)
{
d++;
if (d > 1000)
{
Debug.Log("Too many trys");
return null;
}
int winner = 0;
for (int i = 0; i < openList.Count; i++)
{
if (openList[i].Fscore < openList[winner].Fscore) winner = i;
}
current = openList[winner];
openList.RemoveAt(winner);
closedList.Add(current);
if (current != end)
{
foreach (PathNode p in current.neigbors)
{
if (!closedList.Contains(p) && !p.Blocked)
{
float tempG = current.Gscore + heuristic(p, current);
bool newPath = false;
if (openList.Contains(p))
{
if (tempG < p.Gscore)
{
p.Gscore = tempG;
newPath = true;
}
}
else
{
p.Gscore = tempG;
newPath = true;
openList.Add(p);
}
if (newPath)
{
p.Hscore = heuristic(p, end);
p.Fscore = p.Gscore + p.Hscore;
p.Previous = current;
}
}
}
}
else
{
Debug.Log("Path Has Been Found");
PathNode temp = end;
path.Add(temp);
while (temp.Previous != null)
{
path.Add(temp.Previous);
temp = temp.Previous;
}
path.Add(start);
finished = true;
return path;
}
}
return null;
}
/* public void setupNeighborsLower() {
//schleife f<>r alle parent Nodes
for (int i = 0; i < rows;i++) {
for (int j = 0; j < rows;j++)
{
for (int x = 0; x < rows; x++)
{
for (int y = 0; y < cols; y++)
{
//looking left and right and top and bottom
for (int x = -1; x <= 1; x++)
{
for (int y = -1; y <= 1; y++)
{
if (x != 0 && y != 0)
{
if (!indexOutOfBounds(index.x + x, index.y + y, rows, cols))
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x + x, (int)index.y + y]);
}
else
{
//Rechts
if (x == 1 && y == 0)
{
}
//Links
if (x == -1 && y == 0)
{
}
//Oben
if (x == 0 && y == -1)
{
}
//Unten
if (x == 0 && y == 1)
{
}
//Diagonal
//Oben-Rechts
if (x == 1 && y == -1)
{
}
//Unten-Rechts
if (x == 1 && y == 1)
{
}
//Unten-Links
if (x == -1 && y == 1)
{
}
//Oben-Links
if (x == -1 && y == -1)
{
}
}
}
}
}
}
}
}
}
}
}*/
public void addNextLayer()
{
PathNode[,] full = new PathNode[rows * rows, cols * cols];
for (int i = 0; i < rows * rows; i++)
{
for (int j = 0; j < cols * cols; j++)
{
PathNode node = new PathNode();
node.Position = new Vector3(this.position.x + i * spacing/rows,this.position.y,this.position.z + j * spacing/cols);
full[i, j] = node;
}
}
for (int i = 0; i < rows * rows; i++)
{
for (int j = 0; j < cols * cols; j++)
{
for (int x = -1; x <= 1; x++)
{
for (int y = -1; y <= 1; y++)
{
if (!(x == 0 && y == 0))
{
if (!indexOutOfBounds(i + x, j + y, rows * rows, cols * cols))
{
//try
//{
full[i, j].neigbors.Add(full[i + x, j + y]);
//}
//catch
//{
// Debug.Log("poggers");
//}
}
}
}
}
}
}
for (int r = 0; r < rows; r++)
{
for (int c = 0; c < cols; c++)
{
PathNode node = map[r, c];
Vector3 pos = node.Position;
node.lowerLevel = new PathMap(pos, rows, cols, spacing);
for (int i = 0; i < rows; i++)
{
for (int j = 0; j < cols; j++)
{
PathNode n = full[r*rows+i,c*cols + j];
Debug.Log(n);
node.lowerLevel.map[i,j].index = new Vector2Int(i, j);
node.ConditionWeight = 1 + (float)Random.Range(1, 1000) / 1000;
node.lowerLevel.map[i, j] = node;
}
}
node.lowerLevel.parent = this;
node.HasLowerLevel = true;
}
}
divided = true;
}
private float heuristic(PathNode p1, PathNode p2)
{
//Calculates the HScore for a node.
return Vector3.Distance(pos1, pos2);
float dist = Vector3.Distance(p1.Position, p2.Position) / 2;
float dist1 = dist * p1.ConditionWeight;
float dist2 = dist * p2.ConditionWeight;
return dist1 + dist2;
}
private PathNode FindClosestNode(Vector3 pos)
{
if (pos.x > 0 && pos.x < rows * spacing && pos.z > 0 && pos.z < cols * spacing && false)
{
return map[Mathf.RoundToInt(pos.x / spacing), Mathf.RoundToInt(pos.z / spacing)];
}
Vector2Int best = new Vector2Int(0, 0);
for (int r = 0; r < rows; r++)
{
for (int c = 0; c < cols; c++)
{
if (Vector3.Distance(map[best.x, best.y].Position, pos) > Vector3.Distance(map[r, c].Position, pos))
{
best.Set(r, c);
}
}
}
return map[best.x, best.y];
}
private void AddAllNeighbors()
{
@@ -179,51 +473,48 @@ public class PathMap
{
for (int c = 0; c < cols; c++)
{
AddNeighbors(new Vector2(r, c));
AddNeighbors(new Vector2Int(r, c));
}
}
}
private void AddNeighbors(Vector2 index)
private void lookThroughLowerLevel()
{
//Adds references to all neigbors of a node.
if ((int)index.x - 1 >= 0 && (int)index.y - 1 >= 0)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x - 1, (int)index.y - 1]);
}
if ((int)index.y - 1 >= 0)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x, (int)index.y - 1]);
}
if ((int)index.x + 1 < rows && (int)index.y - 1 >= 0)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x + 1, (int)index.y - 1]);
}
if ((int)index.x - 1 >= 0)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x - 1, (int)index.y]);
}
if ((int)index.x + 1 < rows && (int)index.y >= 0)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x + 1, (int)index.y]);
}
if ((int)index.x - 1 >= 0 && (int)index.y + 1 < cols)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x - 1, (int)index.y + 1]);
}
if ((int)index.y + 1 < cols)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x, (int)index.y + 1]);
}
if ((int)index.x + 1 < rows && (int)index.y + 1 < cols)
{
map[(int)index.x, (int)index.y].neigbors.Add(map[(int)index.x + 1, (int)index.y + 1]);
}
}
private bool indexOutOfBounds(int x, int y, int rows, int cols)
{
if (x < 0 || x >= rows || y < 0 || y >= cols)
{
return true;
}
return false;
}
private void AddNeighbors(Vector2Int index)
{
for (int x = -1; x <= 1; x++)
{
for (int y = -1; y <= 1; y++)
{
if (!(x == 0 && y == 0))
{
if (x == 0 || y == 0)
{
if (!indexOutOfBounds(index.x + x, index.y + y, rows, cols))
{
map[index.x, index.y].neigbors.Add(map[index.x + x, index.y + y]);
}
}
}
}
}
}
}

19
Assets/Scripts/NPC/PathGenerator.cs → Assets/Scripts/NPC/PathNode.cs
View File

@@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -9,18 +7,22 @@ public class PathNode
private Vector3 position;
public Vector2Int index;
public Vector2Int parentIndex;
private float scoreF;
private float scoreG;
private float scoreH;
public List<PathNode> neigbors;
private PathMap lowerLevel;
public PathMap lowerLevel;
private bool hasLowerLevel = false;
private float conditionWeight = 1f;
private PathNode previous;
private bool blocked;
public PathNode(Vector3 Pos)
public PathNode()
{
neigbors = new List<PathNode>();
position = Pos;
position = Vector3.zero;
scoreG = Mathf.Infinity;
scoreF = Mathf.Infinity;
scoreH = Mathf.Infinity;
@@ -28,7 +30,7 @@ public class PathNode
public void activateNextLevel()
{
//lowerLevel = new PathMap(30, 30, float width, float height);
}
public Vector3 Position { get => position; set => position = value; }
@@ -36,4 +38,7 @@ public class PathNode
public float Gscore { get => scoreG; set => scoreG = value; }
public float Fscore { get => scoreF; set => scoreF = value; }
public PathNode Previous { get => previous; set => previous = value; }
public float ConditionWeight { get => conditionWeight; set => conditionWeight = value; }
public bool Blocked { get => blocked; set => blocked = value; }
public bool HasLowerLevel { get => hasLowerLevel; set => hasLowerLevel = value; }
}

2
Assets/Scripts/NPC/PathGenerator.cs.meta → Assets/Scripts/NPC/PathNode.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0f50f0a081672ea4a9bc9f13de003f0a
guid: 8c0191b07f1e4654d9dd893623534cb6
MonoImporter:
externalObjects: {}
serializedVersion: 2