ui/phase-16: cargo routes inspector + map pick foundation
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>
This commit is contained in:
Ilia Denisov
@@ -0,0 +1,179 @@
|
||||
// Pure-state coverage for the pick-mode overlay helper. The
|
||||
// renderer owns the Pixi side (`render.ts.openPickMode`); this file
|
||||
// asserts that `computePickOverlay` produces the correct draw spec
|
||||
// for every meaningful input combination — Pixi-free, so it stays
|
||||
// fast and stable against renderer plumbing changes.
|
||||
|
||||
import { describe, expect, test } from "vitest";
|
||||
|
||||
import {
|
||||
ANCHOR_PADDING_WORLD,
|
||||
HOVER_PADDING_WORLD,
|
||||
computePickOverlay,
|
||||
type PickModeOptions,
|
||||
} from "../src/map/pick-mode";
|
||||
import {
|
||||
DEFAULT_POINT_RADIUS_PX,
|
||||
type PointPrim,
|
||||
type PrimitiveID,
|
||||
} from "../src/map/world";
|
||||
|
||||
function makePoint(
|
||||
id: PrimitiveID,
|
||||
x: number,
|
||||
y: number,
|
||||
pointRadiusPx?: number,
|
||||
): PointPrim {
|
||||
return {
|
||||
kind: "point",
|
||||
id,
|
||||
priority: 0,
|
||||
hitSlopPx: 0,
|
||||
x,
|
||||
y,
|
||||
style: pointRadiusPx === undefined ? {} : { pointRadiusPx },
|
||||
};
|
||||
}
|
||||
|
||||
function makeOptions(
|
||||
overrides: Partial<PickModeOptions> = {},
|
||||
): PickModeOptions {
|
||||
return {
|
||||
sourcePrimitiveId: 1,
|
||||
sourceX: 100,
|
||||
sourceY: 100,
|
||||
reachableIds: new Set([2, 3]),
|
||||
onPick: () => {},
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
describe("computePickOverlay", () => {
|
||||
const points = new Map<PrimitiveID, PointPrim>([
|
||||
[1, makePoint(1, 100, 100, 6)],
|
||||
[2, makePoint(2, 200, 100, 5)],
|
||||
[3, makePoint(3, 100, 200)],
|
||||
[4, makePoint(4, 300, 300, 4)],
|
||||
]);
|
||||
const allIds: PrimitiveID[] = [1, 2, 3, 4];
|
||||
|
||||
test("anchor radius equals source pointRadiusPx + ANCHOR_PADDING_WORLD", () => {
|
||||
const spec = computePickOverlay(makeOptions(), null, null, points, allIds);
|
||||
expect(spec.anchor.x).toBe(100);
|
||||
expect(spec.anchor.y).toBe(100);
|
||||
expect(spec.anchor.radius).toBe(6 + ANCHOR_PADDING_WORLD);
|
||||
});
|
||||
|
||||
test("anchor radius falls back to default when source has no pointRadiusPx", () => {
|
||||
const sourceless = new Map(points);
|
||||
sourceless.set(1, makePoint(1, 100, 100));
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
null,
|
||||
null,
|
||||
sourceless,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.anchor.radius).toBe(
|
||||
DEFAULT_POINT_RADIUS_PX + ANCHOR_PADDING_WORLD,
|
||||
);
|
||||
});
|
||||
|
||||
test("dimmedIds covers everything outside source + reachable", () => {
|
||||
const spec = computePickOverlay(makeOptions(), null, null, points, allIds);
|
||||
expect(Array.from(spec.dimmedIds).sort()).toEqual([4]);
|
||||
});
|
||||
|
||||
test("dimmedIds is empty when every primitive is either source or reachable", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions({ reachableIds: new Set([2, 3, 4]) }),
|
||||
null,
|
||||
null,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.dimmedIds.size).toBe(0);
|
||||
});
|
||||
|
||||
test("line is null while the cursor is off-canvas", () => {
|
||||
const spec = computePickOverlay(makeOptions(), null, null, points, allIds);
|
||||
expect(spec.line).toBeNull();
|
||||
});
|
||||
|
||||
test("line endpoints follow the cursor when present", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 250, y: 320 },
|
||||
null,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.line).toEqual({
|
||||
x1: 100,
|
||||
y1: 100,
|
||||
x2: 250,
|
||||
y2: 320,
|
||||
});
|
||||
});
|
||||
|
||||
test("hoverOutline is null when nothing is hovered", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 1, y: 1 },
|
||||
null,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.hoverOutline).toBeNull();
|
||||
});
|
||||
|
||||
test("hoverOutline is null when the hover targets a non-reachable primitive", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 1, y: 1 },
|
||||
4,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.hoverOutline).toBeNull();
|
||||
});
|
||||
|
||||
test("hoverOutline is null when the hover targets the source planet", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 1, y: 1 },
|
||||
1,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.hoverOutline).toBeNull();
|
||||
});
|
||||
|
||||
test("hoverOutline reflects the reachable target with HOVER_PADDING_WORLD", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 1, y: 1 },
|
||||
2,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.hoverOutline).toEqual({
|
||||
x: 200,
|
||||
y: 100,
|
||||
radius: 5 + HOVER_PADDING_WORLD,
|
||||
});
|
||||
});
|
||||
|
||||
test("hoverOutline radius falls back to default radius for default-style points", () => {
|
||||
const spec = computePickOverlay(
|
||||
makeOptions(),
|
||||
{ x: 1, y: 1 },
|
||||
3,
|
||||
points,
|
||||
allIds,
|
||||
);
|
||||
expect(spec.hoverOutline?.radius).toBe(
|
||||
DEFAULT_POINT_RADIUS_PX + HOVER_PADDING_WORLD,
|
||||
);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user