leaflet-city-mapper 0.1.0 → 0.1.1

package/src/textures/bindMeshTextures.js

@@ -1,57 +1,57 @@
-import { meshBindGroup } from '../globals/meshBindGroup.js';
-import { drawEntries } from '../globals/drawEntries.js';
-import { drawMeshEntry } from '../globals/drawMeshEntry.js';
-import { drawFrameEntry } from '../globals/drawFrameEntry.js';
-import { drawTerrainEntry } from '../globals/drawTerrainEntry.js';
-import { drawTextureEntries } from '../globals/drawTextureEntries.js';
-import { drawSamplerEntries } from '../globals/drawSamplerEntries.js';
-
-/**
- * Create the mesh bind group for frame uniforms, terrain and material textures.
- *
- * @param {Object} renderer Renderer providing the device and uniform buffer.
- * @param {Object} mesh Mesh whose bind group is updated.
- * @param {Array<Object>} textures Texture and sampler pairs in program binding order.
- */
-export function bindMeshTextures(renderer, mesh, textures) {
-  const { program } = mesh;
-  const entries = drawEntries;
-  entries.length = 0;
-  drawMeshEntry.resource.buffer = renderer.uniformBuffer;
-  drawFrameEntry.resource.buffer = renderer.uniformBuffer;
-  entries.push(drawMeshEntry, drawFrameEntry);
-  if (program.terrain) {
-    drawTerrainEntry.resource = program.terrain.texture.createView();
-    entries.push(drawTerrainEntry);
-  }
-  mesh.boundBuffer = renderer.uniformBuffer;
-  const boundTextures = mesh.boundTextures ||= /* alloc */ [];
-  boundTextures.length = textures.length;
-  let i, binding, texture;
-  for (i = 0; i < textures.length; i++) {
-    binding = program.bindings[i], texture = textures[i];
-    drawTextureEntries[i].binding = binding.texture;
-    drawTextureEntries[i].resource = texture.texture.createView();
-    drawSamplerEntries[i].binding = binding.sampler;
-    drawSamplerEntries[i].resource = texture.sampler;
-    entries.push(drawTextureEntries[i], drawSamplerEntries[i]);
-    boundTextures[i] ||= /* alloc */ [];
-    boundTextures[i][0] = texture.texture;
-    boundTextures[i][1] = texture.sampler;
-  }
-  mesh.bindGroup = renderer.device.createBindGroup((
-    meshBindGroup.layout = program.bindGroupLayout,
-    meshBindGroup.entries = entries,
-    meshBindGroup
-  ));
-  meshBindGroup.layout = null;
-  meshBindGroup.entries = null;
-  drawMeshEntry.resource.buffer = null;
-  drawFrameEntry.resource.buffer = null;
-  drawTerrainEntry.resource = null;
-  for (i = 0; i < textures.length; i++) {
-    drawTextureEntries[i].resource = null;
-    drawSamplerEntries[i].resource = null;
-  }
-  entries.length = 0;
-}
+import { meshBindGroup } from '../globals/meshBindGroup.js';
+import { drawEntries } from '../globals/drawEntries.js';
+import { drawMeshEntry } from '../globals/drawMeshEntry.js';
+import { drawFrameEntry } from '../globals/drawFrameEntry.js';
+import { drawTerrainEntry } from '../globals/drawTerrainEntry.js';
+import { drawTextureEntries } from '../globals/drawTextureEntries.js';
+import { drawSamplerEntries } from '../globals/drawSamplerEntries.js';
+
+/**
+ * Create the mesh bind group for frame uniforms, terrain and material textures.
+ *
+ * @param {Object} renderer Renderer providing the device and uniform buffer.
+ * @param {Object} mesh Mesh whose bind group is updated.
+ * @param {Array<Object>} textures Texture and sampler pairs in program binding order.
+ */
+export function bindMeshTextures(renderer, mesh, textures) {
+  const { program } = mesh;
+  const entries = drawEntries;
+  entries.length = 0;
+  drawMeshEntry.resource.buffer = renderer.uniformBuffer;
+  drawFrameEntry.resource.buffer = renderer.uniformBuffer;
+  entries.push(drawMeshEntry, drawFrameEntry);
+  if (program.terrain) {
+    drawTerrainEntry.resource = program.terrain.texture.createView();
+    entries.push(drawTerrainEntry);
+  }
+  mesh.boundBuffer = renderer.uniformBuffer;
+  const boundTextures = mesh.boundTextures ||= /* alloc */ [];
+  boundTextures.length = textures.length;
+  let i, binding, texture;
+  for (i = 0; i < textures.length; i++) {
+    binding = program.bindings[i], texture = textures[i];
+    drawTextureEntries[i].binding = binding.texture;
+    drawTextureEntries[i].resource = texture.texture.createView();
+    drawSamplerEntries[i].binding = binding.sampler;
+    drawSamplerEntries[i].resource = texture.sampler;
+    entries.push(drawTextureEntries[i], drawSamplerEntries[i]);
+    boundTextures[i] ||= /* alloc */ [];
+    boundTextures[i][0] = texture.texture;
+    boundTextures[i][1] = texture.sampler;
+  }
+  mesh.bindGroup = renderer.device.createBindGroup((
+    meshBindGroup.layout = program.bindGroupLayout,
+    meshBindGroup.entries = entries,
+    meshBindGroup
+  ));
+  meshBindGroup.layout = null;
+  meshBindGroup.entries = null;
+  drawMeshEntry.resource.buffer = null;
+  drawFrameEntry.resource.buffer = null;
+  drawTerrainEntry.resource = null;
+  for (i = 0; i < textures.length; i++) {
+    drawTextureEntries[i].resource = null;
+    drawSamplerEntries[i].resource = null;
+  }
+  entries.length = 0;
+}

package/src/textures/collectRoofTiles.js

@@ -1,23 +1,23 @@
-import { rasterTilesByLayer } from '../weakmaps/rasterTilesByLayer.js';
-
-/**
- * Collect completed, unaborted raster tiles with images for the roof atlas.
- *
- * @param {Array<L.Layer>} rasters Raster layers to inspect.
- * @param {Array<Object>} tiles Destination for tile and layer entries.
- *
- * @returns {number} Highest collected tile zoom, or negative infinity if none.
- */
-export function collectRoofTiles(rasters, tiles) {
-  let zoom = -Infinity, layer, tile;
-  for (layer of rasters) {
-    for (tile of rasterTilesByLayer.get(layer).values()) {
-      if (tile.done && !tile.request.signal.aborted && tile.image) {
-        tile._roofEntry ||= /* alloc */ { tile, layer };
-        tiles.push(tile._roofEntry);
-        zoom = Math.max(zoom, tile.coords.z);
-      }
-    }
-  }
-  return zoom;
-}
+import { rasterTilesByLayer } from '../weakmaps/rasterTilesByLayer.js';
+
+/**
+ * Collect completed, unaborted raster tiles with images for the roof atlas.
+ *
+ * @param {Array<L.Layer>} rasters Raster layers to inspect.
+ * @param {Array<Object>} tiles Destination for tile and layer entries.
+ *
+ * @returns {number} Highest collected tile zoom, or negative infinity if none.
+ */
+export function collectRoofTiles(rasters, tiles) {
+  let zoom = -Infinity, layer, tile;
+  for (layer of rasters) {
+    for (tile of rasterTilesByLayer.get(layer).values()) {
+      if (tile.done && !tile.request.signal.aborted && tile.image) {
+        tile._roofEntry ||= /* alloc */ { tile, layer };
+        tiles.push(tile._roofEntry);
+        zoom = Math.max(zoom, tile.coords.z);
+      }
+    }
+  }
+  return zoom;
+}

package/src/textures/loadModelImage.js

@@ -1,29 +1,29 @@
-import { geometryImageOptions } from '../globals/geometryImageOptions.js';
-
-/**
- * Load a glTF image from a buffer view or URI as an unpremultiplied image bitmap.
- *
- * @param {Object} description Decoded glTF document with loaded buffers.
- * @param {string} directory Base URL for external image URIs.
- * @param {Object} image glTF image specification.
- *
- * @returns {Promise<ImageBitmap>} Decoded image.
- *
- * @throws {Error} If an external image response is not successful.
- */
-export async function loadImage(description, directory, image) {
-  let blob;
-  if (image.bufferView !== undefined) {
-    const view = description.bufferViews[image.bufferView];
-    const buffer = description.buffers[view.buffer].binary;
-    blob = /* alloc */ new Blob(
-      /* alloc */ [buffer.slice(view.byteOffset || 0, (view.byteOffset || 0) + view.byteLength)],
-      /* alloc */ { type: image.mimeType });
-  } else {
-    const response = await fetch(/* alloc */ new URL(image.uri, directory).href);
-    if (!response.ok) throw /* alloc */ new Error(`Unable to load model texture: HTTP ${response.status}`);
-    blob = await response.blob();
-  }
-  // Preserve straight alpha and raw samples; GPU sRGB formats do color decoding.
-  return createImageBitmap(blob, geometryImageOptions);
-}
+import { geometryImageOptions } from '../globals/geometryImageOptions.js';
+
+/**
+ * Load a glTF image from a buffer view or URI as an unpremultiplied image bitmap.
+ *
+ * @param {Object} description Decoded glTF document with loaded buffers.
+ * @param {string} directory Base URL for external image URIs.
+ * @param {Object} image glTF image specification.
+ *
+ * @returns {Promise<ImageBitmap>} Decoded image.
+ *
+ * @throws {Error} If an external image response is not successful.
+ */
+export async function loadImage(description, directory, image) {
+  let blob;
+  if (image.bufferView !== undefined) {
+    const view = description.bufferViews[image.bufferView];
+    const buffer = description.buffers[view.buffer].binary;
+    blob = /* alloc */ new Blob(
+      /* alloc */ [buffer.slice(view.byteOffset || 0, (view.byteOffset || 0) + view.byteLength)],
+      /* alloc */ { type: image.mimeType });
+  } else {
+    const response = await fetch(/* alloc */ new URL(image.uri, directory).href);
+    if (!response.ok) throw /* alloc */ new Error(`Unable to load model texture: HTTP ${response.status}`);
+    blob = await response.blob();
+  }
+  // Preserve straight alpha and raw samples; GPU sRGB formats do color decoding.
+  return createImageBitmap(blob, geometryImageOptions);
+}

package/src/textures/modelTextureFor.js

@@ -1,47 +1,47 @@
-import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
-import { textureSampler } from './modelTextureSampler.js';
-
-/**
- * Get or create a model texture, using separate cache entries for color and data formats.
- *
- * @param {Object} context Model context containing images, texture descriptions and cache.
- * @param {Object} reference glTF texture reference, if present.
- * @param {boolean} [color] Whether to use an sRGB color format.
- *
- * @returns {Object|null} Cached texture state, or null without a reference.
- *
- * @throws {Error} If the texture uses transformed UVs or a set other than TEXCOORD_0.
- */
-export function textureFor(context, reference, color = false) {
-  const { backend: layer, description, images, textures } = context;
-  if (!reference) return null;
-  if ((reference.texCoord || 0) !== 0 || reference.extensions) {
-    throw /* alloc */ new Error('Model textures currently require untransformed TEXCOORD_0 UVs');
-  }
-  const device = rendererByLayer.get(layer).device;
-  // A glTF image may serve both color and data maps: those cannot share a GPU format.
-  const key = `${reference.index}:${color}`;
-  if (!textures.has(key)) {
-    const texture = description.textures[reference.index];
-    const sampler = description.samplers?.[texture.sampler];
-    const image = images[texture.source];
-    const format = color ? 'rgba8unorm-srgb' : 'rgba8unorm';
-    const samplerOptions = textureSampler(sampler);
-    textures.set(key, /* alloc */ {
-      device,
-      texture: device.createTexture(/* alloc */ {
-        size: /* alloc */ [image.width, image.height],
-        format,
-        usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
-      }),
-      sampler: device.createSampler(samplerOptions),
-      samplerOptions,
-      format,
-      srgb: color,
-      image,
-      flipY: false,
-      uploaded: null,
-    });
-  }
-  return textures.get(key);
-}
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { textureSampler } from './modelTextureSampler.js';
+
+/**
+ * Get or create a model texture, using separate cache entries for color and data formats.
+ *
+ * @param {Object} context Model context containing images, texture descriptions and cache.
+ * @param {Object} reference glTF texture reference, if present.
+ * @param {boolean} [color] Whether to use an sRGB color format.
+ *
+ * @returns {Object|null} Cached texture state, or null without a reference.
+ *
+ * @throws {Error} If the texture uses transformed UVs or a set other than TEXCOORD_0.
+ */
+export function textureFor(context, reference, color = false) {
+  const { backend: layer, description, images, textures } = context;
+  if (!reference) return null;
+  if ((reference.texCoord || 0) !== 0 || reference.extensions) {
+    throw /* alloc */ new Error('Model textures currently require untransformed TEXCOORD_0 UVs');
+  }
+  const device = rendererByLayer.get(layer).device;
+  // A glTF image may serve both color and data maps: those cannot share a GPU format.
+  const key = `${reference.index}:${color}`;
+  if (!textures.has(key)) {
+    const texture = description.textures[reference.index];
+    const sampler = description.samplers?.[texture.sampler];
+    const image = images[texture.source];
+    const format = color ? 'rgba8unorm-srgb' : 'rgba8unorm';
+    const samplerOptions = textureSampler(sampler);
+    textures.set(key, /* alloc */ {
+      device,
+      texture: device.createTexture(/* alloc */ {
+        size: /* alloc */ [image.width, image.height],
+        format,
+        usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
+      }),
+      sampler: device.createSampler(samplerOptions),
+      samplerOptions,
+      format,
+      srgb: color,
+      image,
+      flipY: false,
+      uploaded: null,
+    });
+  }
+  return textures.get(key);
+}

package/src/textures/prepareMeshTextures.js

@@ -1,31 +1,31 @@
-import { uploadMeshTexture } from './uploadMeshTexture.js';
-import { bindMeshTextures } from './bindMeshTextures.js';
-
-/**
- * Upload a mesh's program textures and rebuild its bind group when bindings change.
- *
- * @param {Object} renderer Renderer providing the GPU device and uniform buffer.
- * @param {Object} mesh Mesh whose textures and bindings are prepared.
- *
- * @throws {Error} If a required program texture is missing.
- */
-export function prepareMeshTextures(renderer, mesh) {
-  const { program } = mesh;
-  const { device } = renderer;
-  const textures = mesh._textures ||= /* alloc */ [];
-  textures.length = 0;
-  let binding, texture, i;
-  for (binding of program.bindings) {
-    texture = program.uniforms[binding.name]?.value;
-    if (!texture) throw /* alloc */ new Error(`Missing Layer3D texture: ${binding.name}`);
-    uploadMeshTexture(device, texture);
-    textures.push(texture);
-  }
-  let bindingsChanged = !mesh.bindGroup || mesh.boundBuffer !== renderer.uniformBuffer ||
-    textures.length !== mesh.boundTextures.length;
-  for (i = 0; !bindingsChanged && i < textures.length; i++) {
-    if (textures[i].texture !== mesh.boundTextures[i][0] ||
-      textures[i].sampler !== mesh.boundTextures[i][1]) bindingsChanged = true;
-  }
-  if (bindingsChanged) bindMeshTextures(renderer, mesh, textures);
-}
+import { uploadMeshTexture } from './uploadMeshTexture.js';
+import { bindMeshTextures } from './bindMeshTextures.js';
+
+/**
+ * Upload a mesh's program textures and rebuild its bind group when bindings change.
+ *
+ * @param {Object} renderer Renderer providing the GPU device and uniform buffer.
+ * @param {Object} mesh Mesh whose textures and bindings are prepared.
+ *
+ * @throws {Error} If a required program texture is missing.
+ */
+export function prepareMeshTextures(renderer, mesh) {
+  const { program } = mesh;
+  const { device } = renderer;
+  const textures = mesh._textures ||= /* alloc */ [];
+  textures.length = 0;
+  let binding, texture, i;
+  for (binding of program.bindings) {
+    texture = program.uniforms[binding.name]?.value;
+    if (!texture) throw /* alloc */ new Error(`Missing Layer3D texture: ${binding.name}`);
+    uploadMeshTexture(device, texture);
+    textures.push(texture);
+  }
+  let bindingsChanged = !mesh.bindGroup || mesh.boundBuffer !== renderer.uniformBuffer ||
+    textures.length !== mesh.boundTextures.length;
+  for (i = 0; !bindingsChanged && i < textures.length; i++) {
+    if (textures[i].texture !== mesh.boundTextures[i][0] ||
+      textures[i].sampler !== mesh.boundTextures[i][1]) bindingsChanged = true;
+  }
+  if (bindingsChanged) bindMeshTextures(renderer, mesh, textures);
+}

package/src/textures/removeImageState.js

@@ -1,14 +1,14 @@
-import { imageStates } from '../weakmaps/imageStates.js';
-
-/**
- * Remove a native layer state from an image's tracked associations.
- *
- * @param {HTMLImageElement} image Image to update.
- * @param {Object} state Native layer state to remove.
- */
-export function removeImageState(image, state) {
-  const states = imageStates.get(image);
-  if (!states) return;
-  states.delete(state);
-  if (!states.size) imageStates.delete(image);
+import { imageStates } from '../weakmaps/imageStates.js';
+
+/**
+ * Remove a native layer state from an image's tracked associations.
+ *
+ * @param {HTMLImageElement} image Image to update.
+ * @param {Object} state Native layer state to remove.
+ */
+export function removeImageState(image, state) {
+  const states = imageStates.get(image);
+  if (!states) return;
+  states.delete(state);
+  if (!states.size) imageStates.delete(image);
 }

package/src/textures/resizeRoofTexture.js

@@ -1,32 +1,32 @@
-import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
-import { roofTexture } from '../globals/roofTexture.js';
-import { roofSampler } from '../globals/roofSampler.js';
-import { destroyTexture } from './destroyTexture.js';
-
-/**
- * Create or resize the GPU texture used for the roof atlas.
- *
- * @param {L.Layer} layer Rendering layer.
- * @param {Object} roof Roof atlas state.
- * @param {number} width Texture width in pixels.
- * @param {number} height Texture height in pixels.
- */
-export function resizeRoofTexture(layer, roof, width, height) {
-  const renderer = rendererByLayer.get(layer);
-  const descriptor = roofTexture;
-  descriptor.size[0] = width; descriptor.size[1] = height;
-  descriptor.usage = GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT;
-  if (roof.texture && (roof.texture.width !== width || roof.texture.height !== height)) {
-    destroyTexture(layer, roof.texture.texture);
-    roof.texture.texture = renderer.device.createTexture(descriptor);
-    roof.texture.width = width; roof.texture.height = height;
-  }
-  roof.texture ||= /* alloc */ {
-    device: renderer.device,
-    texture: renderer.device.createTexture(descriptor),
-    sampler: renderer.device.createSampler(roofSampler),
-    samplerOptions: /* alloc */ { addressModeU: 'clamp-to-edge', addressModeV: 'clamp-to-edge' },
-    image: null, width, height,
-    format: 'rgba8unorm', srgb: false, flipY: false, uploaded: null,
-  };
-}
+import { rendererByLayer } from '../weakmaps/rendererByLayer.js';
+import { roofTexture } from '../globals/roofTexture.js';
+import { roofSampler } from '../globals/roofSampler.js';
+import { destroyTexture } from './destroyTexture.js';
+
+/**
+ * Create or resize the GPU texture used for the roof atlas.
+ *
+ * @param {L.Layer} layer Rendering layer.
+ * @param {Object} roof Roof atlas state.
+ * @param {number} width Texture width in pixels.
+ * @param {number} height Texture height in pixels.
+ */
+export function resizeRoofTexture(layer, roof, width, height) {
+  const renderer = rendererByLayer.get(layer);
+  const descriptor = roofTexture;
+  descriptor.size[0] = width; descriptor.size[1] = height;
+  descriptor.usage = GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT;
+  if (roof.texture && (roof.texture.width !== width || roof.texture.height !== height)) {
+    destroyTexture(layer, roof.texture.texture);
+    roof.texture.texture = renderer.device.createTexture(descriptor);
+    roof.texture.width = width; roof.texture.height = height;
+  }
+  roof.texture ||= /* alloc */ {
+    device: renderer.device,
+    texture: renderer.device.createTexture(descriptor),
+    sampler: renderer.device.createSampler(roofSampler),
+    samplerOptions: /* alloc */ { addressModeU: 'clamp-to-edge', addressModeV: 'clamp-to-edge' },
+    image: null, width, height,
+    format: 'rgba8unorm', srgb: false, flipY: false, uploaded: null,
+  };
+}

package/src/textures/restoreMaterialTextures.js

@@ -1,22 +1,22 @@
-/**
- * Recreate material textures and samplers that belong to a different GPU device.
- *
- * @param {Object} material Material containing model texture states.
- * @param {GPUDevice} device Device to own restored resources.
- */
-export function restoreMaterialTextures(material, device) {
-  let name, texture;
-  for (name in material) {
-    if (name !== 'baseTexture' && name !== 'metalTexture' && name !== 'emissiveTexture' && name !== 'occlusionTexture') continue;
-    texture = material[name];
-    if (!texture || texture.device === device) continue;
-    texture.device = device;
-    texture.texture = device.createTexture(/* alloc */ {
-      size: /* alloc */ [texture.image.width, texture.image.height],
-      format: texture.format,
-      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
-    });
-    texture.sampler = device.createSampler(texture.samplerOptions);
-    texture.uploaded = null;
-  }
-}
+/**
+ * Recreate material textures and samplers that belong to a different GPU device.
+ *
+ * @param {Object} material Material containing model texture states.
+ * @param {GPUDevice} device Device to own restored resources.
+ */
+export function restoreMaterialTextures(material, device) {
+  let name, texture;
+  for (name in material) {
+    if (name !== 'baseTexture' && name !== 'metalTexture' && name !== 'emissiveTexture' && name !== 'occlusionTexture') continue;
+    texture = material[name];
+    if (!texture || texture.device === device) continue;
+    texture.device = device;
+    texture.texture = device.createTexture(/* alloc */ {
+      size: /* alloc */ [texture.image.width, texture.image.height],
+      format: texture.format,
+      usage: GPUTextureUsage.TEXTURE_BINDING | GPUTextureUsage.COPY_DST | GPUTextureUsage.RENDER_ATTACHMENT,
+    });
+    texture.sampler = device.createSampler(texture.samplerOptions);
+    texture.uploaded = null;
+  }
+}

package/src/textures/updateRoofAtlas.js

@@ -1,29 +1,29 @@
-import { loadingTilesByLayer } from '../weakmaps/loadingTilesByLayer.js';
-import { rasterVersionByLayer } from '../weakmaps/rasterVersionByLayer.js';
-import { roofRasterByLayer } from '../weakmaps/roofRasterByLayer.js';
-import { L } from '../globals/L.js';
-import { roofSignatures } from '../globals/roofSignatures.js';
-import { rebuildRoofAtlas } from './rebuildRoofAtlas.js';
-
-/**
- * Rebuild a changed roof atlas, throttling updates while raster tiles are loading.
- *
- * @param {L.Layer} layer Rendering layer owning the atlas.
- * @param {Array<L.Layer>} rasters Raster layers included in the atlas.
- * @param {number} now Current frame time in milliseconds.
- */
-export function updateRoofAtlas(layer, rasters, now) {
-  const signatures = roofSignatures;
-  signatures.length = 0;
-  let loading = false, rasterLayer;
-  for (rasterLayer of rasters) {
-    signatures.push(`${L.Util.stamp(rasterLayer)}:${rasterVersionByLayer.get(rasterLayer) || 0}:${rasterLayer.options.opacity}:${rasterLayer.options.zIndex}`);
-    loading ||= Boolean(loadingTilesByLayer.get(rasterLayer));
-  }
-  const signature = signatures.join('|');
-  signatures.length = 0;
-  if (!roofRasterByLayer.get(layer) || roofRasterByLayer.get(layer).signature !== signature &&
-    (!loading || now - roofRasterByLayer.get(layer).updatedAt >= 50)) {
-    rebuildRoofAtlas(layer, rasters, signature, now);
-  }
-}
+import { loadingTilesByLayer } from '../weakmaps/loadingTilesByLayer.js';
+import { rasterVersionByLayer } from '../weakmaps/rasterVersionByLayer.js';
+import { roofRasterByLayer } from '../weakmaps/roofRasterByLayer.js';
+import { L } from '../globals/L.js';
+import { roofSignatures } from '../globals/roofSignatures.js';
+import { rebuildRoofAtlas } from './rebuildRoofAtlas.js';
+
+/**
+ * Rebuild a changed roof atlas, throttling updates while raster tiles are loading.
+ *
+ * @param {L.Layer} layer Rendering layer owning the atlas.
+ * @param {Array<L.Layer>} rasters Raster layers included in the atlas.
+ * @param {number} now Current frame time in milliseconds.
+ */
+export function updateRoofAtlas(layer, rasters, now) {
+  const signatures = roofSignatures;
+  signatures.length = 0;
+  let loading = false, rasterLayer;
+  for (rasterLayer of rasters) {
+    signatures.push(`${L.Util.stamp(rasterLayer)}:${rasterVersionByLayer.get(rasterLayer) || 0}:${rasterLayer.options.opacity}:${rasterLayer.options.zIndex}`);
+    loading ||= Boolean(loadingTilesByLayer.get(rasterLayer));
+  }
+  const signature = signatures.join('|');
+  signatures.length = 0;
+  if (!roofRasterByLayer.get(layer) || roofRasterByLayer.get(layer).signature !== signature &&
+    (!loading || now - roofRasterByLayer.get(layer).updatedAt >= 50)) {
+    rebuildRoofAtlas(layer, rasters, signature, now);
+  }
+}

package/src/textures/uploadMeshTexture.js

@@ -1,32 +1,32 @@
-import { meshImage } from '../globals/meshImage.js';
-import { meshTarget } from '../globals/meshTarget.js';
-import { meshCopySize } from '../globals/meshCopySize.js';
-
-/**
- * Upload a mesh texture's image if it has changed since the previous upload.
- *
- * @param {GPUDevice} device Device owning the texture.
- * @param {Object} texture Texture state containing its image and flip setting.
- */
-export function uploadMeshTexture(device, texture) {
-  if (texture.uploaded === texture.image) return;
-  device.queue.copyExternalImageToTexture(
-    (
-      meshImage.source = texture.image,
-      meshImage.flipY = Boolean(texture.flipY),
-      meshImage
-    ),
-    (
-      meshTarget.texture = texture.texture,
-      meshTarget
-    ),
-    (
-      meshCopySize[0] = texture.image.width,
-      meshCopySize[1] = texture.image.height,
-      meshCopySize
-    )
-  );
-  meshImage.source = null;
-  meshTarget.texture = null;
-  texture.uploaded = texture.image;
-}
+import { meshImage } from '../globals/meshImage.js';
+import { meshTarget } from '../globals/meshTarget.js';
+import { meshCopySize } from '../globals/meshCopySize.js';
+
+/**
+ * Upload a mesh texture's image if it has changed since the previous upload.
+ *
+ * @param {GPUDevice} device Device owning the texture.
+ * @param {Object} texture Texture state containing its image and flip setting.
+ */
+export function uploadMeshTexture(device, texture) {
+  if (texture.uploaded === texture.image) return;
+  device.queue.copyExternalImageToTexture(
+    (
+      meshImage.source = texture.image,
+      meshImage.flipY = Boolean(texture.flipY),
+      meshImage
+    ),
+    (
+      meshTarget.texture = texture.texture,
+      meshTarget
+    ),
+    (
+      meshCopySize[0] = texture.image.width,
+      meshCopySize[1] = texture.image.height,
+      meshCopySize
+    )
+  );
+  meshImage.source = null;
+  meshTarget.texture = null;
+  texture.uploaded = texture.image;
+}