mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 21:04:14 +00:00
0e3ced3bfa
## Playtest https://pf-pt-2.openfront.dev/ ## Pathfinding Refactor pt. 2 <img width="1536" height="1024" alt="image" src="https://github.com/user-attachments/assets/9477958e-54b7-4c83-b317-ba789e809e9e" /> This is a follow-up to a previous PR introducing pathfinding changes. This time, it introduces a complete refactor of `pathfinding` directory and breakdown into composable pieces. ### Unified PathFinder interface `PathFinder<T>` and `SteppingPathFinder<T>` are introduced to unify **all** pathfinding across the application. First one exposes complete path, while stepping variant allows the callee to iterate over the path by calling `.next`. All pathfinders share this one common interface, which makes them easy to use in any scenario - `PathFinding.Water(game).search(from, to)`. `SteppingPathFinder<T>` extends `PathFinder<T>` with an ability to iterate over the path. It handles caching, storing current index and invalidation. This allows the units to not care about the inner workings of the pathfinder and just call `pf.next(current, target)` and receive instructions on what to do next. ### Common entry point All pathfinders are now exposed from common `PathFinding` entrypoint: - `PathFinding.Water` - `PathFinding.Rail` - `PathFinding.Stations` - `PathFinding.Rail` Additional entry point is introduced for pathfinders which need to work both in the worker, but also on the frontend, which lacks `Game` interface. Currently only `UniversalPathFinding.Parabola` is available. ### Spatial Query New module has been introduced close to `pathfinding` - `SpatialQuery`. It aims to resolve any questions game may have about finding tiles meeting criteria. Currently `SpatialQuery.closestShore(player, target)` and `SpatialQuery.closestShoreByWater(player, target)` are available - they help answering questions about naval invasion: "What is the best landing location from user's click?" and "Which our tile should be used to launch the transport ship?". Under the hood they use very similar mechanics to pathfinding, so it felt right to put them close by. ### Modular architecture Pathfinders now support transformers: `MiniMapTransformer`, `ShoreCoercingTransformer`, `ComponentCheckTransformer`, `SmoothingTransformer`. Transformers functions like a middleware in the pathfinding chain. They wrap around the pathfinder and provide additional functionality. This allows the pathfinder to focus on actually finding the path instead of doing unrelated things. Example chain for simple (A*) water pathfinding: ```ts static WaterSimple(game: Game): SteppingPathFinder<TileRef> { const miniMap = game.miniMap(); const pf = new AStarWater(miniMap); return PathFinderBuilder.create(pf) .wrap((pf) => new ShoreCoercingTransformer(pf, miniMap)) .wrap((pf) => new MiniMapTransformer(pf, game.map(), miniMap)) .buildWithStepper(tileStepperConfig(game)); } ``` The Pathfinder - here `AStarWater` - does not care about the conversion between minimap and main map tiles. It also does not care if the source or destination is a land tile. The transformers take care of that. The pathfinder gets a set of valid coordinates and produces the path - that's it. Modular approach makes working on a particular set of utilities much easier - for example map upscaling is handled consistently across all pathfinders. Additionally, the pathfinders are not tied to the particular map resolution used. Pass them a different map and they will work the same. ### Algorithms Algorithms used are neatly organized inside `src/core/pathfinding/algorithms`. They are prefixed with the algorithm name and suffixed with the use case. File without suffix exposes generic version ready to traverse any graph with adapters. Specialized versions either use an adapter or inline logic when performance is critical - using adapters leads to 20-30% performance loss. The directory includes `A*` and `BFS` but also other useful utils, such as `AbstractGraph` used to generate... an abstract graph on top of the tile map and `ConnectedComponents` helping to identify whether two tiles are connected by a path without actually computing the path. ### Playground The playground have been updated with new algorithms, including tweaked very greedy `A*`. <img width="2175" height="1424" alt="image" src="https://github.com/user-attachments/assets/1f833651-0024-4299-bf86-882f5368358c" /> ### Tests Yeah, there are some, a little too many if I say so myself. But there are no useless tests. I had to ensure refactored code works somehow reliably. This PR comes with trust me bro guarantee, but I would appreciate someone confirming **naval invasions, nukes (esp. MIRV) and warships**. ### Discord `moleole` GL & HF
278 lines
7.6 KiB
TypeScript
278 lines
7.6 KiB
TypeScript
import { beforeAll, describe, expect, it, vi } from "vitest";
|
|
import { Game } from "../../../src/core/game/Game";
|
|
import { TileRef } from "../../../src/core/game/GameMap";
|
|
import { PathFinding } from "../../../src/core/pathfinding/PathFinder";
|
|
import {
|
|
PathStatus,
|
|
SteppingPathFinder,
|
|
} from "../../../src/core/pathfinding/types";
|
|
import { setup } from "../../util/Setup";
|
|
import { createGame, L, W } from "./_fixtures";
|
|
|
|
describe("PathFinding.Water", () => {
|
|
let game: Game;
|
|
let worldGame: Game;
|
|
|
|
function createPathFinder(g: Game = game): SteppingPathFinder<TileRef> {
|
|
return PathFinding.Water(g);
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
game = await setup("ocean_and_land");
|
|
worldGame = await setup("world", { disableNavMesh: false });
|
|
});
|
|
|
|
describe("findPath", () => {
|
|
it("finds path between adjacent water tiles", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
const from = map.ref(8, 0);
|
|
const to = map.ref(9, 0);
|
|
|
|
expect(map.isWater(from)).toBe(true);
|
|
expect(map.isWater(to)).toBe(true);
|
|
|
|
const path = pathFinder.findPath(from, to);
|
|
|
|
expect(path).not.toBeNull();
|
|
expect(path!.length).toBe(2);
|
|
expect(path![0]).toBe(from);
|
|
expect(path![1]).toBe(to);
|
|
});
|
|
|
|
it("returns null for land tiles", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
const landTile = map.ref(0, 0);
|
|
const waterTile = map.ref(8, 0);
|
|
|
|
expect(map.isLand(landTile)).toBe(true);
|
|
expect(map.isShore(landTile)).toBe(false);
|
|
expect(map.isWater(waterTile)).toBe(true);
|
|
|
|
const path = pathFinder.findPath(landTile, waterTile);
|
|
|
|
expect(path).toBeNull();
|
|
});
|
|
|
|
it("returns single-tile path when from equals to", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
const waterTile = map.ref(8, 0);
|
|
expect(map.isWater(waterTile)).toBe(true);
|
|
|
|
const path = pathFinder.findPath(waterTile, waterTile);
|
|
|
|
expect(path).not.toBeNull();
|
|
expect(path!.length).toBe(1);
|
|
expect(path![0]).toBe(waterTile);
|
|
});
|
|
|
|
it("supports multiple start tiles", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
const dest = map.ref(8, 0);
|
|
const source1 = map.ref(9, 0);
|
|
const source2 = map.ref(8, 1);
|
|
|
|
expect(map.isWater(dest)).toBe(true);
|
|
expect(map.isWater(source1)).toBe(true);
|
|
expect(map.isWater(source2)).toBe(true);
|
|
|
|
const from = [source1, source2];
|
|
const path = pathFinder.findPath(from, dest);
|
|
|
|
expect(path).not.toBeNull();
|
|
expect(path!.length).toBe(2);
|
|
expect(from).toContain(path![0]);
|
|
expect(path![1]).toBe(dest);
|
|
});
|
|
});
|
|
|
|
describe("path validity", () => {
|
|
it("all consecutive tiles in path are connected", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
// Distant water tiles: (8,0) → (15,4), distance = 11
|
|
const from = map.ref(8, 0);
|
|
const to = map.ref(15, 4);
|
|
|
|
expect(map.isWater(from)).toBe(true);
|
|
expect(map.isWater(to)).toBe(true);
|
|
expect(map.manhattanDist(from, to)).toBe(11);
|
|
|
|
const path = pathFinder.findPath(from, to);
|
|
|
|
expect(path).not.toBeNull();
|
|
|
|
for (let i = 1; i < path!.length; i++) {
|
|
const dist = map.manhattanDist(path![i - 1], path![i]);
|
|
expect(dist).toEqual(1);
|
|
}
|
|
});
|
|
});
|
|
|
|
describe("shore handling", () => {
|
|
it("path from shore to shore starts and ends on shore", () => {
|
|
const pathFinder = createPathFinder();
|
|
const map = game.map();
|
|
|
|
// Shore tiles at (7,0) and (7,6), distance = 6
|
|
// Both have water neighbors at (8,0) and (8,6)
|
|
const from = map.ref(7, 0);
|
|
const to = map.ref(7, 6);
|
|
|
|
expect(map.isShore(from)).toBe(true);
|
|
expect(map.isShore(to)).toBe(true);
|
|
expect(map.manhattanDist(from, to)).toBe(6);
|
|
|
|
const path = pathFinder.findPath(from, to);
|
|
|
|
expect(path).not.toBeNull();
|
|
expect(path![0]).toBe(from);
|
|
expect(path![path!.length - 1]).toBe(to);
|
|
});
|
|
});
|
|
|
|
describe("determinism", () => {
|
|
it("same inputs produce identical paths", () => {
|
|
const pathFinder1 = createPathFinder();
|
|
const pathFinder2 = createPathFinder();
|
|
const map = game.map();
|
|
|
|
// Distant water tiles: (8,0) → (15,4)
|
|
const from = map.ref(8, 0);
|
|
const to = map.ref(15, 4);
|
|
|
|
const path1 = pathFinder1.findPath(from, to);
|
|
const path2 = pathFinder2.findPath(from, to);
|
|
|
|
expect(path1).not.toBeNull();
|
|
expect(path2).not.toBeNull();
|
|
expect(path1).toEqual(path2);
|
|
});
|
|
});
|
|
|
|
describe("World map routes", () => {
|
|
it("Spain to France (Mediterranean)", () => {
|
|
const pathFinder = createPathFinder(worldGame);
|
|
const path = pathFinder.findPath(
|
|
worldGame.ref(926, 283),
|
|
worldGame.ref(950, 257),
|
|
);
|
|
expect(path).not.toBeNull();
|
|
});
|
|
|
|
it("Miami to Rio (Atlantic)", () => {
|
|
const pathFinder = createPathFinder(worldGame);
|
|
const path = pathFinder.findPath(
|
|
worldGame.ref(488, 355),
|
|
worldGame.ref(680, 658),
|
|
);
|
|
expect(path).not.toBeNull();
|
|
});
|
|
|
|
it("France to Poland (around Europe)", () => {
|
|
const pathFinder = createPathFinder(worldGame);
|
|
const path = pathFinder.findPath(
|
|
worldGame.ref(950, 257),
|
|
worldGame.ref(1033, 175),
|
|
);
|
|
expect(path).not.toBeNull();
|
|
});
|
|
|
|
it("Miami to Spain (transatlantic)", () => {
|
|
const pathFinder = createPathFinder(worldGame);
|
|
const path = pathFinder.findPath(
|
|
worldGame.ref(488, 355),
|
|
worldGame.ref(926, 283),
|
|
);
|
|
expect(path).not.toBeNull();
|
|
});
|
|
|
|
it("Rio to Poland (South Atlantic to Baltic)", () => {
|
|
const pathFinder = createPathFinder(worldGame);
|
|
const path = pathFinder.findPath(
|
|
worldGame.ref(680, 658),
|
|
worldGame.ref(1033, 175),
|
|
);
|
|
expect(path).not.toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("Error handling", () => {
|
|
it("returns NOT_FOUND for null source", () => {
|
|
const pathFinder = createPathFinder();
|
|
|
|
const consoleSpy = vi
|
|
.spyOn(console, "error")
|
|
.mockImplementation(() => {});
|
|
|
|
const result = pathFinder.next(
|
|
null as unknown as TileRef,
|
|
game.ref(8, 0),
|
|
);
|
|
|
|
expect(result.status).toBe(PathStatus.NOT_FOUND);
|
|
|
|
consoleSpy.mockRestore();
|
|
});
|
|
|
|
it("returns NOT_FOUND for null destination", () => {
|
|
const pathFinder = createPathFinder();
|
|
|
|
const consoleSpy = vi
|
|
.spyOn(console, "error")
|
|
.mockImplementation(() => {});
|
|
|
|
const result = pathFinder.next(
|
|
game.ref(8, 0),
|
|
null as unknown as TileRef,
|
|
);
|
|
|
|
expect(result.status).toBe(PathStatus.NOT_FOUND);
|
|
|
|
consoleSpy.mockRestore();
|
|
});
|
|
});
|
|
|
|
describe("Known bugs", () => {
|
|
it("path can cross 1-tile land barrier", () => {
|
|
const syntheticGame = createGame({
|
|
width: 10,
|
|
height: 1,
|
|
grid: [W, L, L, W, L, W, W, L, L, W],
|
|
});
|
|
|
|
const pathFinder = createPathFinder(syntheticGame);
|
|
const path = pathFinder.findPath(
|
|
syntheticGame.ref(0, 0),
|
|
syntheticGame.ref(9, 0),
|
|
);
|
|
|
|
expect(path).not.toBeNull();
|
|
});
|
|
|
|
it("path can cross diagonal land barrier", () => {
|
|
const syntheticGame = createGame({
|
|
width: 2,
|
|
height: 2,
|
|
grid: [W, L, L, W],
|
|
});
|
|
|
|
const pathFinder = createPathFinder(syntheticGame);
|
|
const path = pathFinder.findPath(
|
|
syntheticGame.ref(0, 0),
|
|
syntheticGame.ref(1, 1),
|
|
);
|
|
|
|
expect(path).not.toBeNull();
|
|
});
|
|
});
|
|
});
|