Remove a released 3D tileset from Navara's scene and surface queries

With its cache budget on, Navara 0.2.1 deletes a source without emitting
the model-removal events, so the meshes of a released photoreal tileset
stayed in the scene: after switching to another map the buildings were
still drawn, and sampleHeight, clampToHeight, the shared surface
placement and ground drapes still answered from them. The adapter now
disposes the deleted layer's meshes, registry entries and retained
geometry itself, also for tiles that finish decoding afterwards, and
WORKAROUNDS.md records it. A contract check fails when a surface query
still reports tiles after leaving photoreal, with a mutant.
This commit is contained in:
German Khokhlov committed 2026-11-10 22:15:50 +04:00
1 parent 4bbf9949d5
commit cd571dfb32
9 files changed
+440 -6

No files matched your search

+61
View File
@@ -33,6 +33,7 @@ export function assertNavaraInternals(view) {
`view._scenes.${name}.children`,
Array.isArray(view?._scenes?.[name]?.children),
);
requireMember('view._meshes', view?._meshes instanceof Map);
requireMember(
'ModelMesh.prototype._releaseGeometryArrays',
typeof ModelMesh.prototype._releaseGeometryArrays === 'function',
@@ -123,6 +124,65 @@ export function tileRoots(view) {
);
}
// With a cache budget, Navara 0.2.1 deletes a 3D-tiles source without
// emitting removals for its cached models. Tie each model to its layer so
// deleting that layer also releases the scene objects and CPU geometry.
// Private: FeatureEvaluator.obj and view._meshes. Upstream ask: deleting a
// layer must evict its models regardless of the tile-cache budget.
function releaseDeletedTileGeometry(view) {
const byLayer = new WeakMap();
view.on('layer', (event, layerId, { evaluator } = {}) => {
if (event !== 'featureCreated') return;
const root = evaluator?.obj;
if (!(root instanceof ModelMesh)) return;
const layer = view.findLayerById(layerId);
const release = (root) => {
root.traverse((object) => {
const geometry = object.geometry;
if (geometry) {
geometry.dispose();
for (const name of Object.keys(geometry.attributes))
geometry.deleteAttribute(name);
geometry.setIndex(null);
geometry.boundingBox = geometry.boundingSphere = null;
}
const materials = Array.isArray(object.material)
? object.material
: [object.material];
for (const material of materials) material?.dispose();
object.customDepthMaterial?.dispose();
});
root.dispatchEvent({ type: 'removedFromWorld' });
root.clear();
root.removeFromParent();
};
// A decode already in flight can finish after the layer was deleted.
if (!layer) {
for (const [id, mesh] of view._meshes)
if (mesh === root) view._meshes.delete(id);
release(root);
return;
}
let roots = byLayer.get(layer);
if (!roots) {
roots = new Set();
byLayer.set(layer, roots);
layer.once('deleted', () => {
for (const [id, mesh] of view._meshes)
if (roots.has(mesh)) view._meshes.delete(id);
for (const root of roots) release(root);
roots.clear();
});
}
roots.add(root);
const removed = () => {
roots.delete(root);
root.removeEventListener('removedFromWorld', removed);
};
root.addEventListener('removedFromWorld', removed);
});
}
/**
* Whether Navara has stopped updating (tiles loaded, camera still).
* Private: view._isIdle, which the public `idle` event reports only as an
@@ -249,6 +309,7 @@ export function setCameraFovy(view, radians) {
/** The hooks createNavaraEngine takes. */
export const navaraHooks = (view) => {
assertNavaraInternals(view);
releaseDeletedTileGeometry(view);
return {
retainTileGeometry,
setCameraFovy: (radians) => setCameraFovy(view, radians),