render: Cesium draws raster-shell fields; weather shells use the draw port

The Cesium draw port now implements draw.field for the rasterShell kind
and advertises the 'fields' capability. The shell surface (a raised
rectangle with a detail window, drawn in primitive order without depth
writes) moves from the weather layer into src/render/cesium/drawFields.js.
A new rectangle or height is drawn invisibly first and swapped in whole,
and 'drawn' is told in the frame of the swap. A stage of older content
never replaces the drawn one while newer content decodes. A field hidden
mid-stage keeps building it.

The weather shell (src/layers/weather/shellRendering.js) now drives one
field through the draw, camera, frame and globe ports and no longer
imports Cesium, so it leaves the Cesium allow list. The wind shell on
photoreal hosts also draws through draw.field. The conformance page runs
each visual scene on its own, so a kind the Cesium renderer does not draw
yet (scalarRaster) fails only its own scene.
This commit is contained in:
Sameh Khamis committed 2026-11-09 07:02:54 -08:00
1 parent 4fc7d66639
commit 50cb7bd5f4
16 files changed
+1765 -761

No files matched your search

+44
View File
@@ -1,4 +1,6 @@
import * as Cesium from 'cesium';
import { createCesiumFields } from '../../render/cesium/drawFields.js';
import { bindRenderer } from '../../render/rendererOf.js';
/** Test double for the Cesium classes a weather shell constructs. */
export function createShellCesium({ maximumTextureSize = 0 } = {}) {
@@ -154,3 +156,45 @@ export function renderShells(cesium, scene, count = 4) {
scene.postRender.emit();
}
}
/**
* Bind to `viewer` a renderer whose draw port draws raster-shell fields
* with the Cesium adapter's code over these doubles, whose camera port reads
* the viewer's Cesium-shaped camera double (its view rectangle, `moveEnd`
* and height) and whose frame port runs on the scene's own events.
* @returns {{fields: object, unbind: () => void}}
*/
export function bindShellFields(viewer, cesium) {
const scene = viewer.scene;
const fields = createCesiumFields({ scene, cesium });
const camera = () => viewer.camera ?? scene.camera;
const deg = 180 / Math.PI;
const unbind = bindRenderer(viewer, {
draw: { field: (spec) => fields.field(spec) },
camera: {
pose: () => ({ height: camera()?.positionCartographic?.height }),
viewRectangle() {
const rect = camera()?.computeViewRectangle?.();
return rect
? {
west: rect.west * deg,
south: rect.south * deg,
east: rect.east * deg,
north: rect.north * deg,
}
: null;
},
on(event, cb) {
if (event !== 'moveEnd') return () => {};
return camera()?.moveEnd?.addEventListener(cb) ?? (() => {});
},
},
frame: {
on(phase, cb) {
return scene[phase]?.addEventListener?.(cb) ?? (() => {});
},
requestRender: () => scene.requestRender(),
},
});
return { fields, unbind };
}
+218 -347
View File
@@ -1,9 +1,12 @@
import * as Cesium from 'cesium';
// The weather layers fly through `cameraOf`, drape through `findGlobe` and
// read `findCamera` and `findQuery`; this module is their Cesium side, so it
// brings the factories a viewer with no renderer bound gets those ports from.
import '../../render/cesium/camera.js';
import '../../render/cesium/globe.js';
// The shell draws through the draw port's raster-shell field; its detail
// window follows the camera port and its lift the frame port.
import {
findCamera,
findDraw,
findFrame,
findGlobe,
rendererOf,
} from '../../render/rendererOf.js';
import { acquireWeatherImage } from './infraredImage.js';
import { imageryHostStatus } from './imageryHost.js';
import { WEATHER_DETAIL_SIZE, WEATHER_IMAGE_SIZES } from './source.js';
@@ -11,12 +14,13 @@ import { msg } from '../../i18n/index.js';
/**
* The viewer's own globe imagery, as a weather imagery host: where a layer
* drapes when the application shell names no host of its own.
* @param {object|null|undefined} viewer A Cesium viewer.
* @returns {{collection: object|undefined, kind: 'globe'}}
* drapes when the application shell names no host of its own. Its globe
* port's imagery stands for it, one object per port.
* @param {object|null|undefined} viewer The scene object the layer holds.
* @returns {{collection: object|null, kind: 'globe'}}
*/
export function globeImageryHost(viewer) {
return { collection: viewer?.imageryLayers, kind: 'globe' };
return { collection: findGlobe(viewer)?.imagery ?? null, kind: 'globe' };
}
/** Metres above the ellipsoid. Lower shells draw first, so lightning draws last. */
@@ -29,64 +33,19 @@ export const WEATHER_SHELL_HEIGHTS = Object.freeze({
});
// Decoded canvases per renderer, full-extent and detail images alike: the shown
// frame and the warmed next frame, each full-extent and detail (four 4096×2048
// canvases); nothing older survives them. Cesium holds the shown canvases
// through the material uniforms in any case.
// canvases); nothing older survives them. The renderer holds the shown
// canvases in any case.
export const WEATHER_SHELL_CACHE_BYTES = 128 * 1024 * 1024;
const MAX_IMAGE_BYTES = 16 * 1024 * 1024;
const MATERIAL_TYPE = 'WeatherFrame';
// Renders after an image swap: one queues the upload, one uploads and draws, one spare.
const UPLOAD_FRAMES = 3;
// An empty detail window: the full-extent image shows everywhere.
const NO_WINDOW = Object.freeze({ west: 0, south: 0, east: -1, north: -1 });
// Detail windows, in degrees.
const DETAIL_MIN_WIDTH = 6;
const DETAIL_GRID = 0.5;
const shellHeights = new WeakMap();
// From far away Google's coarse 3D tiles rise tens of kilometres above the
// ground and hide the shells, so the shells rise with the camera: 4 m per
// kilometre of camera height, at most 60 km, in 500 m steps.
const LIFT_PER_METRE = 0.004;
const MAX_LIFT = 60_000;
const LIFT_STEP = 500;
// Cesium binds a 1×1 white texture to an image uniform until its first upload:
// draw nothing until the full-extent image has arrived, and sample the detail
// image only once it has arrived. The window is west, south, east, north in the
// full-extent image's texture coordinates.
const MATERIAL_SOURCE = `czm_material czm_getMaterial(czm_materialInput materialInput)
{
czm_material material = czm_getDefaultMaterial(materialInput);
vec2 st = materialInput.st;
vec4 coarse = texture(image, st);
vec2 dst = (st - window.xy) / max(window.zw - window.xy, vec2(1e-6));
float inside = float(all(greaterThanEqual(st, window.xy)) && all(lessThanEqual(st, window.zw)));
float useDetail = inside * step(1.5, float(detailDimensions.x));
vec4 c = mix(coarse, texture(detail, clamp(dst, 0.0, 1.0)), useDetail);
material.diffuse = czm_gammaCorrect(c.rgb);
material.alpha = c.a * alpha * step(1.5, float(imageDimensions.x));
return material;
}
`;
function registerMaterial(cesium) {
const cache = cesium.Material._materialCache;
if (cache.getMaterial(MATERIAL_TYPE)) return;
// A plain template: building the first material from a fabric would make that
// instance Cesium's shared template and keep its last image alive.
cache.addMaterial(MATERIAL_TYPE, {
fabric: {
type: MATERIAL_TYPE,
uniforms: {
image: cesium.Material.DefaultImageId,
detail: cesium.Material.DefaultImageId,
alpha: 1,
window: { type: 'vec4', x: 0, y: 0, z: -1, w: -1 },
},
// Diffuse and alpha share these samples, so one source, not components.
source: MATERIAL_SOURCE,
},
translucent: false,
});
}
const sameEdges = (a, b) =>
a.west === b.west &&
@@ -101,239 +60,31 @@ export function shellLift(cameraHeight) {
return Math.round(lift / LIFT_STEP) * LIFT_STEP;
}
/** Keep weather shells first in the primitive collection, in ascending height:
* higher shells draw over lower ones and other opaque content draws over both. */
export function orderWeatherShells(primitives, primitive, height) {
shellHeights.set(primitive, height);
if (typeof primitives.lowerToBottom !== 'function') return;
const shells = [];
for (let i = 0; i < primitives.length; i++) {
const item = primitives.get(i);
if (shellHeights.has(item)) shells.push(item);
}
const ordered = [...shells].sort(
(a, b) => shellHeights.get(a) - shellHeights.get(b),
);
if (ordered.every((item, i) => primitives.get(i) === item)) return;
for (const item of ordered.reverse()) primitives.lowerToBottom(item);
}
/** One raised rectangle drawing one full-extent image and, inside a window of
* it, an optional detail image. The owner calls destroy(). */
export function createShellSurface({
/**
* Tell `apply` the shell lift for the camera's height now and, each frame
* before it draws, whenever it changes.
* @param {object} viewer
* @param {(liftM: number) => void} apply
* @param {{cameraOf?: Function, frameOf?: Function}} [ports]
* @returns {() => void} Stops.
*/
export function followShellLift(
viewer,
cesium,
rectangle,
height,
onSettled = () => {},
}) {
registerMaterial(cesium);
const scene = viewer.scene;
const primitives = scene.primitives;
const material = new cesium.Material({
fabric: { type: MATERIAL_TYPE },
translucent: false,
});
// Flat shading keeps the product colours independent of the viewing angle.
const appearance = new cesium.EllipsoidSurfaceAppearance({
aboveGround: true,
flat: true,
translucent: false,
material,
});
// Cesium orders its translucent pass itself (weighted OIT or distance), which
// cannot honour stacked heights. Draw in the opaque pass in scene.primitives
// order, alpha-blended and without depth writes, so higher shells draw over
// lower ones and nothing is hidden or picked through a shell.
appearance.getRenderState = () => ({
depthTest: { enabled: true },
depthMask: false,
blending: cesium.BlendingState.ALPHA_BLEND,
});
const primitive = new cesium.Primitive({
geometryInstances: new cesium.GeometryInstance({
geometry: new cesium.RectangleGeometry({
rectangle,
height,
granularity: cesium.Math.toRadians(0.5),
vertexFormat: cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT,
}),
}),
appearance,
asynchronous: true,
allowPicking: false,
});
primitives.add(primitive);
orderWeatherShells(primitives, primitive, height);
// A uniform scale about the Earth's centre lifts every shell alike and keeps
// their order.
let lift = 0;
const offLift = scene.preRender?.addEventListener(() => {
const next = shellLift(scene.camera?.positionCartographic?.height);
apply,
{ cameraOf = findCamera, frameOf = findFrame } = {},
) {
let lift = null;
const read = () => {
const next = shellLift(cameraOf(viewer)?.pose?.().height);
if (next === lift) return;
lift = next;
primitive.modelMatrix = cesium.Matrix4.fromUniformScale(
1 + lift / cesium.Ellipsoid.WGS84.maximumRadius,
);
});
let image = null;
let frames = 0;
// The detail image, its own upload count and a window waiting for it to draw.
let detail = null;
let detailFrames = 0;
let pendingWindow = null;
let offRender = null;
let destroyed = false;
const fits = (size, value) =>
!size || (size.x === value.width && size.y === value.height);
const uploaded = () =>
image !== null && fits(material.uniforms.imageDimensions, image);
const detailDrawn = () =>
detail !== null &&
detailFrames === 0 &&
fits(material.uniforms.detailDimensions, detail);
const drawn = () =>
primitive.ready &&
uploaded() &&
frames === 0 &&
(detail === null || (detailDrawn() && pendingWindow === null));
function appliedWindow() {
const { x, y, z, w } = material.uniforms.window;
return z < x ? null : { west: x, south: y, east: z, north: w };
}
function setWindow(rect) {
const next = rect ?? NO_WINDOW;
const { x, y, z, w } = material.uniforms.window;
if (
x === next.west &&
y === next.south &&
z === next.east &&
w === next.north
)
return;
material.uniforms.window = new cesium.Cartesian4(
next.west,
next.south,
next.east,
next.north,
);
scene.requestRender();
}
// The render governor may idle the scene; request frames only until the
// asynchronous geometry is ready and the latest images have been drawn.
function tick() {
// Cesium updates a material only while its primitive is shown, so hidden
// frames upload nothing and count for nothing.
if (primitive.ready && primitive.show) {
if (frames > 0) frames--;
if (detailFrames > 0) detailFrames--;
// A texture is never shown at another window's place.
if (pendingWindow && detailDrawn()) {
setWindow(pendingWindow);
pendingWindow = null;
}
}
if (primitive.show && !drawn()) {
scene.requestRender();
return;
}
offRender?.();
offRender = null;
if (drawn()) onSettled();
}
function wake() {
if (destroyed || !primitive.show || image === null || drawn()) return;
offRender ??= scene.postRender.addEventListener(tick);
scene.requestRender();
}
return {
setImage(next) {
if (destroyed || next === image) return;
image = next;
material.uniforms.image = next;
frames = UPLOAD_FRAMES;
wake();
},
setAlpha(value) {
if (destroyed || material.uniforms.alpha === value) return;
material.uniforms.alpha = value;
scene.requestRender();
},
/** Draw `next` inside `rect` (west, south, east, north in the full-extent
* image's texture coordinates, 0–1); null clears it. In the same window only
* the image changes, and Cesium keeps drawing the previous texture until
* this one is uploaded. A different window applies once its image has
* drawn; until then the full-extent image covers it. */
setDetail(next, rect) {
if (destroyed) return;
if (!next) {
if (detail === null) return;
detail = null;
detailFrames = 0;
pendingWindow = null;
material.uniforms.detail = cesium.Material.DefaultImageId;
setWindow(null);
scene.requestRender();
return;
}
if (next !== detail) {
detail = next;
material.uniforms.detail = next;
detailFrames = UPLOAD_FRAMES;
}
const applied = appliedWindow();
if (applied && sameEdges(applied, rect)) {
pendingWindow = null;
} else {
setWindow(null);
pendingWindow = rect;
}
wake();
},
/** Returns whether visibility changed. */
setShow(value) {
const show = Boolean(value);
if (destroyed || primitive.show === show) return false;
primitive.show = show;
wake();
scene.requestRender();
return true;
},
destroy() {
if (destroyed) return;
destroyed = true;
offRender?.();
offRender = null;
offLift?.();
if (!primitives.isDestroyed?.() && primitives.contains(primitive))
primitives.remove(primitive);
if (!primitive.isDestroyed()) primitive.destroy();
// Primitive.destroy leaves the material and its texture alive.
if (!material.isDestroyed()) material.destroy();
image = null;
detail = null;
pendingWindow = null;
scene.requestRender();
},
getDiagnostics() {
return {
height,
ready: Boolean(primitive.ready),
uploaded: uploaded(),
show: primitive.show,
alpha: material.uniforms.alpha,
rendering: offRender !== null,
// `uploaded` once the detail image has drawn; the window applies after.
detail: { uploaded: detailDrawn(), window: appliedWindow() },
};
},
apply(next);
};
read();
return frameOf(viewer)?.on('preRender', read) ?? (() => {});
}
function fitTexture(cesium, { width, height }) {
const limit = cesium.ContextLimits?.maximumTextureSize;
function fitTexture({ width, height }, limit) {
// Halve, down to 1024 px wide, on devices with a smaller texture limit.
while (limit > 0 && width > limit && width > 1024) {
width /= 2;
@@ -404,13 +155,14 @@ export function detailWindow(footprint, bounds, previous = null) {
return previous && sameEdges(previous, next) ? previous : next;
}
let weatherShells = 0;
/** Observed weather on 3D Tiles: one raised shell per product and one
* full-extent image per frame. The previous image stays until the next is ready.
* Inside a window around the view the same surface samples a sharper image of
* that area, so the two images share one mesh and never blend. */
export function createWeatherShell({
viewer,
cesium = Cesium,
product,
height = WEATHER_SHELL_HEIGHTS[product],
getHost = () => ({ collection: null, kind: 'tileset' }),
@@ -421,17 +173,35 @@ export function createWeatherShell({
decodeImage,
createCanvas = () => document.createElement('canvas'),
cacheBytes = WEATHER_SHELL_CACHE_BYTES,
drawOf = findDraw,
cameraOf = findCamera,
frameOf = findFrame,
maxTextureSize = rendererOf(viewer)?.quality?.device?.().maxTextureSize ?? 0,
}) {
if (!Object.hasOwn(WEATHER_IMAGE_SIZES, product))
throw new TypeError('Unknown weather product');
const scene = viewer.scene;
const size = fitTexture(cesium, WEATHER_IMAGE_SIZES[product]);
const detailSize = fitTexture(cesium, WEATHER_DETAIL_SIZE);
const size = fitTexture(WEATHER_IMAGE_SIZES[product], maxTextureSize);
const detailSize = fitTexture(WEATHER_DETAIL_SIZE, maxTextureSize);
const infrared = product === 'clouds' || product === 'clouds-regional';
// Global infrared contrast depends on the requested extent, so a window would
// not match the image around it; the globe host also shows one mosaic.
const detailed = product !== 'clouds';
let surface = null;
const requestRender = () => frameOf(viewer)?.requestRender('weather');
// The shell's field, and what it was last given: the committed frame's
// bounds and image, and the detail.
let field = null;
let offLift = null;
let fieldBounds = null;
let fieldImage = null;
let fieldRect = null;
let fieldDetail = null;
let fieldAlpha = 0;
// What its 'drawn' has told: anything yet, the image and the detail it
// was last given, and whether a change waits for it.
let everDrawn = false;
let imageDrawn = false;
let detailDrawn = false;
let owed = false;
let current = null;
let incoming = null;
let alpha = 0.7;
@@ -456,6 +226,72 @@ export function createWeatherShell({
`${time}|${infrared ? mode : 'none'}${box ? `|${boundsKey(box)}` : ''}`;
const wantedDetail = () =>
current && view ? cacheKey(current.time, current.infrared, view) : null;
const imageRef = (canvas, key) => ({ canvas, key });
function update(patch) {
owed = true;
field.update(patch);
}
function onDrawn() {
owed = false;
everDrawn = true;
imageDrawn = true;
detailDrawn = fieldDetail !== null;
if (incoming?.staged) commit(incoming);
}
function makeField(rectangle, image) {
field = drawOf(viewer).field({
kind: 'rasterShell',
id: `weather-shell:${product}:${(weatherShells += 1)}`,
image,
rectangle,
heightM: height,
alpha,
detail: null,
});
fieldAlpha = alpha;
owed = true;
field.on('drawn', onDrawn);
offLift = followShellLift(viewer, (liftM) => update({ liftM }), {
cameraOf,
frameOf,
});
}
function dropField() {
offLift?.();
offLift = null;
field?.dispose();
field = null;
fieldBounds = null;
fieldImage = null;
fieldRect = null;
fieldDetail = null;
everDrawn = false;
imageDrawn = false;
detailDrawn = false;
owed = false;
}
/** Give the field `next` for its detail, unless it has it already. */
function giveDetail(next) {
if (!field) return;
const given = incoming?.staged ? incoming.keptDetail : fieldDetail;
const same =
next === given ||
(next &&
given &&
next.image.canvas === given.image.canvas &&
sameEdges(next.rectangle, given.rectangle));
if (same) return;
// A frame being staged takes its detail once it is committed; until
// then the detail is what the field goes back to if it is given up.
if (incoming?.staged) {
incoming.keptDetail = next;
return;
}
fieldDetail = next;
detailDrawn = false;
update({ detail: next });
}
function evict(keep = []) {
const kept = new Set([...keep, current?.key, detail?.key]);
@@ -517,11 +353,19 @@ export function createWeatherShell({
};
}
function syncDetail() {
if (detail && current) surface?.setDetail(detail.image, detailRect());
else surface?.setDetail(null);
if (detail && current)
giveDetail({
image: imageRef(detail.image, detail.key),
rectangle: { ...detail.box },
});
else giveDetail(null);
}
function applyVisibility() {
return surface?.setShow(visible()) ?? false;
if (!field) return false;
const show = visible();
if (field.show === show) return false;
field.show = show;
return true;
}
function cancelDetail() {
clearTimeout(detailJob?.timeout);
@@ -531,7 +375,7 @@ export function createWeatherShell({
function dropDetail() {
detail = null;
// The full-extent image covers the window in the same turn.
surface?.setDetail(null);
giveDetail(null);
}
function installDetail(job, image) {
if (detailJob !== job) return;
@@ -540,14 +384,14 @@ export function createWeatherShell({
detail = { box: job.box, key: job.key, image, stale: false };
syncDetail();
evict();
scene.requestRender();
requestRender();
}
function failDetail(job) {
if (detailJob !== job) return;
clearTimeout(job.timeout);
detailJob = null;
if (detail?.stale) dropDetail();
scene.requestRender();
requestRender();
}
/** Bring the detail to the shown frame and window. The previous detail image
* stays until the next is decoded unless the window itself moved, and over at
@@ -585,16 +429,9 @@ export function createWeatherShell({
}
/** Recompute the window from the camera's ground footprint; returns whether it changed. */
function computeView() {
const rectangle = detailed
? viewer.camera?.computeViewRectangle?.(scene.globe?.ellipsoid)
const footprint = detailed
? (cameraOf(viewer)?.viewRectangle?.() ?? null)
: null;
const degrees = cesium.Math.toDegrees;
const footprint = rectangle && {
west: degrees(rectangle.west),
south: degrees(rectangle.south),
east: degrees(rectangle.east),
north: degrees(rectangle.north),
};
const next = detailWindow(
footprint,
current.extent,
@@ -608,7 +445,7 @@ export function createWeatherShell({
function watchCamera() {
if (offCamera || !detailed) return;
offCamera =
viewer.camera?.moveEnd?.addEventListener(() => {
cameraOf(viewer)?.on?.('moveEnd', () => {
if (current && computeView()) refreshDetail();
}) ?? null;
}
@@ -623,18 +460,30 @@ export function createWeatherShell({
frame.owned = true;
const abort = () => {
if (incoming === frame) cancelIncoming();
scene.requestRender();
requestRender();
};
signal.addEventListener('abort', abort, { once: true });
frame.offAbort = () => signal.removeEventListener('abort', abort);
}
/** A staged frame given up: the field goes back to what it drew. */
function unstage(frame) {
if (!frame.staged) return;
frame.staged = false;
if (fieldBounds === null) {
dropField();
return;
}
fieldDetail = frame.keptDetail ?? null;
detailDrawn = false;
imageDrawn = false;
update({ image: fieldImage, rectangle: fieldRect, detail: fieldDetail });
}
function close(frame) {
frame.closed = true;
frame.controller.abort();
clearTimeout(frame.timeout);
frame.offAbort?.();
frame.surface?.destroy();
frame.surface = null;
unstage(frame);
}
function cancelIncoming() {
if (!incoming) return;
@@ -649,7 +498,7 @@ export function createWeatherShell({
close(frame);
lastError = msg('Weather tiles unavailable · previous frame retained');
frame.resolve(false);
scene.requestRender();
requestRender();
onChange();
}
function commit(frame) {
@@ -657,12 +506,13 @@ export function createWeatherShell({
incoming = null;
clearTimeout(frame.timeout);
frame.offAbort?.();
if (frame.surface) {
surface?.destroy();
surface = frame.surface;
frame.surface = null;
}
const { west, south, east, north } = frame.snapshot.bounds;
if (frame.staged) {
frame.staged = false;
fieldBounds = frame.bounds;
fieldRect = { west, south, east, north };
}
fieldImage = frame.image;
current = {
time: frame.time,
product: frame.product,
@@ -673,7 +523,10 @@ export function createWeatherShell({
mosaic: frame.mosaic,
loadMs: now() - frame.startedAt,
};
surface.setAlpha(alpha);
if (fieldAlpha !== alpha) {
fieldAlpha = alpha;
update({ alpha });
}
applyVisibility();
lastError = null;
evict();
@@ -684,31 +537,35 @@ export function createWeatherShell({
if (detail?.stale && detail.key !== wantedDetail()) dropDetail();
refreshDetail();
frame.resolve(true);
scene.requestRender();
requestRender();
onChange();
}
function install(frame, image) {
function install(frame, texture) {
if (frame.closed || incoming !== frame) return;
if (surface?.bounds === frame.bounds) {
// Cesium keeps drawing the previous texture until this one is uploaded.
surface.setImage(image);
frame.image = imageRef(texture, frame.key);
if (field && fieldBounds === frame.bounds) {
// The renderer keeps drawing the previous image until this one is drawn.
imageDrawn = false;
update({ image: frame.image });
commit(frame);
return;
}
// First frame or a new extent: stage an invisible surface and keep the
// previous one until the new geometry and texture are drawable.
// First frame or a new extent: the field keeps what it draws until the
// new rectangle and image can be drawn, then the frame commits.
const { west, south, east, north } = frame.snapshot.bounds;
const next = createShellSurface({
viewer,
cesium,
height,
rectangle: cesium.Rectangle.fromDegrees(west, south, east, north),
onSettled: () => commit(frame),
});
next.bounds = frame.bounds;
frame.surface = next;
next.setAlpha(0);
next.setImage(image);
const rectangle = { west, south, east, north };
frame.staged = true;
imageDrawn = false;
if (!field) makeField(rectangle, frame.image);
else {
frame.keptDetail = fieldDetail;
fieldDetail = null;
detailDrawn = false;
update({ image: frame.image, rectangle, detail: null });
}
// A hidden field tells nothing drawn: the renderer readies the new
// content unseen and shows it, not the old, once the field shows.
if (!visible()) commit(frame);
}
return {
@@ -724,7 +581,7 @@ export function createWeatherShell({
computeView();
refreshDetail();
}
if (changed) scene.requestRender();
if (changed) requestRender();
return changed;
},
cancelPrefetch,
@@ -799,7 +656,9 @@ export function createWeatherShell({
mosaic: { fetched: false, decodeMs: null, cached: false },
controller: new AbortController(),
startedAt: now(),
surface: null,
image: null,
staged: false,
keptDetail: null,
owned: false,
closed: false,
resolve: null,
@@ -821,7 +680,7 @@ export function createWeatherShell({
install(frame, texture);
})
.catch(() => fail(frame));
scene.requestRender();
requestRender();
onChange();
return frame.result;
},
@@ -834,12 +693,15 @@ export function createWeatherShell({
}
applyVisibility();
if (!hidden) refreshDetail();
scene.requestRender();
requestRender();
},
setAlpha(value) {
alpha = value;
surface?.setAlpha(alpha);
scene.requestRender();
if (field && fieldAlpha !== alpha) {
fieldAlpha = alpha;
update({ alpha });
}
requestRender();
},
clear() {
cancelPrefetch();
@@ -848,8 +710,7 @@ export function createWeatherShell({
offCamera?.();
offCamera = null;
dropDetail();
surface?.destroy();
surface = null;
dropField();
current = null;
view = null;
viewBounds = null;
@@ -857,11 +718,21 @@ export function createWeatherShell({
lastError = null;
images.clear();
imageBytes = 0;
scene.requestRender();
requestRender();
},
getDiagnostics() {
const drawn = surface?.getDiagnostics();
const applied = drawn?.detail.window;
// The detail is drawn once its image has drawn in its window.
const window =
current && detail && detailDrawn && fieldDetail ? detailRect() : null;
const drawn = field && {
height,
ready: everDrawn,
uploaded: imageDrawn,
show: field.show,
alpha: fieldAlpha,
rendering: owed && field.show,
detail: { uploaded: detailDrawn, window },
};
return {
host: 'shell',
height,
@@ -882,8 +753,8 @@ export function createWeatherShell({
drawn.ready &&
drawn.show &&
drawn.detail.uploaded &&
applied &&
sameEdges(applied, detailRect()),
window &&
!owed,
),
enabled: view !== null,
},
@@ -894,7 +765,7 @@ export function createWeatherShell({
bytes: imageBytes,
prefetching: !!prefetchJob,
},
imageryCount: Number(!!surface) + Number(!!incoming?.surface),
imageryCount: Number(fieldBounds !== null) + Number(!!incoming?.staged),
mosaic: (incoming || current)?.mosaic,
infrared: (incoming || current)?.infrared ?? 'filtered',
loading: !!incoming,
+29 -342
View File
@@ -2,16 +2,16 @@ import test from 'node:test';
import assert from 'node:assert/strict';
import * as Cesium from 'cesium';
import {
createShellSurface,
createWeatherShell,
detailWindow,
orderWeatherShells,
followShellLift,
shellLift,
WEATHER_SHELL_CACHE_BYTES,
WEATHER_SHELL_HEIGHTS,
} from './shellRendering.js';
import { NO_IMAGERY_HOST } from './imageryHost.js';
import {
bindShellFields,
createShellCesium,
createShellScene,
renderShells,
@@ -72,10 +72,12 @@ function harness({ product = 'radar', camera, ...options } = {}) {
const fetches = [];
const decoded = [];
let host = { collection: null, kind: 'tileset' };
const viewer = { scene, camera };
bindShellFields(viewer, cesium);
const shell = createWeatherShell({
viewer: { scene, camera },
cesium,
viewer,
product,
maxTextureSize: cesium.ContextLimits.maximumTextureSize,
getHost: () => host,
fetchImpl: async (url, init) => {
fetches.push({ url, signal: init.signal });
@@ -131,317 +133,36 @@ test('shell heights stack every product with lightning highest', () => {
assert.equal(WEATHER_SHELL_CACHE_BYTES, 128 * 1024 * 1024);
});
test('surface builds a flat raised rectangle drawn in primitive order without depth writes', () => {
const cesium = createShellCesium();
const scene = createShellScene();
const rectangle = Cesium.Rectangle.fromDegrees(-130, 20, -60, 55);
const surface = createShellSurface({
viewer: { scene },
cesium,
rectangle,
height: 6_200,
});
const template = cesium.templates.get('WeatherFrame');
assert.ok(!(template instanceof cesium.Material), 'plain template');
assert.deepEqual(template.fabric.uniforms, {
image: Cesium.Material.DefaultImageId,
detail: Cesium.Material.DefaultImageId,
alpha: 1,
window: { type: 'vec4', x: 0, y: 0, z: -1, w: -1 },
});
const { source } = template.fabric;
assert.match(
source,
/material\.alpha = c\.a \* alpha \* step\(1\.5, float\(imageDimensions\.x\)\);/,
'nothing draws before the full-extent image',
);
assert.match(
source,
/float useDetail = inside \* step\(1\.5, float\(detailDimensions\.x\)\);/,
'the detail image is sampled only once it has arrived',
);
assert.match(
source,
/all\(greaterThanEqual\(st, window\.xy\)\) && all\(lessThanEqual\(st, window\.zw\)\)/,
);
assert.match(
source,
/mix\(coarse, texture\(detail, clamp\(dst, 0\.0, 1\.0\)\), useDetail\)/,
);
assert.match(source, /material\.diffuse = czm_gammaCorrect\(c\.rgb\);/);
const [primitive] = scene.primitives.items;
const appearance = primitive.appearance;
assert.equal(appearance.material.options.translucent, false);
assert.deepEqual(
{ ...appearance.options, material: undefined },
{
aboveGround: true,
flat: true,
translucent: false,
material: undefined,
},
);
assert.deepEqual(appearance.getRenderState(), {
depthTest: { enabled: true },
depthMask: false,
blending: Cesium.BlendingState.ALPHA_BLEND,
});
const geometry = primitive.options.geometryInstances.geometry.options;
assert.equal(geometry.rectangle, rectangle);
assert.equal(geometry.height, 6_200);
assert.equal(geometry.granularity, Cesium.Math.toRadians(0.5));
assert.equal(
geometry.vertexFormat,
Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT,
);
assert.equal(primitive.options.asynchronous, true);
assert.equal(primitive.options.allowPicking, false);
const lower = createShellSurface({
viewer: { scene },
cesium,
rectangle,
height: 5_000,
});
assert.equal(cesium.templates.size, 1, 'the template registers once');
assert.deepEqual(
scene.primitives.items.map(
(item) => item.options.geometryInstances.geometry.options.height,
),
[5_000, 6_200],
);
lower.destroy();
surface.destroy();
});
test('a surface applies a new detail window only once its image has drawn; the same window swaps only the image', () => {
const cesium = createShellCesium();
const scene = createShellScene();
const surface = createShellSurface({
viewer: { scene },
cesium,
rectangle: Cesium.Rectangle.fromDegrees(-130, 20, -60, 55),
height: 6_200,
});
const [primitive] = scene.primitives.items;
const { uniforms } = primitive.appearance.material;
const render = (count) => renderShells(cesium, scene, count);
const image = () => ({ width: 4096, height: 2048 });
surface.setImage(image());
render();
assert.deepEqual(surface.getDiagnostics().detail, {
uploaded: false,
window: null,
});
const a = { west: 0.25, south: 0.5, east: 0.5, north: 0.75 };
const first = image();
surface.setDetail(first, a);
assert.equal(uniforms.detail, first);
assert.deepEqual(windowOf(primitive), NONE, 'the full-extent image covers');
assert.equal(scene.postRender.size, 1, 'renders until the detail has drawn');
render(2);
assert.deepEqual(windowOf(primitive), NONE);
render(1);
assert.deepEqual(windowOf(primitive), { x: 0.25, y: 0.5, z: 0.5, w: 0.75 });
assert.ok(uniforms.window instanceof Cesium.Cartesian4);
assert.deepEqual(surface.getDiagnostics().detail, {
uploaded: true,
window: a,
});
assert.equal(scene.postRender.size, 0);
// A time change in the same window: Cesium keeps drawing the previous
// texture until the new one is uploaded, so the window stays.
const applied = uniforms.window;
const second = image();
surface.setDetail(second, { ...a });
assert.equal(uniforms.detail, second);
assert.equal(uniforms.window, applied, 'only the image is written');
assert.equal(surface.getDiagnostics().detail.uploaded, false);
render();
assert.equal(surface.getDiagnostics().detail.uploaded, true);
assert.equal(uniforms.window, applied);
const renders = scene.renders;
surface.setDetail(second, { ...a });
assert.equal(scene.renders, renders, 'an unchanged detail costs nothing');
assert.equal(scene.postRender.size, 0);
// A different window empties at once and applies once its image has drawn.
const b = { west: 0.5, south: 0.25, east: 0.75, north: 0.5 };
surface.setDetail(image(), b);
assert.deepEqual(windowOf(primitive), NONE);
render(2);
assert.deepEqual(windowOf(primitive), NONE);
render(1);
assert.deepEqual(windowOf(primitive), { x: 0.5, y: 0.25, z: 0.75, w: 0.5 });
surface.setDetail(null);
assert.equal(uniforms.detail, Cesium.Material.DefaultImageId);
assert.deepEqual(windowOf(primitive), NONE);
assert.deepEqual(surface.getDiagnostics().detail, {
uploaded: false,
window: null,
});
render();
assert.deepEqual(
{ ...uniforms.detailDimensions },
{ type: 'ivec3', x: 1, y: 1 },
);
// Counted renders alone are not enough: the bound texture must be this image.
surface.setDetail(image(), a);
for (let i = 0; i < 4; i++) scene.postRender.emit();
assert.deepEqual(windowOf(primitive), NONE, 'still the 1×1 default');
render(1);
assert.deepEqual(windowOf(primitive), { x: 0.25, y: 0.5, z: 0.5, w: 0.75 });
surface.destroy();
surface.setDetail(image(), b);
assert.deepEqual(windowOf(primitive), { x: 0.25, y: 0.5, z: 0.5, w: 0.75 });
assert.equal(scene.postRender.size, 0);
});
test('shells rise with the camera over coarse 3D tiles, in steps, up to 60 km', () => {
assert.equal(shellLift(undefined), 0);
assert.equal(shellLift(1_200), 0, 'city views keep the shell heights');
assert.equal(shellLift(3_000_000), 12_000);
assert.equal(shellLift(8_000_000), 32_000);
assert.equal(shellLift(18_500_000), 60_000);
const camera = { positionCartographic: { height: 1_200 } };
const scene = {
primitives: new Cesium.PrimitiveCollection(),
preRender: new Cesium.Event(),
postRender: new Cesium.Event(),
camera,
requestRender() {},
};
const surface = createShellSurface({
viewer: { scene },
cesium: Cesium,
rectangle: Cesium.Rectangle.fromDegrees(-130, 20, -60, 55),
height: 5_800,
let height = 1_200;
const preRender = new Set();
const lifts = [];
const off = followShellLift({}, (lift) => lifts.push(lift), {
cameraOf: () => ({ pose: () => ({ height }) }),
frameOf: () => ({
on(phase, cb) {
assert.equal(phase, 'preRender');
preRender.add(cb);
return () => preRender.delete(cb);
},
}),
});
const primitive = scene.primitives.get(0);
const identity = primitive.modelMatrix;
scene.preRender.raiseEvent();
assert.equal(primitive.modelMatrix, identity, 'no lift, no new matrix');
camera.positionCartographic.height = 8_000_000;
scene.preRender.raiseEvent();
const radius = Cesium.Ellipsoid.WGS84.maximumRadius;
assert.ok(
Math.abs(primitive.modelMatrix[0] * radius - (radius + 32_000)) < 1e-3,
);
const lifted = primitive.modelMatrix;
camera.positionCartographic.height = 8_010_000;
scene.preRender.raiseEvent();
assert.equal(primitive.modelMatrix, lifted, 'the same step keeps the matrix');
surface.destroy();
assert.equal(scene.preRender.numberOfListeners, 0);
});
test('real Cesium builds the two-texture material, the opaque-pass appearance and the rectangle primitive', () => {
const scene = {
primitives: new Cesium.PrimitiveCollection(),
postRender: new Cesium.Event(),
requestRender() {},
};
const surface = createShellSurface({
viewer: { scene },
cesium: Cesium,
rectangle: Cesium.Rectangle.fromDegrees(-130, 20, -60, 55),
height: 6_600,
});
const cached = Cesium.Material._materialCache.getMaterial('WeatherFrame');
assert.ok(cached && !(cached instanceof Cesium.Material));
const primitive = scene.primitives.get(0);
const material = primitive.appearance.material;
assert.ok(primitive instanceof Cesium.Primitive);
assert.equal(material.type, 'WeatherFrame');
assert.equal(material.isTranslucent(), false);
assert.equal(primitive.appearance.isTranslucent(), false, 'opaque pass');
assert.equal(primitive.appearance.getRenderState().depthMask, false);
assert.equal(
Cesium.Appearance.prototype.getRenderState.call(primitive.appearance)
.depthMask,
true,
'the default opaque render state would write depth',
);
assert.deepEqual(
[material.uniforms.imageDimensions.x, material.uniforms.detailDimensions.x],
[1, 1],
'Cesium tracks both bound texture sizes',
);
const shader = material.shaderSource;
for (const declaration of [
/uniform sampler2D image_\d+;/,
/uniform sampler2D detail_\d+;/,
/uniform float alpha_\d+;/,
/uniform vec4 window_\d+;/,
/uniform ivec3 imageDimensions_\d+;/,
/uniform ivec3 detailDimensions_\d+;/,
])
assert.match(shader, declaration);
assert.match(shader, /texture\(image_\d+, st\)/);
assert.match(shader, /texture\(detail_\d+, clamp\(dst, 0\.0, 1\.0\)\)/);
assert.match(shader, /lessThanEqual\(st, window_\d+\.zw\)/);
assert.match(shader, /step\(1\.5, float\(detailDimensions_\d+\.x\)\)/);
assert.match(
shader,
/material\.alpha = c\.a \* alpha_\d+ \* step\(1\.5, float\(imageDimensions_\d+\.x\)\);/,
'the uniform is renamed, the material field is not',
);
assert.match(shader, /float useDetail = inside \* step/, 'locals keep names');
const detail = { width: 4096, height: 2048 };
surface.setDetail(detail, { west: 0.1, south: 0.2, east: 0.3, north: 0.4 });
assert.equal(material.uniforms.detail, detail);
assert.deepEqual(
[material.uniforms.window.z, material.uniforms.window.w],
[-1, -1],
'no window before the image has drawn',
);
surface.setDetail(null);
assert.equal(material.uniforms.detail, Cesium.Material.DefaultImageId);
surface.setAlpha(0.4);
assert.equal(material.uniforms.alpha, 0.4);
surface.destroy();
assert.equal(scene.primitives.length, 0);
assert.equal(primitive.isDestroyed(), true);
assert.equal(material.isDestroyed(), true);
assert.equal(scene.postRender.numberOfListeners, 0);
});
test('shells draw first, in height order, regardless of add order', () => {
const scene = createShellScene();
const other = { name: 'other' };
scene.primitives.add(other);
const add = (name, height) => {
const primitive = { name };
scene.primitives.add(primitive);
orderWeatherShells(scene.primitives, primitive, height);
return primitive;
};
add('lightning', 6_600);
add('radar', 6_200);
add('wind', 5_000);
const later = { name: 'later' };
scene.primitives.add(later);
add('regional', 5_800);
assert.deepEqual(
scene.primitives.items.map(({ name }) => name),
['wind', 'regional', 'radar', 'lightning', 'other', 'later'],
);
const primitives = new Cesium.PrimitiveCollection({
destroyPrimitives: false,
});
const real = (name) => ({ name, update() {}, isDestroyed: () => false });
const tileset = primitives.add(real('tileset'));
const lightning = primitives.add(real('lightning'));
orderWeatherShells(primitives, lightning, 6_600);
const radar = primitives.add(real('radar'));
orderWeatherShells(primitives, radar, 6_200);
assert.deepEqual(
[0, 1, 2].map((i) => primitives.get(i).name),
['radar', 'lightning', 'tileset'],
'real Cesium collection order',
);
assert.equal(tileset.name, 'tileset');
const frame = () => [...preRender].forEach((cb) => cb());
assert.deepEqual(lifts, [0], 'told at once');
frame();
assert.deepEqual(lifts, [0], 'no change, nothing told');
height = 8_000_000;
frame();
height = 8_010_000;
frame();
assert.deepEqual(lifts, [0, 32_000], 'the same step is told once');
off();
assert.equal(preRender.size, 0);
});
test('first frame stages invisibly, requests renders until drawable and then commits', async () => {
@@ -871,40 +592,6 @@ test('an unowned restage is joined by the next request for the same frame', asyn
const footprint = (west, south, east, north) => ({ west, south, east, north });
const box = (west, south, east, north) => ({ west, south, east, north });
test('hidden frames do not count towards a pending detail window', () => {
const cesium = createShellCesium();
const scene = createShellScene();
const surface = createShellSurface({
viewer: { scene },
cesium,
rectangle: Cesium.Rectangle.fromDegrees(-130, 20, -60, 55),
height: 6_200,
});
const [primitive] = scene.primitives.items;
const render = (count) => renderShells(cesium, scene, count);
const image = () => ({ width: 4096, height: 2048 });
surface.setImage(image());
const a = { west: 0.25, south: 0.5, east: 0.5, north: 0.75 };
surface.setDetail(image(), a);
render();
assert.deepEqual(windowOf(primitive), { x: 0.25, y: 0.5, z: 0.5, w: 0.75 });
// A different window with a same-sized image: the dimensions alone cannot
// tell the textures apart, so only shown frames may count.
const b = { west: 0.5, south: 0.25, east: 0.75, north: 0.5 };
surface.setDetail(image(), b);
assert.deepEqual(windowOf(primitive), NONE);
for (let i = 0; i < 3; i++) {
surface.setShow(false);
scene.postRender.emit();
surface.setShow(true);
}
assert.deepEqual(windowOf(primitive), NONE, 'hidden frames counted nothing');
render(2);
assert.deepEqual(windowOf(primitive), NONE);
render(1);
assert.deepEqual(windowOf(primitive), { x: 0.5, y: 0.25, z: 0.75, w: 0.5 });
});
test('detail windows are sized from the footprint, snapped to 0.5° and clamped inside the product', () => {
// max(2 × the longitude span, 6°) wide, half as tall.
assert.deepEqual(
+10 -1
View File
@@ -7,6 +7,7 @@ import * as Cesium from 'cesium';
import { Color, ImageryLayerCollection, GeographicTilingScheme } from 'cesium';
import { NO_IMAGERY_HOST } from './imageryHost.js';
import { createWeatherShell } from './shellRendering.js';
import { createCesiumFields } from '../../render/cesium/drawFields.js';
import { WEATHER_IMAGERY_Z } from './imageryOrder.js';
import { fakeGlobePort } from '../../testSupport/fakeGlobePort.mjs';
import { fakeSceneFrame } from '../../testSupport/fakeCesiumScene.mjs';
@@ -222,6 +223,9 @@ function renderingHarness(options = {}) {
Credit: Cesium.Credit,
Rectangle: Cesium.Rectangle,
};
// The Cesium draw port's raster shells, over the doubles.
const fields = createCesiumFields({ scene: viewer.scene, cesium });
const draw = { field: (spec) => fields.field(spec) };
const rendering = createWeatherRendering({
viewer,
globeOf: () => globe,
@@ -230,7 +234,12 @@ function renderingHarness(options = {}) {
frameOf: () => frame,
toBitmap: (canvas) => canvas,
createShell: (shellOptions) =>
createWeatherShell({ ...shellOptions, cesium }),
createWeatherShell({
...shellOptions,
drawOf: () => draw,
cameraOf: cameraOver,
frameOf: () => frame,
}),
fetchImpl: async () => mockResponse(),
decodeImage: async () => ({ width: 2048, height: 1024, close() {} }),
createCanvas,
+62 -10
View File
@@ -5,12 +5,12 @@ import * as Cesium from 'cesium';
import '../../render/cesium/globe.js';
import '../../render/cesium/camera.js';
import {
createShellSurface,
followShellLift,
WEATHER_SHELL_HEIGHTS,
} from '../weather/shellRendering.js';
import { createWindRelief } from './relief.js';
import { WEATHER_IMAGERY_Z } from '../weather/imageryOrder.js';
import { findGlobe } from '../../render/rendererOf.js';
import { findDraw, findGlobe } from '../../render/rendererOf.js';
import { NO_IMAGERY_HOST } from '../weather/imageryHost.js';
import { msg } from '../../i18n/index.js';
import { createWindGpuRendering } from './gpuRendering.js';
@@ -63,6 +63,58 @@ function sameWind(previous, next, previousField, nextField) {
return true;
}
let windShells = 0;
/** The colour field as a raised shell over the whole globe, through the
* draw port's raster-shell field; it rises with the camera. */
function createWindShell(viewer, draw, texture, alpha) {
const seq = (windShells += 1);
const height = WEATHER_SHELL_HEIGHTS.wind;
const field = draw.field({
kind: 'rasterShell',
id: `wind-shell:${seq}`,
image: { canvas: texture, key: `wind-shell:${seq}` },
rectangle: { west: -180, south: -90, east: 180, north: 90 },
heightM: height,
alpha,
});
let shownAlpha = alpha;
let drawn = false;
let owed = true;
field.on('drawn', () => {
drawn = true;
owed = false;
});
const offLift = followShellLift(viewer, (liftM) => {
owed = true;
field.update({ liftM });
});
return {
setAlpha(value) {
if (value === shownAlpha) return;
shownAlpha = value;
owed = true;
field.update({ alpha: value });
},
setShow(value) {
field.show = Boolean(value);
},
destroy() {
offLift();
field.dispose();
},
getDiagnostics: () => ({
height,
ready: drawn,
uploaded: drawn,
show: field.show,
alpha: shownAlpha,
rendering: owed && field.show,
detail: { uploaded: false, window: null },
}),
};
}
/** Globe-projected surface flow plus one owned, static colour field: globe
* imagery on the globe host, a raised shell on the 3D Tiles host. */
export function createWindRendering({
@@ -73,6 +125,7 @@ export function createWindRendering({
eventTarget = globalThis.window,
createGpuRendering = createWindGpuRendering,
globeOf = findGlobe,
drawOf = findDraw,
onStatusChange,
} = {}) {
// The host the shell names, else the viewer's globe imagery.
@@ -362,7 +415,8 @@ export function createWindRendering({
imageryError = fieldUnavailableText(overlay);
return;
}
if (kind === 'tileset' ? !cesium.Primitive : !globe) {
const draw = kind === 'tileset' ? drawOf(viewer) : null;
if (kind === 'tileset' ? !draw?.field : !globe) {
imageryError = msg('Globe imagery unavailable');
return;
}
@@ -375,15 +429,13 @@ export function createWindRendering({
pixels.data.set(raster.rgba);
ctx.putImageData(pixels, 0, 0);
if (kind === 'tileset') {
shell = createShellSurface({
shell = createWindShell(
viewer,
cesium,
rectangle: cesium.Rectangle.MAX_VALUE,
height: WEATHER_SHELL_HEIGHTS.wind,
});
shell.setImage(texture);
draw,
texture,
overlay === 'temperature' ? 1 : 0.85,
);
imageryKind = kind;
shell.setAlpha(overlay === 'temperature' ? 1 : 0.85);
updateImageryFade(viewer.scene.camera, true);
viewer.scene?.requestRender?.();
return;
+18 -3
View File
@@ -8,7 +8,9 @@ import { WEATHER_IMAGERY_Z } from '../weather/imageryOrder.js';
import {
createShellCesium,
createShellScene,
renderShells,
} from '../weather/shellFixture.mjs';
import { createCesiumFields } from '../../render/cesium/drawFields.js';
function event() {
const listeners = new Set();
@@ -197,8 +199,9 @@ function harness({
},
isDestroyed: () => false,
};
const shellCesium = shell ? createShellCesium() : null;
const cesium = {
...(shell ? createShellCesium() : {}),
...(shellCesium ?? {}),
GeographicTilingScheme: Cesium.GeographicTilingScheme,
Credit: Cesium.Credit,
Event: Cesium.Event,
@@ -220,11 +223,17 @@ function harness({
}
},
};
const fields = shellCesium
? createCesiumFields({ scene: viewer.scene, cesium: shellCesium })
: null;
const draw = fields && { field: (spec) => fields.field(spec) };
const rendering = createWindRendering({
cesium,
container,
getViewer: () => viewer,
globeOf: (given) => (given === viewer ? globe : null),
// The Cesium draw port's raster shells, over the doubles.
drawOf: (given) => (given === viewer ? draw : null),
createGpuRendering,
onStatusChange,
getHost,
@@ -245,7 +254,7 @@ function harness({
motion,
preRender,
viewer,
cesium,
cesium: shellCesium ?? cesium,
imagery,
removed,
primitives: () => shellScene?.primitives.items ?? [],
@@ -1028,10 +1037,14 @@ test('scalar field becomes a raised shell on 3D Tiles and survives no-host event
eventTarget.dispatchEvent(new Event('gev:map-stack-changed'));
assert.equal(h.imagery.length, 0);
assert.equal(h.removed[0].destroy, true);
// It shows once its geometry and image are ready.
renderShells(h.cesium, h.viewer.scene);
const [primitive] = h.primitives();
const geometry = primitive.options.geometryInstances.geometry.options;
assert.equal(geometry.height, 5_000);
assert.equal(geometry.rectangle, h.cesium.Rectangle.MAX_VALUE);
assert.ok(
h.cesium.Rectangle.equals(geometry.rectangle, h.cesium.Rectangle.MAX_VALUE),
);
const material = primitive.appearance.material;
assert.equal(h.textures.length, 2);
assert.equal(material.uniforms.image, h.textures[1]);
@@ -1121,6 +1134,7 @@ for (const overlay of ['speed', 'temperature', 'pressure']) {
h.rendering.setOptions({ overlay });
h.rendering.setField(field);
h.rendering.start();
renderShells(h.cesium, h.viewer.scene);
assert.equal(h.imagery.length, 0);
const [primitive] = h.primitives();
const { uniforms } = primitive.appearance.material;
@@ -1185,6 +1199,7 @@ for (const overlay of ['speed', 'temperature', 'pressure']) {
},
});
h.rendering.start();
renderShells(h.cesium, h.viewer.scene);
const [primitive] = h.primitives();
const textures = h.textures.length;
const baseAlpha = overlay === 'temperature' ? 1 : 0.85;