isard 1.16.0 → 2.1.0

package/dist/map/layer-stack.d.ts

@@ -1,9 +1,9 @@
 /**
- * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are
- * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.
+ * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a
+ * context loss; a layer whose creation failed stays in the order, not in the engine.
  */
 import type { Layer } from '../layers/layers.ts';
-import type { Engine } from '../wasm/isard.js';
+import type { Engine } from '../wasm/isard_webgpu.js';
 /** A map's layers in drawing order, bottom first, and those kept on top */
 export declare class LayerStack {
     /** Layers in drawing order (bottom first), to recreate them after a context loss */
@@ -24,13 +24,12 @@ export declare class LayerStack {
     replace(layer: Layer, old: number): void;
     /** Moves a layer under all the others */
     toBottom(layer: Layer): void;
-    /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer
-     * that fails is reported and left out */
-    reattach(engine: Engine, waiting: (layer: Layer) => boolean): void;
-    /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */
+    /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */
+    reattach(engine: Engine): void;
+    /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */
     dispose(): void;
     /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */
     private unlist;
-    /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */
+    /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */
     private engineIndex;
 }

package/dist/map/layer-stack.js

@@ -1,6 +1,6 @@
 /**
- * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are
- * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.
+ * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a
+ * context loss; a layer whose creation failed stays in the order, not in the engine.
  */
 import { report } from "./checks.js";
 /** A map's layers in drawing order, bottom first, and those kept on top */
@@ -52,16 +52,13 @@ export class LayerStack {
         this.unlist(layer);
         this.layers.unshift(layer);
     }
-    /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer
-     * that fails is reported and left out */
-    reattach(engine, waiting) {
+    /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */
+    reattach(engine) {
         // No layer refers to an id of the old engine while the others are created
         this.layers.forEach((layer) => {
             layer.forgetEngine();
         });
         this.layers.forEach((layer) => {
-            if (waiting(layer))
-                return;
             try {
                 layer.attach(engine);
             }
@@ -81,7 +78,7 @@ export class LayerStack {
             }
         });
     }
-    /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */
+    /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */
     dispose() {
         this.layers.forEach((layer) => {
             layer.dispose();
@@ -93,7 +90,7 @@ export class LayerStack {
         if (index >= 0)
             this.layers.splice(index, 1);
     }
-    /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */
+    /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */
     engineIndex(index) {
         return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;
     }

package/dist/map/layer-stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"layer-stack.js","sourceRoot":"","sources":["../../src/map/layer-stack.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The drawing order of a map's layers, kept beside the engine's: the layers waiting for the engine with 3D Tiles are\n * in the order but not in the engine yet, and the order recreates the layers in a new engine after a context loss.\n */\n\nimport type { Layer } from '../layers/layers.ts';\nimport type { Engine } from '../wasm/isard.js';\nimport { report } from './checks.ts';\n\n/** A map's layers in drawing order, bottom first, and those kept on top */\nexport class LayerStack {\n  /** Layers in drawing order (bottom first), to recreate them after a context loss */\n  readonly layers: Layer[] = [];\n  /** Layers new layers go under */\n  readonly onTop = new Set<Layer>();\n  private readonly engine: () => Engine;\n\n  /** `engine`: the map's engine of the moment */\n  constructor(engine: () => Engine) {\n    this.engine = engine;\n  }\n\n  has(layer: Layer): boolean {\n    return this.layers.includes(layer);\n  }\n\n  /** Puts a new layer on top, under the layers kept on top (the basemap's labels) */\n  add(layer: Layer): void {\n    this.layers.push(layer);\n\n    const top = this.layers.find((l) => this.onTop.has(l) && l !== layer);\n\n    if (top) this.move(layer, top);\n  }\n\n  /** Forgets a removed layer */\n  forget(layer: Layer): void {\n    this.unlist(layer);\n    this.onTop.delete(layer);\n  }\n\n  /** Moves a layer under `before`, or on top of all */\n  move(layer: Layer, before: Layer | undefined): void {\n    this.unlist(layer);\n\n    const index = before ? this.layers.indexOf(before) : -1;\n    const at = index < 0 ? this.layers.length : index;\n\n    this.layers.splice(at, 0, layer);\n    if (layer.id >= 0) this.engine().moveLayer(layer.id, this.engineIndex(at));\n  }\n\n  /** A layer made again in the engine under a new id: `old` removed, the new one moved to the layer's place */\n  replace(layer: Layer, old: number): void {\n    const engine = this.engine();\n\n    engine.removeLayer(old);\n\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) engine.moveLayer(layer.id, this.engineIndex(index));\n  }\n\n  /** Moves a layer under all the others */\n  toBottom(layer: Layer): void {\n    this.engine().moveLayer(layer.id, 0);\n    this.unlist(layer);\n    this.layers.unshift(layer);\n  }\n\n  /** Creates the layers in a new engine, in order, but those still `waiting` (for the engine with 3D Tiles); a layer\n   * that fails is reported and left out */\n  reattach(engine: Engine, waiting: (layer: Layer) => boolean): void {\n    // No layer refers to an id of the old engine while the others are created\n    this.layers.forEach((layer) => {\n      layer.forgetEngine();\n    });\n    this.layers.forEach((layer) => {\n      if (waiting(layer)) return;\n      try {\n        layer.attach(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n    // Links between layers, once every layer has its new id (buildings colored by a network above them)\n    this.layers.forEach((layer) => {\n      if (layer.id < 0) return;\n      try {\n        layer.relink(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n  }\n\n  /** Frees what the layers hold beside the engine (custom layers' WebGL objects, models' data) */\n  dispose(): void {\n    this.layers.forEach((layer) => {\n      layer.dispose();\n    });\n  }\n\n  /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */\n  private unlist(layer: Layer): void {\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) this.layers.splice(index, 1);\n  }\n\n  /** Index in the engine of the layer at `index`: the layers waiting for the engine with 3D Tiles are not in it yet */\n  private engineIndex(index: number): number {\n    return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;\n  }\n}\n"]}
+{"version":3,"file":"layer-stack.js","sourceRoot":"","sources":["../../src/map/layer-stack.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The drawing order of a map's layers, kept beside the engine's: it recreates the layers in a new engine after a\n * context loss; a layer whose creation failed stays in the order, not in the engine.\n */\n\nimport type { Layer } from '../layers/layers.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\nimport { report } from './checks.ts';\n\n/** A map's layers in drawing order, bottom first, and those kept on top */\nexport class LayerStack {\n  /** Layers in drawing order (bottom first), to recreate them after a context loss */\n  readonly layers: Layer[] = [];\n  /** Layers new layers go under */\n  readonly onTop = new Set<Layer>();\n  private readonly engine: () => Engine;\n\n  /** `engine`: the map's engine of the moment */\n  constructor(engine: () => Engine) {\n    this.engine = engine;\n  }\n\n  has(layer: Layer): boolean {\n    return this.layers.includes(layer);\n  }\n\n  /** Puts a new layer on top, under the layers kept on top (the basemap's labels) */\n  add(layer: Layer): void {\n    this.layers.push(layer);\n\n    const top = this.layers.find((l) => this.onTop.has(l) && l !== layer);\n\n    if (top) this.move(layer, top);\n  }\n\n  /** Forgets a removed layer */\n  forget(layer: Layer): void {\n    this.unlist(layer);\n    this.onTop.delete(layer);\n  }\n\n  /** Moves a layer under `before`, or on top of all */\n  move(layer: Layer, before: Layer | undefined): void {\n    this.unlist(layer);\n\n    const index = before ? this.layers.indexOf(before) : -1;\n    const at = index < 0 ? this.layers.length : index;\n\n    this.layers.splice(at, 0, layer);\n    if (layer.id >= 0) this.engine().moveLayer(layer.id, this.engineIndex(at));\n  }\n\n  /** A layer made again in the engine under a new id: `old` removed, the new one moved to the layer's place */\n  replace(layer: Layer, old: number): void {\n    const engine = this.engine();\n\n    engine.removeLayer(old);\n\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) engine.moveLayer(layer.id, this.engineIndex(index));\n  }\n\n  /** Moves a layer under all the others */\n  toBottom(layer: Layer): void {\n    this.engine().moveLayer(layer.id, 0);\n    this.unlist(layer);\n    this.layers.unshift(layer);\n  }\n\n  /** Creates the layers in a new engine, in order; a layer that fails is reported and left out */\n  reattach(engine: Engine): void {\n    // No layer refers to an id of the old engine while the others are created\n    this.layers.forEach((layer) => {\n      layer.forgetEngine();\n    });\n    this.layers.forEach((layer) => {\n      try {\n        layer.attach(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n    // Links between layers, once every layer has its new id (buildings colored by a network above them)\n    this.layers.forEach((layer) => {\n      if (layer.id < 0) return;\n      try {\n        layer.relink(engine);\n      } catch (error) {\n        report(error);\n      }\n    });\n  }\n\n  /** Frees what the layers hold beside the engine (custom layers' GPU objects, models' data) */\n  dispose(): void {\n    this.layers.forEach((layer) => {\n      layer.dispose();\n    });\n  }\n\n  /** Takes a layer out of the drawing order (to put it back elsewhere, or for good) */\n  private unlist(layer: Layer): void {\n    const index = this.layers.indexOf(layer);\n\n    if (index >= 0) this.layers.splice(index, 1);\n  }\n\n  /** Index in the engine of the layer at `index`: the layers without an id (their creation failed) are not in it */\n  private engineIndex(index: number): number {\n    return this.layers.slice(0, index).filter((layer) => layer.id >= 0).length;\n  }\n}\n"]}

package/dist/map/symbol-atlases.d.ts

@@ -1,15 +1,16 @@
 /** The atlases of a map's symbol layers, the glyphs and the icons: created on first use, moved to each new engine. */
 import { Glyphs } from '../layers/glyphs.ts';
 import { Icons, type ImageOptions, type Pixels } from '../layers/icons.ts';
-import type { Engine } from '../wasm/isard.js';
+import type { Engine } from '../wasm/isard_webgpu.js';
 /** The glyphs and icons of a map */
 export declare class SymbolAtlases {
     #private;
-    private readonly canvas;
+    private readonly maxSize;
     private readonly glyphsUrl;
     private readonly engine;
-    /** `canvas`: the engine's; `glyphsUrl`: the map's option; `engine`: the map's engine of the moment */
-    constructor(canvas: HTMLCanvasElement, glyphsUrl: string | undefined, engine: () => Engine);
+    /** `maxSize`: the largest texture the engine takes (undefined if unknown); `glyphsUrl`: the map's option; `engine`:
+     * the map's engine of the moment */
+    constructor(maxSize: () => number | undefined, glyphsUrl: string | undefined, engine: () => Engine);
     /** The glyphs of the symbol layers, loaded on first use */
     get glyphs(): Glyphs;
     /** The icons of the symbol layers: the application's images and the vector basemaps' sprites */

package/dist/map/symbol-atlases.js

@@ -1,30 +1,25 @@
 /** The atlases of a map's symbol layers, the glyphs and the icons: created on first use, moved to each new engine. */
 import { Glyphs } from "../layers/glyphs.js";
 import { Icons, readPixels } from "../layers/icons.js";
-/** The largest texture the canvas's WebGL context takes, undefined if unknown: the atlases stay within it */
-const maxTextureSize = (canvas) => {
-    const gl = canvas.getContext('webgl2');
-    const max = gl?.getParameter(gl.MAX_TEXTURE_SIZE);
-    return typeof max === 'number' ? max : undefined;
-};
 /** The glyphs and icons of a map */
 export class SymbolAtlases {
-    canvas;
+    maxSize;
     glyphsUrl;
     engine;
     #glyphs;
     #icons;
-    /** `canvas`: the engine's; `glyphsUrl`: the map's option; `engine`: the map's engine of the moment */
-    constructor(canvas, glyphsUrl, engine) {
-        this.canvas = canvas;
+    /** `maxSize`: the largest texture the engine takes (undefined if unknown); `glyphsUrl`: the map's option; `engine`:
+     * the map's engine of the moment */
+    constructor(maxSize, glyphsUrl, engine) {
+        this.maxSize = maxSize;
         this.glyphsUrl = glyphsUrl;
         this.engine = engine;
     }
     /** The glyphs of the symbol layers, loaded on first use */
     get glyphs() {
         if (!this.#glyphs) {
-            // The engine's context: the atlas stays within its texture size limit
-            this.#glyphs = new Glyphs(this.glyphsUrl, maxTextureSize(this.canvas));
+            // The engine's device: the atlas stays within its texture size limit
+            this.#glyphs = new Glyphs(this.glyphsUrl, this.maxSize());
             this.#glyphs.attach(this.engine());
         }
         return this.#glyphs;
@@ -32,7 +27,7 @@ export class SymbolAtlases {
     /** The icons of the symbol layers: the application's images and the vector basemaps' sprites */
     get icons() {
         if (!this.#icons) {
-            this.#icons = new Icons(maxTextureSize(this.canvas));
+            this.#icons = new Icons(this.maxSize());
             this.#icons.attach(this.engine());
         }
         return this.#icons;

package/dist/map/symbol-atlases.js.map

@@ -1 +1 @@
-{"version":3,"file":"symbol-atlases.js","sourceRoot":"","sources":["../../src/map/symbol-atlases.ts"],"names":[],"mappings":"AAAA,sHAAsH;AAEtH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAkC,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGvF,6GAA6G;AAC7G,MAAM,cAAc,GAAG,CAAC,MAAyB,EAAsB,EAAE;IACvE,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC;IAElD,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC,CAAC;AAEF,oCAAoC;AACpC,MAAM,OAAO,aAAa;IACP,MAAM,CAAoB;IAC1B,SAAS,CAAqB;IAC9B,MAAM,CAAe;IACtC,OAAO,CAAqB;IAC5B,MAAM,CAAoB;IAE1B,sGAAsG;IACtG,YAAY,MAAyB,EAAE,SAA6B,EAAE,MAAoB;QACxF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,2DAA2D;IAC3D,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,sEAAsE;YACtE,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,gGAAgG;IAChG,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACrD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,0FAA0F;IAC1F,QAAQ,CACN,IAAY,EACZ,KAAuE,EACvE,OAAqB;QAErB,MAAM,MAAM,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,mHAAmH;IACnH,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CACF","sourcesContent":["/** The atlases of a map's symbol layers, the glyphs and the icons: created on first use, moved to each new engine. */\n\nimport { Glyphs } from '../layers/glyphs.ts';\nimport { Icons, type ImageOptions, type Pixels, readPixels } from '../layers/icons.ts';\nimport type { Engine } from '../wasm/isard.js';\n\n/** The largest texture the canvas's WebGL context takes, undefined if unknown: the atlases stay within it */\nconst maxTextureSize = (canvas: HTMLCanvasElement): number | undefined => {\n  const gl = canvas.getContext('webgl2');\n  const max = gl?.getParameter(gl.MAX_TEXTURE_SIZE);\n\n  return typeof max === 'number' ? max : undefined;\n};\n\n/** The glyphs and icons of a map */\nexport class SymbolAtlases {\n  private readonly canvas: HTMLCanvasElement;\n  private readonly glyphsUrl: string | undefined;\n  private readonly engine: () => Engine;\n  #glyphs: Glyphs | undefined;\n  #icons: Icons | undefined;\n\n  /** `canvas`: the engine's; `glyphsUrl`: the map's option; `engine`: the map's engine of the moment */\n  constructor(canvas: HTMLCanvasElement, glyphsUrl: string | undefined, engine: () => Engine) {\n    this.canvas = canvas;\n    this.glyphsUrl = glyphsUrl;\n    this.engine = engine;\n  }\n\n  /** The glyphs of the symbol layers, loaded on first use */\n  get glyphs(): Glyphs {\n    if (!this.#glyphs) {\n      // The engine's context: the atlas stays within its texture size limit\n      this.#glyphs = new Glyphs(this.glyphsUrl, maxTextureSize(this.canvas));\n      this.#glyphs.attach(this.engine());\n    }\n\n    return this.#glyphs;\n  }\n\n  /** The icons of the symbol layers: the application's images and the vector basemaps' sprites */\n  get icons(): Icons {\n    if (!this.#icons) {\n      this.#icons = new Icons(maxTextureSize(this.canvas));\n      this.#icons.attach(this.engine());\n    }\n\n    return this.#icons;\n  }\n\n  /** An image for the icons, from its pixels or from an image; one without pixels throws */\n  addImage(\n    name: string,\n    image: Pixels | (CanvasImageSource & { width: number; height: number }),\n    options: ImageOptions,\n  ): void {\n    const pixels = 'data' in image ? image : readPixels(image);\n\n    if (!pixels) throw new Error(`isard: the image ${name} has no pixels`);\n    this.icons.add(name, pixels, options);\n  }\n\n  hasImage(name: string): boolean {\n    return this.#icons?.has(name) ?? false;\n  }\n\n  removeImage(name: string): void {\n    this.#icons?.remove(name);\n  }\n\n  /** Uploads the atlases made so far to a new engine (after a context loss, or the one left once the map is gone) */\n  attach(engine: Engine): void {\n    this.#glyphs?.attach(engine);\n    this.#icons?.attach(engine);\n  }\n}\n"]}
+{"version":3,"file":"symbol-atlases.js","sourceRoot":"","sources":["../../src/map/symbol-atlases.ts"],"names":[],"mappings":"AAAA,sHAAsH;AAEtH,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAkC,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGvF,oCAAoC;AACpC,MAAM,OAAO,aAAa;IACP,OAAO,CAA2B;IAClC,SAAS,CAAqB;IAC9B,MAAM,CAAe;IACtC,OAAO,CAAqB;IAC5B,MAAM,CAAoB;IAE1B;wCACoC;IACpC,YAAY,OAAiC,EAAE,SAA6B,EAAE,MAAoB;QAChG,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,2DAA2D;IAC3D,IAAI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,qEAAqE;YACrE,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,gGAAgG;IAChG,IAAI,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACpC,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,0FAA0F;IAC1F,QAAQ,CACN,IAAY,EACZ,KAAuE,EACvE,OAAqB;QAErB,MAAM,MAAM,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,mHAAmH;IACnH,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CACF","sourcesContent":["/** The atlases of a map's symbol layers, the glyphs and the icons: created on first use, moved to each new engine. */\n\nimport { Glyphs } from '../layers/glyphs.ts';\nimport { Icons, type ImageOptions, type Pixels, readPixels } from '../layers/icons.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\n\n/** The glyphs and icons of a map */\nexport class SymbolAtlases {\n  private readonly maxSize: () => number | undefined;\n  private readonly glyphsUrl: string | undefined;\n  private readonly engine: () => Engine;\n  #glyphs: Glyphs | undefined;\n  #icons: Icons | undefined;\n\n  /** `maxSize`: the largest texture the engine takes (undefined if unknown); `glyphsUrl`: the map's option; `engine`:\n   * the map's engine of the moment */\n  constructor(maxSize: () => number | undefined, glyphsUrl: string | undefined, engine: () => Engine) {\n    this.maxSize = maxSize;\n    this.glyphsUrl = glyphsUrl;\n    this.engine = engine;\n  }\n\n  /** The glyphs of the symbol layers, loaded on first use */\n  get glyphs(): Glyphs {\n    if (!this.#glyphs) {\n      // The engine's device: the atlas stays within its texture size limit\n      this.#glyphs = new Glyphs(this.glyphsUrl, this.maxSize());\n      this.#glyphs.attach(this.engine());\n    }\n\n    return this.#glyphs;\n  }\n\n  /** The icons of the symbol layers: the application's images and the vector basemaps' sprites */\n  get icons(): Icons {\n    if (!this.#icons) {\n      this.#icons = new Icons(this.maxSize());\n      this.#icons.attach(this.engine());\n    }\n\n    return this.#icons;\n  }\n\n  /** An image for the icons, from its pixels or from an image; one without pixels throws */\n  addImage(\n    name: string,\n    image: Pixels | (CanvasImageSource & { width: number; height: number }),\n    options: ImageOptions,\n  ): void {\n    const pixels = 'data' in image ? image : readPixels(image);\n\n    if (!pixels) throw new Error(`isard: the image ${name} has no pixels`);\n    this.icons.add(name, pixels, options);\n  }\n\n  hasImage(name: string): boolean {\n    return this.#icons?.has(name) ?? false;\n  }\n\n  removeImage(name: string): void {\n    this.#icons?.remove(name);\n  }\n\n  /** Uploads the atlases made so far to a new engine (after a context loss, or the one left once the map is gone) */\n  attach(engine: Engine): void {\n    this.#glyphs?.attach(engine);\n    this.#icons?.attach(engine);\n  }\n}\n"]}

package/dist/map/viewshed.d.ts

@@ -1,5 +1,5 @@
 /** The viewshed's observers given to the engine, in the arrays it reads. */
 import type { ViewshedOptions } from '../types.ts';
-import type { Engine } from '../wasm/isard.js';
+import type { Engine } from '../wasm/isard_webgpu.js';
 /** Sets the viewshed of the engine, or clears it without observers; true if one is set (a frame to draw) */
 export declare const applyViewshed: (engine: Engine, options: ViewshedOptions | readonly ViewshedOptions[] | undefined) => boolean;

package/dist/map/viewshed.js.map

@@ -1 +1 @@
-{"version":3,"file":"viewshed.js","sourceRoot":"","sources":["../../src/map/viewshed.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAIrC,gEAAgE;AAChE,MAAM,WAAW,GAAG,CAAC,OAAiE,EAA8B,EAAE;IACpH,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,OAAO,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACrD,CAAC,CAAC;AAEF,4GAA4G;AAC5G,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAc,EACd,OAAiE,EACxD,EAAE;IACX,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAE1B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,CAAC,aAAa,EAAE,CAAC;QAEvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,CAAC,WAAW,CAChB,IAAI,YAAY,CACd,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACvB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,MAAM,IAAI,GAAG;QACf,CAAC,CAAC,KAAK,IAAI,IAAI;QACf,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS;YAC3B,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;KAClE,CAAC,CACH,EACD,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,EACtD,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC,EACrD,KAAK,CAAC,OAAO,IAAI,GAAG,EACpB,IAAI,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC9D,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","sourcesContent":["/** The viewshed's observers given to the engine, in the arrays it reads. */\n\nimport { rgb } from '../settings.ts';\nimport type { ViewshedOptions } from '../types.ts';\nimport type { Engine } from '../wasm/isard.js';\n\n/** The observers of a viewshed option: none, one, or several */\nconst observersOf = (options: ViewshedOptions | readonly ViewshedOptions[] | undefined): readonly ViewshedOptions[] => {\n  if (!options) return [];\n\n  return 'position' in options ? [options] : options;\n};\n\n/** Sets the viewshed of the engine, or clears it without observers; true if one is set (a frame to draw) */\nexport const applyViewshed = (\n  engine: Engine,\n  options: ViewshedOptions | readonly ViewshedOptions[] | undefined,\n): boolean => {\n  const observers = observersOf(options);\n  const [first] = observers;\n\n  if (!first) {\n    engine.clearViewshed();\n\n    return false;\n  }\n  engine.setViewshed(\n    new Float64Array(\n      observers.flatMap((o) => [\n        o.position[0],\n        o.position[1],\n        o.height ?? 1.7,\n        o.range ?? 1000,\n        ...(o.direction === undefined\n          ? [Number.NaN, 0, 0, 0]\n          : [o.direction, o.tilt ?? 0, o.fov ?? 60, o.verticalFov ?? 40]),\n      ]),\n    ),\n    new Float32Array(rgb(first.visibleColor ?? '#2f9e44')),\n    new Float32Array(rgb(first.hiddenColor ?? '#e03131')),\n    first.opacity ?? 0.7,\n    new Float32Array(first.coneColor ? rgb(first.coneColor) : []),\n  );\n\n  return true;\n};\n"]}
+{"version":3,"file":"viewshed.js","sourceRoot":"","sources":["../../src/map/viewshed.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAIrC,gEAAgE;AAChE,MAAM,WAAW,GAAG,CAAC,OAAiE,EAA8B,EAAE;IACpH,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAExB,OAAO,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACrD,CAAC,CAAC;AAEF,4GAA4G;AAC5G,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAc,EACd,OAAiE,EACxD,EAAE;IACX,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;IAE1B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,CAAC,aAAa,EAAE,CAAC;QAEvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,CAAC,WAAW,CAChB,IAAI,YAAY,CACd,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACvB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,MAAM,IAAI,GAAG;QACf,CAAC,CAAC,KAAK,IAAI,IAAI;QACf,GAAG,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS;YAC3B,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;KAClE,CAAC,CACH,EACD,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC,EACtD,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC,EACrD,KAAK,CAAC,OAAO,IAAI,GAAG,EACpB,IAAI,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAC9D,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","sourcesContent":["/** The viewshed's observers given to the engine, in the arrays it reads. */\n\nimport { rgb } from '../settings.ts';\nimport type { ViewshedOptions } from '../types.ts';\nimport type { Engine } from '../wasm/isard_webgpu.js';\n\n/** The observers of a viewshed option: none, one, or several */\nconst observersOf = (options: ViewshedOptions | readonly ViewshedOptions[] | undefined): readonly ViewshedOptions[] => {\n  if (!options) return [];\n\n  return 'position' in options ? [options] : options;\n};\n\n/** Sets the viewshed of the engine, or clears it without observers; true if one is set (a frame to draw) */\nexport const applyViewshed = (\n  engine: Engine,\n  options: ViewshedOptions | readonly ViewshedOptions[] | undefined,\n): boolean => {\n  const observers = observersOf(options);\n  const [first] = observers;\n\n  if (!first) {\n    engine.clearViewshed();\n\n    return false;\n  }\n  engine.setViewshed(\n    new Float64Array(\n      observers.flatMap((o) => [\n        o.position[0],\n        o.position[1],\n        o.height ?? 1.7,\n        o.range ?? 1000,\n        ...(o.direction === undefined\n          ? [Number.NaN, 0, 0, 0]\n          : [o.direction, o.tilt ?? 0, o.fov ?? 60, o.verticalFov ?? 40]),\n      ]),\n    ),\n    new Float32Array(rgb(first.visibleColor ?? '#2f9e44')),\n    new Float32Array(rgb(first.hiddenColor ?? '#e03131')),\n    first.opacity ?? 0.7,\n    new Float32Array(first.coneColor ? rgb(first.coneColor) : []),\n  );\n\n  return true;\n};\n"]}

package/dist/map.d.ts

@@ -26,15 +26,16 @@ import { Tiles3dLayer } from './layers/tiles3d.ts';
 import { type TreeOptions } from './layers/trees.ts';
 import { type HoverPicking } from './map/hover-pick.ts';
 import { type LayerSpec } from './map/layer-spec.ts';
-import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, NetworkOptions, PickOptions, Point, Projection, Quality, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
+import type { AnimationOptions, AtmosphereOptions, Basemap, FeatureHit, FirstPersonView, FlyToOptions, GeoMapOptions, LoadingMode, LonLat, MapEvents, MapGpuTimings, MapMemory, NetworkOptions, PickOptions, Point, Projection, Quality, RasterOptions, SunOptions, SwipeOptions, TerrainModel, TerrainOptions, Tiles3dOptions, ViewshedOptions } from './types.ts';
 import { type Control, type ControlPosition } from './ui/controls.ts';
-import type { Camera, PickHit, RasterLayerStats } from './wasm/isard.js';
+import type { Camera, PickHit, RasterLayerStats } from './wasm/isard_webgpu.js';
 export type { LayerSpec } from './map/layer-spec.ts';
-/** A map (see `GeoMap.create`); layers take it as their host */
 export declare class GeoMap {
     #private;
     readonly canvas: HTMLCanvasElement;
-    /** The engine class (core, or with 3D Tiles) and the engine with 3D Tiles loaded when needed */
+    /** The frames' parts timed on the GPU (`setGpuTiming`), again on a new engine */
+    private gpuTiming;
+    /** The engine, made asynchronously, and the workers decoding its 3D Tiles */
     private readonly engines;
     /** The layers in drawing order and those kept on top */
     private readonly stack;
@@ -48,7 +49,7 @@ export declare class GeoMap {
     /** The canvas in the container, the markers and popups over it, the controls in its corners */
     private readonly overlays;
     private readonly settings;
-    /** The WebGL context is lost: nothing is drawn until it is restored */
+    /** The GPU is lost (the WebGL context, the WebGPU device): nothing is drawn until a new engine is there */
     private lost;
     private gone;
     private readonly listeners;
@@ -84,13 +85,15 @@ export declare class GeoMap {
     private get layers();
     /** Layers new layers go under */
     private get onTop();
-    private createEngine;
-    /** A 3D Tiles layer or a model on the core engine: loads the engine with 3D Tiles, then rebuilds the map on it
-     * (camera, settings and layers kept, as after a context loss); the layer is created then */
-    private upgrade;
-    /** Downloads and compiles the engine with 3D Tiles once the map is idle (`tiles3d: 'preload'`), without running
-     * it: the first 3D Tiles layer then only instantiates it */
-    private preloadTiles3d;
+    /** The GPU is lost: nothing drawn, the engine dropped (`dropLostEngine`) */
+    private gpuLost;
+    /**
+     * Follows the loss of `engine`'s WebGPU device (a phone taking its memory back, a driver reset, the GPU process
+     * gone): while it is the map's, the map drops it and makes a new one at once, WebGPU having no event for the GPU
+     * given back. The device of an engine the map freed itself (replaced, the map destroyed) is lost too: not the map's
+     * any more, left be
+     */
+    private watchDevice;
     /**
      * The context is lost: its engine freed at once, the map's calls going to one that does nothing until `restore`
      * builds the next. The old engine's GPU objects went with the context: deleted now, it is silent (on the context
@@ -98,8 +101,12 @@ export declare class GeoMap {
      * would fail on the lost context, whose limits read 0
      */
     private dropLostEngine;
-    /** After a context loss: a new engine with the same camera, settings and layers (same handles, same order) */
+    /** After the GPU lost: a new engine with the same camera, settings and layers (same handles, same order); the engine
+     * made asynchronously, adopted once there */
     private restore;
+    /** A new engine in place of the map's (a placeholder, or a lost one): the same camera, settings and layers (same
+     * handles, same order) */
+    private adopt;
     /** The street-level eye, if the camera is one */
     get firstPerson(): Readonly<Required<FirstPersonView>> | undefined;
     /**
@@ -180,20 +187,30 @@ export declare class GeoMap {
     setTerrain(terrain: boolean | TerrainModel | TerrainOptions): void;
     /** Color behind the map, a CSS color (its alpha ignored) */
     setBackground(color: string): void;
+    /** The GPU memory its layers hold (bytes): the tiles of the 3D Tiles and point clouds, kept within the budget
+     * (`GeoMapOptions.memory`), the rasters' pools */
+    memory(): MapMemory;
     /** Tile counters of the raster layers, for diagnostics */
     stats(): RasterLayerStats[];
+    /** Times the parts of each frame on the GPU, for profiling (`gpuTimings`): timer queries, read a few frames later.
+     * An engine built to profile only (`PROFILE=1 bun run build`); false without one, or if the browser cannot
+     * (`EXT_disjoint_timer_query_webgl2`) */
+    setGpuTiming(on: boolean): boolean;
+    /** The GPU time of the last frame measured (`setGpuTiming`), in all and by part: the backdrop, the ground (the raster
+     * layers over the relief), each layer, the shadows, the panorama, the viewshed (ms) */
+    gpuTimings(): MapGpuTimings | undefined;
     /**
-     * The feature under a screen point (CSS pixels), undefined if none: its layer id and index. Reads one pixel of an
-     * offscreen picking pass, whatever the number of features, but waits for the GPU to finish the frame (a stall): for
-     * clicks and one-off queries. On hover, listen to 'hoverfeature' instead, which picks without waiting.
+     * The feature under a screen point (CSS pixels), undefined if none: its layer id and index. Reads the pixels around
+     * the point of an offscreen picking pass, whatever the number of features, once the GPU is done (a frame or two
+     * later: the GPU is not waited for). On hover, listen to 'hoverfeature' instead.
      */
-    pick(point: Point, { radius, layers }?: PickOptions): PickHit | undefined;
+    pick(point: Point, { radius, layers }?: PickOptions): Promise<PickHit | undefined>;
     /**
      * The feature under a screen point (CSS pixels), or the nearest one within `radius` pixels: its layer handle, its
      * index there and, for line, circle and fill layers, the feature itself; undefined if none. `layers` restricts the
      * search to some layers (the others hide nothing).
      */
-    pickFeature(point: Point, options?: PickOptions): FeatureHit | undefined;
+    pickFeature(point: Point, options?: PickOptions): Promise<FeatureHit | undefined>;
     /** A hit with its layer handle and feature; undefined if the layer is gone */
     private featureHit;
     /** Screen point (CSS pixels) of a position on the ground (the relief), or `height` metres above it, undefined
@@ -220,15 +237,16 @@ export declare class GeoMap {
      * where it starts, a roof or a mesh as the relief (on by default), or around the screen center */
     setRotateAroundPointer(enabled: boolean): void;
     /** What is drawn under a screen point (CSS pixels), on the relief or standing on it (a roof, a wall, a mesh): its
-     * position and its height above the relief, in metres; undefined where nothing was drawn. The last frame's scene is
-     * drawn again and read back, waiting for the GPU (a stall): for clicks and drags */
+     * position and its height above the relief, in metres; undefined where nothing was drawn. Read from the last copy of
+     * the scene's depth (a frame or two old, a pixel every 4 CSS pixels): at once, without waiting for the GPU */
     pickSurface(point: Point): {
         lonLat: LonLat;
         height: number;
     } | undefined;
     /** The height above the relief, in metres, of the top of what stands at a position: a roof, a mesh, 0 on the bare
-     * ground; undefined where nothing of the last frame is there. The scene is drawn from above into a single pixel and
-     * read back: cheap, but it waits for the GPU */
+     * ground; undefined where nothing of the last frame is there, or until measured: the scene is drawn looking down at
+     * it after a frame and read back a frame or two later, the answer kept and measured again every 250 ms at most (ask
+     * again on the next `render` event) */
     surfaceAt(lonLat: LonLat): number | undefined;
     /** Adds a control in a corner of the map; controls stack from the corner inward */
     addControl(control: Control, position?: ControlPosition): this;
@@ -290,7 +308,7 @@ export declare class GeoMap {
     addTiles3d(options: Tiles3dOptions): Tiles3dLayer;
     /**
      * A point cloud (see `PointCloudOptions`): a COPC file read by range requests (IGN's LiDAR HD…), or 3D Tiles
-     * points; with depth, on the engine with 3D Tiles; under `before` if given
+     * points; with depth; under `before` if given
      */
     addPointCloud(options: PointCloudOptions): PointCloudLayer;
     /**
@@ -305,7 +323,7 @@ export declare class GeoMap {
     /** Particles carried by a field of velocities (a wind, a current), their trails animated and colored by speed on
      * the globe and the relief (see `FlowOptions`) */
     addFlow(options: FlowOptions): FlowLayer;
-    /** A glTF model drawn at positions (see `ModelOptions`), with depth; on the engine with 3D Tiles, as they are */
+    /** A glTF model drawn at positions (see `ModelOptions`), with depth */
     addModels(options: ModelOptions): ModelLayer;
     /** Trees at the points of a source that has them (a city's street trees), broadleaved or conifers by their data,
      * scaled to their height (see `TreeOptions`); the conifers on a layer that goes with the one returned */
@@ -314,8 +332,9 @@ export declare class GeoMap {
      * view, a 360° one on a band round its camera; resolves once its image is read */
     addPhoto(options: PhotoOptions): Promise<ModelLayer>;
     /**
-     * The page's own WebGL drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
-     * WebGL, three.js… with the matrices of the frame (`frame.matrixAt`); under `before` if given
+     * The page's own WebGPU drawing at its place among the layers, in every frame (see `CustomLayerInterface`): raw
+     * WebGPU, three.js's WebGPU renderer… with the map's device and the matrices of the frame (`frame.matrixAt`); under
+     * `before` if given. Not drawn on the WebGL2 fallback
      */
     addCustomLayer(layer: CustomLayerInterface, options?: {
         before?: Layer;