alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-07-01 19:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

AStar returns cell instead of path

Browse Source
This commit is contained in:
evanpelle
2024-12-03 14:35:09 -08:00
parent 330b6b93cb
commit 4edd66dc1f
12 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/pathfinding/PathFinding.ts
+10 -6
View File
@@ -1,4 +1,4 @@
import { Game, Tile } from "../game/Game";
import { Cell, Game, Tile } from "../game/Game";
import { manhattanDist } from "../Util";
import { AStar, PathFindResultType, TileResult } from "./AStar";
import { ParallelAStar, WorkerClient } from "../worker/WorkerClient";
@@ -9,17 +9,19 @@ export class PathFinder {
private curr: Tile = null
private dst: Tile = null
private path: Tile[]
private path: Cell[]
private aStar: AStar
private computeFinished = true
private constructor(
private game: Game,
private newAStar: (curr: Tile, dst: Tile) => AStar
) { }
public static Mini(game: Game, iterations: number, canMove: (t: Tile) => boolean, maxTries: number = 20) {
return new PathFinder(
game,
(curr: Tile, dst: Tile) => {
return new MiniAStar(
game.terrainMap(),
@@ -34,8 +36,9 @@ export class PathFinder {
)
}
public static Serial(iterations: number, canMove: (t: Tile) => boolean, maxTries: number = 20): PathFinder {
public static Serial(game: Game, iterations: number, canMove: (t: Tile) => boolean, maxTries: number = 20): PathFinder {
return new PathFinder(
game,
(curr: Tile, dst: Tile) => {
return new SerialAStar(
curr,
@@ -48,8 +51,9 @@ export class PathFinder {
)
}
public static Parallel(worker: WorkerClient, numTicks: number): PathFinder {
public static Parallel(game: Game, worker: WorkerClient, numTicks: number): PathFinder {
return new PathFinder(
game,
(curr: Tile, dst: Tile) => {
return worker.createParallelAStar(curr, dst, numTicks)
}
@@ -77,14 +81,14 @@ export class PathFinder {
this.computeFinished = false
return this.nextTile(curr, dst)
} else {
return { type: PathFindResultType.NextTile, tile: this.path.shift() }
return { type: PathFindResultType.NextTile, tile: this.game.tile(this.path.shift()) }
}
}
switch (this.aStar.compute()) {
case PathFindResultType.Completed:
this.computeFinished = true
this.path = this.aStar.reconstructPath() as Tile[]
this.path = this.aStar.reconstructPath()
// Remove the start tile
this.path.shift()
return this.nextTile(curr, dst)