diff --git a/src/render/cesium/imageryFrames.js b/src/render/cesium/imageryFrames.js index 851d69dd0..a50d633f2 100644 --- a/src/render/cesium/imageryFrames.js +++ b/src/render/cesium/imageryFrames.js @@ -13,6 +13,7 @@ * segment end is the nearest frame. */ import * as Cesium from 'cesium'; +import { globeTilesDrawn } from './internals.js'; /** How far apart the times a video segment is seen at are, ms. */ export const VIDEO_STEP_MS = 250; @@ -294,7 +295,7 @@ const SETTLED = new Set([ */ export function layerDrawn(scene, layer) { if (!layer || layer.isDestroyed?.() || !layer.ready) return false; - const tiles = scene.globe?._surface?._tilesToRender; + const tiles = globeTilesDrawn(scene.globe); if (!tiles?.length) return false; const bounds = layer.imageryProvider?.rectangle ?? layer.rectangle; for (const tile of tiles) { diff --git a/src/render/cesium/internals.js b/src/render/cesium/internals.js index 414e32fbd..3a0b48855 100644 --- a/src/render/cesium/internals.js +++ b/src/render/cesium/internals.js @@ -211,6 +211,17 @@ export function trimGlobeTiles(globe) { globe?._surface?._tileReplacementQueue?.trimTiles(0); } +/** + * The globe tiles the last frame drew, for timed imagery to tell when a + * frame's own imagery is what they draw (`imageryFrames.js`); Cesium says + * only whether every tile has loaded, prefetched layers included. + * @param {object} globe Cesium Globe. + * @returns {object[]} Cesium QuadtreeTiles. + */ +export function globeTilesDrawn(globe) { + return globe?._surface?._tilesToRender ?? []; +} + const NO_CREDITS = Object.freeze([]); /** diff --git a/src/render/cesium/internals.test.mjs b/src/render/cesium/internals.test.mjs index e2ca73450..91d3a24a4 100644 --- a/src/render/cesium/internals.test.mjs +++ b/src/render/cesium/internals.test.mjs @@ -13,6 +13,7 @@ import { commandExtents, creditDisplayContents, defaultView, + globeTilesDrawn, lastRenderTime, lastSeenCamera, materialTexture, @@ -59,6 +60,7 @@ test('every private field the app reaches is still declared by the installed Ces [ENGINE, 'Scene/View.js', '_cameraClone'], [ENGINE, 'Scene/Scene.js', '_frameState'], [ENGINE, 'Scene/Globe.js', '_surface'], + [ENGINE, 'Scene/QuadtreePrimitive.js', '_tilesToRender'], [ENGINE, 'Scene/QuadtreePrimitive.js', '_tileReplacementQueue'], [ENGINE, 'Scene/CreditDisplay.js', '_staticCredits'], [ENGINE, 'Scene/CreditDisplay.js', '_currentFrameCredits'], @@ -283,3 +285,9 @@ test('trimGlobeTiles empties the globe cache of what the frame did not draw', () trimGlobeTiles(undefined); assert.deepEqual(trims, [0]); }); + +test('globeTilesDrawn reads the tiles the globe last drew', () => { + const tiles = [{}]; + assert.equal(globeTilesDrawn({ _surface: { _tilesToRender: tiles } }), tiles); + assert.deepEqual(globeTilesDrawn(undefined), []); +});