fix(globe): Navara sprites, points and lines drawn after tone mapping

Review of Tasks 2–3: on Navara the overlays went through the look's
tone mapping and grading (magenta came out as 247/40/228, green as
147/228/89 in the cinematic look), where Cesium draws billboards and
polylines in the colours asked for.

src/globe/navara/overlay.js: a public Navara EffectDesc (gevOverlay)
inserted after toneMapping and before the gev sharpening, SMAA/FXAA and
final, whose pass renders one three scene over the tone-mapped input
buffer (in Navara's own Pass wrapper: Navara inserts a bare pass only
when it is an instance of its own postprocessing copy); it costs nothing
while the scene is empty. The chain has no depth buffer, so each overlay
material tests the scene depth itself (overlayDepth.js): its log depth
against Navara's MRT depth (RGBA packed), modes always / normal /
depth-fail, disableWithinM as a per-vertex escape. Sprites and points
(moverMesh.js) and line ribbons (lineMesh.js) live in that scene with
their per-frame work as overlay hooks; models stay Navara meshes, lit
and graded like the tiles. The sharpening now sits after the overlay
(Cesium's sharpen stage sharpens billboards too).

Also (review): Navara pixel dashes are measured in CSS pixels
(gl_FragCoord over uGevPixelRatio), and the line viewport uniform is
updated in place.

Measured: a magenta sprite draws 255/0/255. The contract suite's colour
checks are now within 40 of the asked colour on every channel on both
engines (were: dominant channels); Cesium 68/68, Navara 74/74 (its
sharpen-order check accepts the overlay between tone mapping and the
sharpening). Shell: cesium 23/23, cross 4/4; navara 23/25 — the two map
stack pictures from space fail on stddev 7.2/7.6 against 8, as on the
Task 3 commit run at the same hour (the cinematic sun follows the clock
into night over the reset view), not from this change.
This commit is contained in:
German Khokhlov committed 2026-10-16 19:04:57 +04:00
1 parent 3c2e924363
commit e804351205
11 files changed
+388 -125

No files matched your search

+8 -2
View File
@@ -15,6 +15,7 @@ import { buildNavaraLook } from './look.js';
import { createNavaraSharpen } from './sharpen.js';
import { createNavaraMovers } from './movers/index.js';
import { createNavaraLines } from './lines/index.js';
import { createNavaraOverlay } from './overlay.js';
import {
NAVARA_CONTEXT_ATTRIBUTES,
navaraScenePlan,
@@ -98,6 +99,7 @@ export async function createNavaraGlobe({
const canvas = preservedCanvas(container);
let view;
let engine;
let overlay = null;
let removeLook = null;
try {
view = new ThreeView(navaraViewOptions({ container, canvas, pixelRatio }));
@@ -118,13 +120,15 @@ export async function createNavaraGlobe({
);
// The look's shadowed sun leaked a light per frame (internals.js).
keepCascadedLightIds(view);
// Sprites, points and lines, drawn after tone mapping (overlay.js).
overlay = createNavaraOverlay(view);
engine = createNavaraEngine(view, {
hooks: navaraHooks(view),
container,
...(appClock ? { appClock } : {}),
sharpen: createNavaraSharpen(view),
movers: createNavaraMovers(view),
lines: createNavaraLines(view),
movers: createNavaraMovers(view, { overlay }),
lines: createNavaraLines(view, { overlay }),
});
const camera = engine.camera;
let ground = Number.NaN;
@@ -166,6 +170,7 @@ export async function createNavaraGlobe({
} catch (error) {
removeLook?.();
engine?.destroy();
overlay?.destroy();
view?.dispose();
canvas.remove();
throw error;
@@ -179,6 +184,7 @@ export async function createNavaraGlobe({
destroyed = true;
removeLook();
engine.destroy();
overlay.destroy();
view.dispose();
canvas.remove();
},