isard 0.3.0 → 0.4.0

package/dist/wasm/isard_core.d.ts

@@ -68,6 +68,12 @@ export class Engine {
      * Circle layer of `feature_count` features: points (Mercator [0, 1], interleaved) and the feature of each
      */
     addCircles(points: Float64Array, feature: Uint32Array, feature_count: number): number;
+    /**
+     * A layer drawn by the page: `render()` is called at its place in every frame (`customMatrix` gives the
+     * matrices of that frame meanwhile); `depth`: with the depth buffer of the 3D layers (`3d` mode), else over
+     * what is drawn before it
+     */
+    addCustomLayer(render: () => void, depth: boolean): number;
     /**
      * An empty extrusion layer: its blocks come in batches (`setExtrusionBatch`)
      */
@@ -114,6 +120,12 @@ export class Engine {
     bounds(): Float64Array;
     camera(): Camera;
     clearPreload(): void;
+    /**
+     * Model-view-projection matrix (16 numbers, column-major, for `uniformMatrix4fv`) of the local frame at a
+     * longitude, latitude (degrees) and altitude (metres): x east, y north, z up, in metres. Undefined outside the
+     * callback of a custom layer. Static: the engine is borrowed while it draws
+     */
+    static customMatrix(lon: number, lat: number, altitude: number): Float32Array | undefined;
     /**
      * Position under a screen point (CSS pixels), undefined above the horizon; on the relief itself
      */
@@ -273,6 +285,11 @@ export class Engine {
      */
     setGroundUniform(id: number, name: string, values: Float64Array): void;
     setGroundVisible(id: number, visible: boolean): void;
+    /**
+     * The icon atlas shared by the symbol layers: `width` × `height` RGBA texels, premultiplied, allocated again
+     * and empty (`updateIconAtlas` fills it)
+     */
+    setIconAtlas(width: number, height: number): void;
     /**
      * How tiles load and show: `true`, immediately (everything visible loads, no fade, the default); `false`,
      * smoothly (levels skipped during flights, off-center tiles waiting while the camera moves, fade-in)
@@ -323,9 +340,9 @@ export class Engine {
      */
     setSymbolLayer(id: number, size: Float32Array, opacity: Float32Array, min_zoom: number, max_zoom: number, visible: boolean): void;
     /**
-     * Labels of a symbol layer, shaped by the page: anchors (Mercator, interleaved), boxes (min x, min y, max x, max y,
-     * CSS pixels from the anchor), styles (20 floats each, see `LABEL_FLOATS`) and glyph quads (10 floats each: label, x, y, width, height from the anchor, atlas u0, v0, u1, v1 in
-     * texels, font scale)
+     * Labels of a symbol layer, shaped by the page: anchors (Mercator, interleaved), their texts' boxes (min x, min y,
+     * max x, max y, CSS pixels from the anchor), styles (36 floats each, see `LABEL_FLOATS`) and glyph and icon quads
+     * (11 floats each, see `QUAD_FLOATS`)
      */
     setSymbols(id: number, anchors: Float64Array, boxes: Float32Array, styles: Float32Array, quads: Float32Array): void;
     /**
@@ -356,6 +373,10 @@ export class Engine {
      * Replaces a region of a ground layer's texture (one layer of a 2D array)
      */
     updateGroundTexture(id: number, name: string, x: number, y: number, layer: number, width: number, height: number, data: Uint8Array): void;
+    /**
+     * A region of the icon atlas: `width` × `height` RGBA texels (premultiplied) at (`x`, `y`)
+     */
+    updateIconAtlas(x: number, y: number, width: number, height: number, data: Uint8Array): void;
     zoomAt(delta: number, x: number, y: number): void;
 }
 
@@ -365,6 +386,7 @@ export interface InitOutput {
     readonly memory: WebAssembly.Memory;
     readonly __wbg_engine_free: (a: number, b: number) => void;
     readonly engine_addCircles: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number, number];
+    readonly engine_addCustomLayer: (a: number, b: any, c: number) => number;
     readonly engine_addExtrusions: (a: number) => [number, number, number];
     readonly engine_addFills: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number) => [number, number, number];
     readonly engine_addGround: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number) => [number, number, number];
@@ -375,6 +397,7 @@ export interface InitOutput {
     readonly engine_bounds: (a: number) => [number, number];
     readonly engine_camera: (a: number) => any;
     readonly engine_clearPreload: (a: number) => void;
+    readonly engine_customMatrix: (a: number, b: number, c: number) => [number, number];
     readonly engine_ground: (a: number, b: number, c: number) => any;
     readonly engine_linkExtrusionNetwork: (a: number, b: number, c: number, d: number) => void;
     readonly engine_moveLayer: (a: number, b: number, c: number) => void;
@@ -413,6 +436,7 @@ export interface InitOutput {
     readonly engine_setGroundTexture: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number) => [number, number];
     readonly engine_setGroundUniform: (a: number, b: number, c: number, d: number, e: number, f: number) => [number, number];
     readonly engine_setGroundVisible: (a: number, b: number, c: number) => void;
+    readonly engine_setIconAtlas: (a: number, b: number, c: number) => [number, number];
     readonly engine_setImmediateLoading: (a: number, b: number) => void;
     readonly engine_setLineDash: (a: number, b: number, c: number, d: number) => void;
     readonly engine_setLines: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => [number, number];
@@ -432,6 +456,7 @@ export interface InitOutput {
     readonly engine_updateGlyphAtlas: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
     readonly engine_updateGlyphPage: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number) => void;
     readonly engine_updateGroundTexture: (a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number) => [number, number];
+    readonly engine_updateIconAtlas: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => void;
     readonly engine_zoomAt: (a: number, b: number, c: number, d: number) => void;
     readonly wasm_bindgen_2e566c63402fe7fa___convert__closures_____invoke___js_sys_b1e1c29ba6b0e6b3___Function_fn_wasm_bindgen_2e566c63402fe7fa___JsValue_____wasm_bindgen_2e566c63402fe7fa___sys__Undefined___js_sys_b1e1c29ba6b0e6b3___Function_fn_wasm_bindgen_2e566c63402fe7fa___JsValue_____wasm_bindgen_2e566c63402fe7fa___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
     readonly wasm_bindgen_2e566c63402fe7fa___convert__closures_____invoke___wasm_bindgen_2e566c63402fe7fa___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_2e566c63402fe7fa___JsError___true_: (a: number, b: number, c: any) => [number, number];

package/dist/wasm/isard_core.js

@@ -29,6 +29,18 @@ export class Engine {
         }
         return ret[0] >>> 0;
     }
+    /**
+     * A layer drawn by the page: `render()` is called at its place in every frame (`customMatrix` gives the
+     * matrices of that frame meanwhile); `depth`: with the depth buffer of the 3D layers (`3d` mode), else over
+     * what is drawn before it
+     * @param {() => void} render
+     * @param {boolean} depth
+     * @returns {number}
+     */
+    addCustomLayer(render, depth) {
+        const ret = wasm.engine_addCustomLayer(this.__wbg_ptr, render, depth);
+        return ret >>> 0;
+    }
     /**
      * An empty extrusion layer: its blocks come in batches (`setExtrusionBatch`)
      * @returns {number}
@@ -197,6 +209,24 @@ export class Engine {
     clearPreload() {
         wasm.engine_clearPreload(this.__wbg_ptr);
     }
+    /**
+     * Model-view-projection matrix (16 numbers, column-major, for `uniformMatrix4fv`) of the local frame at a
+     * longitude, latitude (degrees) and altitude (metres): x east, y north, z up, in metres. Undefined outside the
+     * callback of a custom layer. Static: the engine is borrowed while it draws
+     * @param {number} lon
+     * @param {number} lat
+     * @param {number} altitude
+     * @returns {Float32Array | undefined}
+     */
+    static customMatrix(lon, lat, altitude) {
+        const ret = wasm.engine_customMatrix(lon, lat, altitude);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getArrayF32FromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        }
+        return v1;
+    }
     /**
      * Position under a screen point (CSS pixels), undefined above the horizon; on the relief itself
      * @param {number} x
@@ -651,6 +681,18 @@ export class Engine {
     setGroundVisible(id, visible) {
         wasm.engine_setGroundVisible(this.__wbg_ptr, id, visible);
     }
+    /**
+     * The icon atlas shared by the symbol layers: `width` × `height` RGBA texels, premultiplied, allocated again
+     * and empty (`updateIconAtlas` fills it)
+     * @param {number} width
+     * @param {number} height
+     */
+    setIconAtlas(width, height) {
+        const ret = wasm.engine_setIconAtlas(this.__wbg_ptr, width, height);
+        if (ret[1]) {
+            throw takeFromExternrefTable0(ret[0]);
+        }
+    }
     /**
      * How tiles load and show: `true`, immediately (everything visible loads, no fade, the default); `false`,
      * smoothly (levels skipped during flights, off-center tiles waiting while the camera moves, fade-in)
@@ -779,9 +821,9 @@ export class Engine {
         wasm.engine_setSymbolLayer(this.__wbg_ptr, id, ptr0, len0, ptr1, len1, min_zoom, max_zoom, visible);
     }
     /**
-     * Labels of a symbol layer, shaped by the page: anchors (Mercator, interleaved), boxes (min x, min y, max x, max y,
-     * CSS pixels from the anchor), styles (20 floats each, see `LABEL_FLOATS`) and glyph quads (10 floats each: label, x, y, width, height from the anchor, atlas u0, v0, u1, v1 in
-     * texels, font scale)
+     * Labels of a symbol layer, shaped by the page: anchors (Mercator, interleaved), their texts' boxes (min x, min y,
+     * max x, max y, CSS pixels from the anchor), styles (36 floats each, see `LABEL_FLOATS`) and glyph and icon quads
+     * (11 floats each, see `QUAD_FLOATS`)
      * @param {number} id
      * @param {Float64Array} anchors
      * @param {Float32Array} boxes
@@ -888,6 +930,19 @@ export class Engine {
             throw takeFromExternrefTable0(ret[0]);
         }
     }
+    /**
+     * A region of the icon atlas: `width` × `height` RGBA texels (premultiplied) at (`x`, `y`)
+     * @param {number} x
+     * @param {number} y
+     * @param {number} width
+     * @param {number} height
+     * @param {Uint8Array} data
+     */
+    updateIconAtlas(x, y, width, height, data) {
+        const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        wasm.engine_updateIconAtlas(this.__wbg_ptr, x, y, width, height, ptr0, len0);
+    }
     /**
      * @param {number} delta
      * @param {number} x
@@ -998,6 +1053,12 @@ function __wbg_get_imports() {
         __wbg_bindVertexArray_f58af0a346185ec5: function(arg0, arg1) {
             arg0.bindVertexArray(arg1);
         },
+        __wbg_blendEquation_5fb8aee6a55cf900: function(arg0, arg1) {
+            arg0.blendEquation(arg1 >>> 0);
+        },
+        __wbg_blendEquation_d21914e937b14896: function(arg0, arg1) {
+            arg0.blendEquation(arg1 >>> 0);
+        },
         __wbg_blendFuncSeparate_28abe082febb1a26: function(arg0, arg1, arg2, arg3, arg4) {
             arg0.blendFuncSeparate(arg1 >>> 0, arg2 >>> 0, arg3 >>> 0, arg4 >>> 0);
         },
@@ -1135,6 +1196,12 @@ function __wbg_get_imports() {
             const ret = arg0.createVertexArray();
             return isLikeNone(ret) ? 0 : addToExternrefTable0(ret);
         },
+        __wbg_cullFace_12123c1c97f1ba2c: function(arg0, arg1) {
+            arg0.cullFace(arg1 >>> 0);
+        },
+        __wbg_cullFace_1a01f0b6d5aeb687: function(arg0, arg1) {
+            arg0.cullFace(arg1 >>> 0);
+        },
         __wbg_deleteBuffer_070e58aaaf2a7a8b: function(arg0, arg1) {
             arg0.deleteBuffer(arg1);
         },
@@ -1192,6 +1259,12 @@ function __wbg_get_imports() {
         __wbg_depthMask_0d7c3dec3b8405ee: function(arg0, arg1) {
             arg0.depthMask(arg1 !== 0);
         },
+        __wbg_depthRange_24c7969249461e8e: function(arg0, arg1, arg2) {
+            arg0.depthRange(arg1, arg2);
+        },
+        __wbg_depthRange_6a4e169ccf314148: function(arg0, arg1, arg2) {
+            arg0.depthRange(arg1, arg2);
+        },
         __wbg_detachShader_1ed15fc2d289cf15: function(arg0, arg1, arg2) {
             arg0.detachShader(arg1, arg2);
         },
@@ -1862,7 +1935,7 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_generic_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 78, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 87, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
             const ret = makeMutClosure(arg0, arg1, wasm_bindgen_2e566c63402fe7fa___convert__closures_____invoke___wasm_bindgen_2e566c63402fe7fa___JsValue__core_37ee0ce0c4cd57d5___result__Result_____wasm_bindgen_2e566c63402fe7fa___JsError___true_);
             return ret;
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isard",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A WebGL2 map engine for large, interactive data layers, labels and 3D Tiles over raster or vector basemaps (Rust core in WebAssembly)",
   "license": "MIT",
   "author": "Kevin Graff",