From dceff97fed0174d117d6b4c6f7ed9f5f9cf85710 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Thu, 24 Sep 2026 01:26:47 +0000 Subject: [PATCH] fix(hud): paint the radar as solid ground and fog Exploration tiles overlapped as translucent fills, which drew a grid on the minimap. Opaque tiles keep explored ground pale blue and uncharted space dark, with no cell borders. --- docs/wiki-source-review.json | 7 +- src/rendering/hud/minimap.ts | 26 +++++- src/wiki/articleSources.json | 1 + ...exploration-is-solid-fog-or-ground.test.ts | 84 +++++++++++++++++++ 4 files changed, 112 insertions(+), 6 deletions(-) create mode 100644 tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts diff --git a/docs/wiki-source-review.json b/docs/wiki-source-review.json index 4cc3edaf1..bc3acfaec 100644 --- a/docs/wiki-source-review.json +++ b/docs/wiki-source-review.json @@ -1,5 +1,5 @@ { - "note": "No player-facing field-manual change. Production log forwarding is an ops diagnostic: warnings, errors, and death/respawn still forward; reconnect and snapshot info stay in the browser. A bad /logs frame is terminated once. Checked hud-network Copy Diagnostics and controls; no article or GIF depicts the /logs socket. Existing demonstrations do not need regeneration.", + "note": "Radar exploration tiles are opaque, so explored ground and fog are solid instead of a cell grid. hud-network still describes the pale blue tint and dark fog; no article or demonstration change.", "hashes": { ".pages.yml": "sha256:a5bc4164a31fcb4a64cada6e51ad5586b9a81208ffb832c0b9a4d49430d3e84e", "docs/diagnostics.md": "sha256:2b17b05dab0db84467afd3764244aa2eb1e570d194f6c262383bcbed80fd18b7", @@ -263,7 +263,7 @@ "src/rendering/hud/gameInfo.ts": "sha256:4d3feb217dbe1c4f5f3f457f9cb9a4a172a10ded3957780c63be70d6bac32345", "src/rendering/hud/hudLayout.ts": "sha256:7811dbd19774bbf8f50ed482333a75b1daf5597ef4aa79945a83aad91f0da2ae", "src/rendering/hud/leaderboard.ts": "sha256:9b11db76cc6635998907bccc4a9f388aa458beb8d3d7c07bb51ff39bfa9e1b47", - "src/rendering/hud/minimap.ts": "sha256:f6c785bf34bd6421535b999f3788eca0cf1c5ca8af9e6e6c5a06c2c0ff7d95c8", + "src/rendering/hud/minimap.ts": "sha256:9b4a5f42a3041acd1ea2779912c5f38ddc3782f88b73dc68c8a7f603db599d5e", "src/rendering/hud/resourceMapMark.ts": "sha256:0f2fff2bfeab6eee5719bc0d6ff7f18d6f42b5be3a5613c0de42ab9dc0b45f3a", "src/rendering/playfieldCamera.ts": "sha256:57f526c939e5e78115e92dc5548bf57a0f94f5c2873fe2884ff4e574bf772e1f", "src/rendering/renderError.ts": "sha256:426004f76c64f1e368bad54c746a8799c7bc7044a701717a5bb083f3b4c94a99", @@ -310,7 +310,7 @@ "src/utils/safeStorage.ts": "sha256:9540743d8a87bca16e1243f389113f48a14bfda169475115e4b1ead9eaae6874", "src/utils/spawnPosition.ts": "sha256:1a4787336bd4368fdf4d7796f5c0f1835e1bdfda1e230ab58bcc51732e3b7f1d", "src/wiki/article.ts": "sha256:b62f1df19562aa8d5f970a31a162080adaf833e1ac97f68c2a229f4b8dde13fe", - "src/wiki/articleSources.json": "sha256:cc6763407a8257cb93472babbbaddaa474dcd49d2ebe0f4c198b84df73bc0224", + "src/wiki/articleSources.json": "sha256:ad202959d0255917e37c983ecf5916e92cdf4d8287550908b105ed45e5bdb6fb", "src/wiki/gameReference.ts": "sha256:cc09472e3881bfefa3a295a8149af5bfda15dace55c4bce6b177e754ab693270", "src/wiki/main.ts": "sha256:55e2f9bc2a01cc11b571eaf4e2cc227e4e1b814d13c1598769d4bfe4b9093222", "src/wiki/media.ts": "sha256:dce3d7248903643ac58eac57ad2b174fc7bdbd04824c9c793ca2dd4d375436b4", @@ -399,6 +399,7 @@ "tests/unit/rendering/furnace-hearth-roars-inside-the-delivery-zone.test.ts": "sha256:a8832858486e2933669ed0acf0c21289a834216059e1ba9836cf7f1e31ba65e6", "tests/unit/rendering/hudLayout.test.ts": "sha256:7cfc46f13773100f2be43fe2e2020e6d13f92ab573985a13bdf84019d55cad89", "tests/unit/rendering/playfield-chrome-matches-the-visible-viewport.test.ts": "sha256:ac7e16a1adc58732b4eafe3ef935aa27eace2f1f24bfac38e1e19ff1d232f407", + "tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts": "sha256:1a7af63eab933c85bd62b5522fd3db45edd55d5b6d4c656d621baac4f61ee9fb", "tests/unit/rendering/radar-marks-a-discovered-furnace-as-fire.test.ts": "sha256:04d41ef533d651d95705d74482b1d124b755c6b97b9f0b506d2ab66ba9f3572e", "tests/unit/rendering/radar-shows-a-fire-trail-only-after-the-furnace-is-lit.test.ts": "sha256:11bbb8a1ec7495a3ef75c7f4068d01bd3c068872e519d712ff12911592f0d118", "tests/unit/rendering/short-touch-screens-keep-inventory-off-the-radar.test.ts": "sha256:694e404bf265b3a27dd87d1543e5d3c420bc40b5a7f6525e012cfc3a6e3109e4", diff --git a/src/rendering/hud/minimap.ts b/src/rendering/hud/minimap.ts index 95d6c1411..4244ad04f 100644 --- a/src/rendering/hud/minimap.ts +++ b/src/rendering/hud/minimap.ts @@ -156,11 +156,30 @@ function isExploredPosition( return cell !== null && isCellExplored(geometry.exploration, cell); } +const EXPLORED_RADAR_ALPHA = 0.18; + +function hexChannels(hex: string): [number, number, number] { + const raw = hex.startsWith('#') ? hex.slice(1) : hex; + return [ + Number.parseInt(raw.slice(0, 2), 16), + Number.parseInt(raw.slice(2, 4), 16), + Number.parseInt(raw.slice(4, 6), 16), + ]; +} + +/** One solid color. Translucent tiles double-paint their overlap and read as a grid. */ +function solidRadarInk(tint: string, alpha: number): string { + const [backR, backG, backB] = hexChannels(PALETTE.BG); + const [tintR, tintG, tintB] = hexChannels(tint); + const mix = (back: number, front: number) => Math.round(back + (front - back) * alpha); + return `rgb(${mix(backR, tintR)}, ${mix(backG, tintG)}, ${mix(backB, tintB)})`; +} + /** Draw the shared exploration mask behind known world marks. */ function drawExplorationFog(ctx: CanvasRenderingContext2D, geometry: MiniMapGeometry): void { ctx.save(); - // Give explored ground its own ink: dark fog over a dark void alone is invisible. - const exploredInk = hexToRgba(PALETTE.REMOTE, 0.18); + // Pale explored ground has to be its own ink: dark fog over a dark void disappears. + const exploredInk = solidRadarInk(PALETTE.REMOTE, EXPLORED_RADAR_ALPHA); const cellScale = geometry.size / (geometry.radius * 2); for (const cell of explorationCellsInView({ cx: geometry.center.x, @@ -171,7 +190,8 @@ function drawExplorationFog(ctx: CanvasRenderingContext2D, geometry: MiniMapGeom const bounds = cellWorldBounds(cell); const x = geometry.x + geometry.size / 2 + (bounds.x - geometry.center.x) * cellScale; const y = geometry.y + geometry.size / 2 + (bounds.y - geometry.center.y) * cellScale; - const size = bounds.size * cellScale + 0.5; + // One extra pixel closes tile gaps. The fill is opaque, so the overlap stays invisible. + const size = bounds.size * cellScale + 1; ctx.fillRect(x, y, size, size); } ctx.restore(); diff --git a/src/wiki/articleSources.json b/src/wiki/articleSources.json index d680bc27d..20dd0be76 100644 --- a/src/wiki/articleSources.json +++ b/src/wiki/articleSources.json @@ -354,6 +354,7 @@ "src/rendering/hud/minimap.ts", "src/rendering/hud/furnaceMapMark.ts", "tests/unit/rendering/radar-marks-a-discovered-furnace-as-fire.test.ts", + "tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts", "src/rendering/hud/hudLayout.ts", "src/ui/universeMap.ts", "src/ui/universeMapLabels.ts", diff --git a/tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts b/tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts new file mode 100644 index 000000000..f4ed6f4d3 --- /dev/null +++ b/tests/unit/rendering/radar-exploration-is-solid-fog-or-ground.test.ts @@ -0,0 +1,84 @@ +import { afterEach, expect, test } from 'vitest'; +import { cellWorldBounds, ExplorationMap, explorationCellAt } from '../../../shared/exploration'; +import { WORLD } from '../../../shared/world'; +import { PALETTE } from '../../../src/constants'; +import { Player } from '../../../src/entities/player/Player'; +import { MockPlayerInput } from '../../../src/input/MockPlayerInput'; +import { resetWorldExploration, setWorldExploration } from '../../../src/network/worldExploration'; +import { computeHudLayout } from '../../../src/rendering/hud/hudLayout'; +import { drawMiniMap } from '../../../src/rendering/hud/minimap'; + +afterEach(resetWorldExploration); + +function radarPixel( + ctx: CanvasRenderingContext2D, + layout: ReturnType, + origin: { x: number; y: number }, + world: { x: number; y: number } +): number[] { + const pixelX = Math.round( + layout.miniMap.x + + layout.miniMap.size / 2 + + ((world.x - origin.x) * layout.miniMap.size) / (2 * WORLD.minimapRadius) + ); + const pixelY = Math.round( + layout.miniMap.y + + layout.miniMap.size / 2 + + ((world.y - origin.y) * layout.miniMap.size) / (2 * WORLD.minimapRadius) + ); + return Array.from(ctx.getImageData(pixelX, pixelY, 1, 1).data); +} + +test.each([1280, 390])( + 'radar at width %i paints explored ground and fog as solid areas', + (width) => { + const canvas = document.createElement('canvas'); + canvas.width = width; + canvas.height = 900; + const ctx = canvas.getContext('2d'); + if (!ctx) { + throw new Error('Expected real canvas'); + } + const player = new Player({ + id: 'scout', + name: 'Scout', + type: 'local', + input: new MockPlayerInput(), + }); + const origin = { x: 10_000, y: 10_000 }; + player.ship.position = origin; + const layout = computeHudLayout(canvas, { touchControls: width < 500 }); + const cell = explorationCellAt({ x: origin.x + 800, y: origin.y + 40 }); + if (cell === null) { + throw new Error('Expected an exploration cell beside the ship'); + } + const bounds = cellWorldBounds(cell); + const interior = { x: bounds.x + bounds.size * 0.5, y: bounds.y + bounds.size * 0.5 }; + const sharedEdge = { x: bounds.x, y: interior.y }; + const exploration = new ExplorationMap(); + exploration.reveal(origin, 1_200); + setWorldExploration(exploration.snapshot()); + + ctx.fillStyle = '#ffffff'; + ctx.fillRect(0, 0, canvas.width, canvas.height); + drawMiniMap(ctx, layout, player.ship, [], [], [], []); + + const ground = radarPixel(ctx, layout, origin, interior); + const edge = radarPixel(ctx, layout, origin, sharedEdge); + expect(edge.slice(0, 3)).toEqual(ground.slice(0, 3)); + expect(ground[1] ?? 0).toBeGreaterThan(25); + + const outside = explorationCellAt({ x: origin.x, y: origin.y + WORLD.minimapRadius * 0.85 }); + if (outside === null) { + throw new Error('Expected a fog cell inside the radar'); + } + const fogBounds = cellWorldBounds(outside); + const fog = radarPixel(ctx, layout, origin, { + x: fogBounds.x + fogBounds.size * 0.5, + y: fogBounds.y + fogBounds.size * 0.5, + }); + expect(fog.slice(0, 3)).toEqual([0, 0, 17]); + expect(fog.slice(0, 3)).not.toEqual(ground.slice(0, 3)); + expect(PALETTE.BG.toLowerCase()).toBe('#000011'); + } +);