7c8b5aeb23
Add per-planet cargo routes (COL/CAP/MAT/EMP) to the inspector with a renderer-driven destination picker (faded out-of-reach planets, cursor-line anchor, hover-highlight) and per-route arrows on the map. The pick-mode primitives are exposed via `MapPickService` so ship-group dispatch in Phase 19/20 can reuse the same surface. Pass A — generic map foundation: - hit-test now sizes the click zone to `pointRadiusPx + slopPx` so the visible disc is always part of the target. - `RendererHandle` gains `onPointerMove`, `onHoverChange`, `setPickMode`, `getPickState`, `getPrimitiveAlpha`, `setExtraPrimitives`, `getPrimitives`. The click dispatcher is centralised: pick-mode swallows clicks atomically so the standard selection consumers do not race against teardown. - `MapPickService` (`lib/map-pick.svelte.ts`) wraps the renderer contract in a promise-shaped `pick(...)`. The in-game shell layout owns the service so sidebar and bottom-sheet inspectors see the same instance. - Debug-surface registry exposes `getMapPrimitives`, `getMapPickState`, `getMapCamera` to e2e specs without spawning a separate debug page after navigation. Pass B — cargo-route feature: - `CargoLoadType`, `setCargoRoute`, `removeCargoRoute` typed variants with `(source, loadType)` collapse rule on the order draft; round-trip through the FBS encoder/decoder. - `GameReport` decodes `routes` and the local player's drive tech for the inline reach formula (40 × drive). `applyOrderOverlay` upserts/drops route entries for valid/submitting/applied commands. - `lib/inspectors/planet/cargo-routes.svelte` renders the four-slot section. `Add` / `Edit` call `MapPickService.pick`, `Remove` emits `removeCargoRoute`. - `map/cargo-routes.ts` builds shaft + arrowhead primitives per cargo type; the map view pushes them through `setExtraPrimitives` so the renderer never re-inits Pixi on route mutations (Pixi 8 doesn't support that on a reused canvas). Docs: - `docs/cargo-routes-ux.md` covers engine semantics + UI map. - `docs/renderer.md` documents pick mode and the debug surface. - `docs/calc-bridge.md` records the Phase 16 reach waiver. - `PLAN.md` rewrites Phase 16 to reflect the foundation + feature split and the decisions baked in (map-driven picker, inline reach, optimistic overlay via `setExtraPrimitives`). Tests: - `tests/map-pick-mode.test.ts` — pure overlay-spec helper. - `tests/map-cargo-routes.test.ts` — `buildCargoRouteLines`. - `tests/inspector-planet-cargo-routes.test.ts` — slot rendering, picker invocation, collapse, cancel, remove. - Extensions to `order-draft`, `submit`, `order-load`, `order-overlay`, `state-binding`, `inspector-planet`, `inspector-overlay`, `game-shell-sidebar`, `game-shell-header`. - `tests/e2e/cargo-routes.spec.ts` — Playwright happy path: add COL, add CAP, remove COL, asserting both the inspector and the arrow count via `__galaxyDebug.getMapPrimitives()`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
283 lines
9.5 KiB
TypeScript
283 lines
9.5 KiB
TypeScript
// Hand-built cases for the hit-test pass in src/map/hit-test.ts.
|
||
//
|
||
// Each describe block exercises one rule from the algorithm spec in
|
||
// ui/docs/renderer.md. Worlds are kept tiny (1–5 primitives) so the
|
||
// expected hit is obvious from the geometry; the camera is at scale=1
|
||
// in most cases so slop in pixels equals slop in world units.
|
||
//
|
||
// The point hit zone is `(pointRadiusPx + slopPx) / camera.scale`
|
||
// world units — the visible disc plus an ergonomic slop on top. The
|
||
// default `pointRadiusPx` (`DEFAULT_POINT_RADIUS_PX`) is 3 and the
|
||
// default point slop (`DEFAULT_HIT_SLOP_PX.point`) is 4, so a default
|
||
// point is hit out to 7 world units at scale=1.
|
||
|
||
import { describe, expect, test } from "vitest";
|
||
import { hitTest } from "../src/map/hit-test";
|
||
import {
|
||
type Camera,
|
||
type Primitive,
|
||
type Viewport,
|
||
World,
|
||
type WrapMode,
|
||
} from "../src/map/world";
|
||
|
||
const VP: Viewport = { widthPx: 200, heightPx: 200 };
|
||
// Centre the camera over the world centre at scale=1 so screen px
|
||
// equals world units inside the visible region.
|
||
function camAt(centerX: number, centerY: number, scale = 1): Camera {
|
||
return { centerX, centerY, scale };
|
||
}
|
||
// Cursor at world point (wx, wy) under the given camera.
|
||
function cursorOver(wx: number, wy: number, cam: Camera, vp: Viewport = VP) {
|
||
return {
|
||
x: vp.widthPx / 2 + (wx - cam.centerX) * cam.scale,
|
||
y: vp.heightPx / 2 + (wy - cam.centerY) * cam.scale,
|
||
};
|
||
}
|
||
|
||
function point(
|
||
id: number,
|
||
x: number,
|
||
y: number,
|
||
overrides: Partial<Primitive> = {},
|
||
): Primitive {
|
||
return {
|
||
kind: "point",
|
||
id,
|
||
x,
|
||
y,
|
||
priority: 0,
|
||
style: {},
|
||
hitSlopPx: 0,
|
||
...overrides,
|
||
} as Primitive;
|
||
}
|
||
|
||
function circle(
|
||
id: number,
|
||
x: number,
|
||
y: number,
|
||
radius: number,
|
||
overrides: Partial<Primitive> = {},
|
||
): Primitive {
|
||
return {
|
||
kind: "circle",
|
||
id,
|
||
x,
|
||
y,
|
||
radius,
|
||
priority: 0,
|
||
style: {},
|
||
hitSlopPx: 0,
|
||
...overrides,
|
||
} as Primitive;
|
||
}
|
||
|
||
function line(
|
||
id: number,
|
||
x1: number,
|
||
y1: number,
|
||
x2: number,
|
||
y2: number,
|
||
overrides: Partial<Primitive> = {},
|
||
): Primitive {
|
||
return {
|
||
kind: "line",
|
||
id,
|
||
x1,
|
||
y1,
|
||
x2,
|
||
y2,
|
||
priority: 0,
|
||
style: {},
|
||
hitSlopPx: 0,
|
||
...overrides,
|
||
} as Primitive;
|
||
}
|
||
|
||
function ids(world: World, mode: WrapMode, cam: Camera, cursorPx: { x: number; y: number }) {
|
||
const h = hitTest(world, cam, VP, cursorPx, mode);
|
||
return h?.primitive.id ?? null;
|
||
}
|
||
|
||
describe("hitTest — point primitive", () => {
|
||
const cam = camAt(500, 500);
|
||
const w = new World(1000, 1000, [point(1, 500, 500)]);
|
||
|
||
test("direct hit at centre", () => {
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(1);
|
||
});
|
||
test("hit on the visible disc edge (3 world units from centre)", () => {
|
||
// Default radius 3 → cursor 3 units away lands on the disc.
|
||
expect(ids(w, "torus", cam, cursorOver(503, 500, cam))).toBe(1);
|
||
});
|
||
test("hit just inside the default slop margin (within radius+slop)", () => {
|
||
// 7 world units away at scale=1 → equals radius (3) + slop (4).
|
||
expect(ids(w, "torus", cam, cursorOver(507, 500, cam))).toBe(1);
|
||
});
|
||
test("miss just outside radius+slop", () => {
|
||
// 9 world units away at scale=1 → radius+slop is 7.
|
||
expect(ids(w, "torus", cam, cursorOver(509, 500, cam))).toBe(null);
|
||
});
|
||
test("explicit pointRadiusPx widens the visible footprint", () => {
|
||
// pointRadiusPx 10 + default slop 4 → hit out to 14 world units.
|
||
const w2 = new World(1000, 1000, [
|
||
point(1, 500, 500, { style: { pointRadiusPx: 10 } }),
|
||
]);
|
||
expect(ids(w2, "torus", cam, cursorOver(513, 500, cam))).toBe(1);
|
||
expect(ids(w2, "torus", cam, cursorOver(515, 500, cam))).toBe(null);
|
||
});
|
||
test("custom hitSlopPx widens the slop margin", () => {
|
||
// pointRadiusPx defaults to 3; slop override is 20.
|
||
// Cursor 22 world units away → within 3+20.
|
||
const w2 = new World(1000, 1000, [point(1, 500, 500, { hitSlopPx: 20 })]);
|
||
expect(ids(w2, "torus", cam, cursorOver(522, 500, cam))).toBe(1);
|
||
expect(ids(w2, "torus", cam, cursorOver(524, 500, cam))).toBe(null);
|
||
});
|
||
});
|
||
|
||
describe("hitTest — torus wrap", () => {
|
||
test("point near the right edge is hit by cursor near the left edge", () => {
|
||
// World 100×100, point at x=98. Camera at left edge (x=2).
|
||
// Cursor at x=4 is 6 units from x=98 via the wrap; default
|
||
// point radius (3) + slop (4) = 7 → hit.
|
||
const cam = camAt(2, 50);
|
||
const w = new World(100, 100, [point(1, 98, 50)]);
|
||
expect(ids(w, "torus", cam, cursorOver(4, 50, cam))).toBe(1);
|
||
});
|
||
|
||
test("no-wrap mode does not match through the torus seam", () => {
|
||
const cam = camAt(2, 50);
|
||
const w = new World(100, 100, [point(1, 98, 50)]);
|
||
expect(ids(w, "no-wrap", cam, cursorOver(4, 50, cam))).toBe(null);
|
||
});
|
||
|
||
test("line spanning the torus seam is hit at the wrapped midpoint", () => {
|
||
// World 100×100, line from (95, 50) to (5, 50).
|
||
// Torus-shortest is the wrap segment of length 10.
|
||
// Cursor at x=0,y=50 is on the wrapped segment.
|
||
const cam = camAt(0, 50);
|
||
const w = new World(100, 100, [line(1, 95, 50, 5, 50)]);
|
||
expect(ids(w, "torus", cam, cursorOver(0, 50, cam))).toBe(1);
|
||
});
|
||
});
|
||
|
||
describe("hitTest — circle primitive", () => {
|
||
const cam = camAt(500, 500);
|
||
|
||
test("filled circle: cursor inside disc hits", () => {
|
||
const w = new World(1000, 1000, [
|
||
circle(1, 500, 500, 50, { style: { fillColor: 0xffffff, fillAlpha: 1 } }),
|
||
]);
|
||
expect(ids(w, "torus", cam, cursorOver(530, 500, cam))).toBe(1);
|
||
});
|
||
|
||
test("stroked-only circle: cursor inside disc but far from ring misses", () => {
|
||
const w = new World(1000, 1000, [circle(1, 500, 500, 50)]);
|
||
expect(ids(w, "torus", cam, cursorOver(510, 500, cam))).toBe(null);
|
||
});
|
||
|
||
test("stroked-only circle: cursor on ring within slop hits", () => {
|
||
const w = new World(1000, 1000, [circle(1, 500, 500, 50)]);
|
||
// Cursor at (548, 500): distance to centre is 48; ring at 50;
|
||
// gap is 2 < default slop 6 → hit.
|
||
expect(ids(w, "torus", cam, cursorOver(548, 500, cam))).toBe(1);
|
||
});
|
||
|
||
test("stroked-only circle: cursor far outside the ring misses", () => {
|
||
const w = new World(1000, 1000, [circle(1, 500, 500, 50)]);
|
||
expect(ids(w, "torus", cam, cursorOver(580, 500, cam))).toBe(null);
|
||
});
|
||
});
|
||
|
||
describe("hitTest — line primitive", () => {
|
||
const cam = camAt(500, 500);
|
||
|
||
test("cursor on the segment hits", () => {
|
||
const w = new World(1000, 1000, [line(1, 480, 500, 520, 500)]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(1);
|
||
});
|
||
|
||
test("cursor near the segment within slop hits", () => {
|
||
const w = new World(1000, 1000, [line(1, 480, 500, 520, 500)]);
|
||
// 4 world units away at scale=1 → within default slop 6.
|
||
expect(ids(w, "torus", cam, cursorOver(500, 504, cam))).toBe(1);
|
||
});
|
||
|
||
test("cursor near the segment outside slop misses", () => {
|
||
const w = new World(1000, 1000, [line(1, 480, 500, 520, 500)]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 510, cam))).toBe(null);
|
||
});
|
||
|
||
test("cursor beyond endpoint clamps and slop applies", () => {
|
||
const w = new World(1000, 1000, [line(1, 480, 500, 520, 500)]);
|
||
// 4 world units beyond x=520 along x; default slop 6.
|
||
expect(ids(w, "torus", cam, cursorOver(524, 500, cam))).toBe(1);
|
||
// 8 world units beyond x=520 → outside slop.
|
||
expect(ids(w, "torus", cam, cursorOver(528, 500, cam))).toBe(null);
|
||
});
|
||
});
|
||
|
||
describe("hitTest — ordering", () => {
|
||
const cam = camAt(500, 500);
|
||
|
||
test("higher priority wins over lower priority at equal distance", () => {
|
||
const w = new World(1000, 1000, [
|
||
point(1, 500, 500, { priority: 0 }),
|
||
point(2, 500, 500, { priority: 5 }),
|
||
]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(2);
|
||
});
|
||
|
||
test("smaller distance wins at equal priority", () => {
|
||
const w = new World(1000, 1000, [point(1, 504, 500), point(2, 502, 500)]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(2);
|
||
});
|
||
|
||
test("kind tie-break: point beats circle at exact distance and priority", () => {
|
||
const w = new World(1000, 1000, [
|
||
circle(1, 500, 500, 0.0001, { style: { fillColor: 0xffffff } }),
|
||
point(2, 500, 500),
|
||
]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(2);
|
||
});
|
||
|
||
test("id tie-break: smaller id wins at exact tie", () => {
|
||
const w = new World(1000, 1000, [point(7, 500, 500), point(3, 500, 500)]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(3);
|
||
});
|
||
});
|
||
|
||
describe("hitTest — empty results and scale", () => {
|
||
const cam = camAt(500, 500);
|
||
|
||
test("returns null when nothing matches", () => {
|
||
const w = new World(1000, 1000, [point(1, 100, 100)]);
|
||
expect(ids(w, "torus", cam, cursorOver(500, 500, cam))).toBe(null);
|
||
});
|
||
|
||
test("higher zoom shrinks the on-screen slop in world units", () => {
|
||
// At scale=4, slopPx 4 = 1 world unit; visible radius stays 3
|
||
// world units. Threshold = 4 world units.
|
||
const w = new World(1000, 1000, [point(1, 503, 500)]);
|
||
const cam4 = camAt(500, 500, 4);
|
||
// 3 world units away → on the disc edge → hit.
|
||
expect(ids(w, "torus", cam4, cursorOver(503, 500, cam4))).toBe(1);
|
||
// 5 world units away → beyond radius+slop → null.
|
||
const wFar = new World(1000, 1000, [point(1, 505, 500)]);
|
||
expect(ids(wFar, "torus", cam4, cursorOver(500, 500, cam4))).toBe(null);
|
||
});
|
||
|
||
test("lower zoom widens the on-screen slop in world units", () => {
|
||
// At scale=0.5, slopPx 4 = 8 world units; visible radius
|
||
// stays 3 → threshold = 11 world units.
|
||
const cam05 = camAt(500, 500, 0.5);
|
||
const w = new World(1000, 1000, [point(1, 510, 500)]);
|
||
// 10 world units away → within 11 → hit.
|
||
expect(ids(w, "torus", cam05, cursorOver(500, 500, cam05))).toBe(1);
|
||
const wFar = new World(1000, 1000, [point(1, 514, 500)]);
|
||
// 14 world units away → beyond 11 → null.
|
||
expect(ids(wFar, "torus", cam05, cursorOver(500, 500, cam05))).toBe(null);
|
||
});
|
||
});
|