thayol/instructions-clear
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert "fix some pathfinding problems"

Browse Source 
This reverts commit 2a9ef691fe.
This commit is contained in:
Thayol
2024-12-25 09:36:28 +09:00
parent 2a9ef691fe
commit 2570f32592
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/entity.js
+1 -1
View File
@@ -105,7 +105,7 @@ export default class Entity {
const unadjustedGraph = (this.game?.waypointGraph ?? []).concat(extraGraphEntries) const unadjustedGraph = (this.game?.waypointGraph ?? []).concat(extraGraphEntries)
console.timeEnd('unadjustedGraph') console.timeEnd('unadjustedGraph')
console.time('path') console.time('path')
this.#path = Pathfind.shortestPath(unadjustedGraph, this.position, fixedDest, this.radius, this.collidables()).map(([unadjusted, direction]) => unadjusted.clone().add(direction.clone().multiplyScalar(this.radius))) this.#path = Pathfind.shortestPath(unadjustedGraph, this.position, fixedDest).map(([unadjusted, direction]) => unadjusted.clone().add(direction.clone().multiplyScalar(this.radius)))
console.log(this.#path) console.log(this.#path)
console.timeEnd('path') console.timeEnd('path')
console.timeEnd('pathfinding') console.timeEnd('pathfinding')
src/pathfind.js
+4 -14
View File
@@ -7,7 +7,7 @@ export default class Pathfind {
return `${pos.x},${pos.y}` return `${pos.x},${pos.y}`
} }
static shortestPath(graph, start, goal, radius = 0, colliders = []) { static shortestPath(graph, start, goal) {
const queue = new PriorityQueue((a, b) => a[1] < b[1]) const queue = new PriorityQueue((a, b) => a[1] < b[1])
const visited = new Map() const visited = new Map()
@@ -26,17 +26,7 @@ export default class Pathfind {
if (!visited.has(key) || visited.get(key) > cost) { if (!visited.has(key) || visited.get(key) > cost) {
visited.set(key, cost) visited.set(key, cost)
for (const { from, to, direction, reverseDirection, distance } of graph.filter(e => e.from.equals(waypoint))) { for (const { to, direction, distance } of graph.filter(e => e.from.equals(waypoint))) {
if (radius > 0 && colliders.length > 0) {
const adjustedFrom = from.clone().add(reverseDirection.clone().multiplyScalar(radius))
const adjustedTo = to.clone().add(direction.clone().multiplyScalar(radius))
const colliding = SATX.collideObjects(SATX.entityTunnel(adjustedFrom, adjustedTo, radius), colliders)
if (colliding) {
continue
}
}
const keyTo = this.keyFor(to) const keyTo = this.keyFor(to)
if (!visited.has(keyTo) || visited.get(keyTo) > cost + distance) { if (!visited.has(keyTo) || visited.get(keyTo) > cost + distance) {
queue.push([[...path, [to, direction]], cost + distance]) queue.push([[...path, [to, direction]], cost + distance])
@@ -67,8 +57,8 @@ export default class Pathfind {
if (lineOfSight) { if (lineOfSight) {
const distance = from.distanceTo(to) const distance = from.distanceTo(to)
graph.push({ from, to, distance, direction, reverseDirection }) graph.push({ from, to, distance, direction })
graph.push({ to: from, from: to, distance, direction: reverseDirection, reverseDirection: direction }) graph.push({ to: from, from: to, distance, direction: reverseDirection })
} }
} }
} }