isard 1.14.0 → 1.16.0

package/dist/wasm/isard_core.js

@@ -215,7 +215,7 @@ export class Engine {
     /**
      * Raster tiles in Web Mercator; `url` holds {z}, {x} and {y}. `size`: side of the tiles' textures (256 by
      * default); `loader`: draws each tile instead of fetching `url`, `(z, x, y, signal) => Promise<ImageBitmap |
-     * null>`, an image of `size` × `size` (null: nothing there)
+     * null>`, an image of `size` × `size` (null: nothing there); `ground: false`: draped on 3D layers only
      *
      * # Errors
      *
@@ -227,12 +227,13 @@ export class Engine {
      * @param {number} saturation
      * @param {number | null | undefined} size
      * @param {((z: number, x: number, y: number, signal: AbortSignal) => Promise<ImageBitmap | null>) | undefined} loader
+     * @param {boolean | null} [ground]
      * @returns {number}
      */
-    addRaster(url, min_z, max_z, opacity, saturation, size, loader) {
+    addRaster(url, min_z, max_z, opacity, saturation, size, loader, ground) {
         const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.engine_addRaster(this.__wbg_ptr, ptr0, len0, min_z, max_z, opacity, saturation, isLikeNone(size) ? Number.MAX_SAFE_INTEGER : (size) >> 0, isLikeNone(loader) ? 0 : addToExternrefTable0(loader));
+        const ret = wasm.engine_addRaster(this.__wbg_ptr, ptr0, len0, min_z, max_z, opacity, saturation, isLikeNone(size) ? Number.MAX_SAFE_INTEGER : (size) >> 0, isLikeNone(loader) ? 0 : addToExternrefTable0(loader), isLikeNone(ground) ? 0xFFFFFF : ground ? 1 : 0);
         if (ret[2]) {
             throw takeFromExternrefTable0(ret[1]);
         }
@@ -403,7 +404,7 @@ export class Engine {
         return ret;
     }
     /**
-     * `redraw` is called when the engine needs a new frame (a tile arrived)
+     * `redraw` is called when the engine needs a new frame (a tile arrived); `antialias`: multisampled (default true)
      *
      * # Errors
      *
@@ -411,9 +412,10 @@ export class Engine {
      * object of the globe, the sky or the raster pass cannot be created or one of their shaders fails to compile
      * @param {HTMLCanvasElement} canvas
      * @param {() => void} redraw
+     * @param {boolean | null} [antialias]
      */
-    constructor(canvas, redraw) {
-        const ret = wasm.engine_new(canvas, redraw);
+    constructor(canvas, redraw, antialias) {
+        const ret = wasm.engine_new(canvas, redraw, isLikeNone(antialias) ? 0xFFFFFF : antialias ? 1 : 0);
         if (ret[2]) {
             throw takeFromExternrefTable0(ret[1]);
         }
@@ -1310,7 +1312,7 @@ export class Engine {
      * end of each), its line pieces (`pieces::Piece` as bytes), the line table (feature and length of each line),
      * per sublayer its pieces (`line_ranges`: first, end), the blocks of its extrusion sublayers (`shapes::Block` as
      * bytes), their triangles, per sublayer its blocks' triangles (`block_ranges`: first, end), the extent of its
-     * points (`bounds`: min x, min y, max x, max y), `feature_count` features
+     * points (`bounds`: min x, min y, max x, max y), its features' sublayers (one each, as for `setVectorTile`)
      *
      * # Errors
      *
@@ -1334,9 +1336,9 @@ export class Engine {
      * @param {Uint32Array} block_indices
      * @param {Uint32Array} block_ranges
      * @param {Float64Array} bounds
-     * @param {number} feature_count
+     * @param {Uint16Array} feature_sublayer
      */
-    setVectorTileMesh(id, key, points, ring_start, polygon_start, polygon_feature, fill_start, vertices, indices, fill_ranges, prism, pieces, line_table, line_ranges, blocks, block_indices, block_ranges, bounds, feature_count) {
+    setVectorTileMesh(id, key, points, ring_start, polygon_start, polygon_feature, fill_start, vertices, indices, fill_ranges, prism, pieces, line_table, line_ranges, blocks, block_indices, block_ranges, bounds, feature_sublayer) {
         const ptr0 = passArrayF64ToWasm0(points, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passArray32ToWasm0(ring_start, wasm.__wbindgen_malloc);
@@ -1367,7 +1369,9 @@ export class Engine {
         const len13 = WASM_VECTOR_LEN;
         const ptr14 = passArrayF64ToWasm0(bounds, wasm.__wbindgen_malloc);
         const len14 = WASM_VECTOR_LEN;
-        const ret = wasm.engine_setVectorTileMesh(this.__wbg_ptr, id, key, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, prism, ptr8, len8, ptr9, len9, ptr10, len10, ptr11, len11, ptr12, len12, ptr13, len13, ptr14, len14, feature_count);
+        const ptr15 = passArray16ToWasm0(feature_sublayer, wasm.__wbindgen_malloc);
+        const len15 = WASM_VECTOR_LEN;
+        const ret = wasm.engine_setVectorTileMesh(this.__wbg_ptr, id, key, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, prism, ptr8, len8, ptr9, len9, ptr10, len10, ptr11, len11, ptr12, len12, ptr13, len13, ptr14, len14, ptr15, len15);
         if (ret[1]) {
             throw takeFromExternrefTable0(ret[0]);
         }
@@ -1394,7 +1398,8 @@ export class Engine {
     /**
      * Adds or replaces tile `key` of a vector tile layer: its polygons as for `addFills` (`fill_start`: the first
      * polygon of each sublayer, and the end; those of an extrusion sublayer raised into blocks), its lines as for
-     * `addLines` (`line_start`: the first line of each sublayer, and the end), `feature_count` features, styled as an
+     * `addLines` (`line_start`: the first line of each sublayer, and the end), its features' sublayers (one each, the
+     * features of a sublayer after those of the one before), styled as an
      * extrusion layer's (`setFeatureStyle` with the key: a color, then a line's width or a block's height and base);
      * `tile`: the corners of the tile they are cut to (west, north, east, south; empty: none), along whose edges no
      * wall of a block rises; `roofs` and `roof_heights`: per polygon, the shape and height of its block's roof
@@ -1418,7 +1423,7 @@ export class Engine {
      * @param {Uint32Array} line_first
      * @param {Uint32Array} line_feature
      * @param {Uint32Array} line_start
-     * @param {number} feature_count
+     * @param {Uint16Array} feature_sublayer
      * @param {Float64Array} tile
      * @param {Uint8Array} roofs
      * @param {Float32Array} roof_heights
@@ -1426,7 +1431,7 @@ export class Engine {
      * @param {Uint32Array} roof_outline_start
      * @param {number} roof_metres
      */
-    setVectorTile(id, key, points, ring_start, polygon_start, polygon_feature, fill_start, line_points, line_first, line_feature, line_start, feature_count, tile, roofs, roof_heights, roof_outlines, roof_outline_start, roof_metres) {
+    setVectorTile(id, key, points, ring_start, polygon_start, polygon_feature, fill_start, line_points, line_first, line_feature, line_start, feature_sublayer, tile, roofs, roof_heights, roof_outlines, roof_outline_start, roof_metres) {
         const ptr0 = passArrayF64ToWasm0(points, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         const ptr1 = passArray32ToWasm0(ring_start, wasm.__wbindgen_malloc);
@@ -1445,17 +1450,19 @@ export class Engine {
         const len7 = WASM_VECTOR_LEN;
         const ptr8 = passArray32ToWasm0(line_start, wasm.__wbindgen_malloc);
         const len8 = WASM_VECTOR_LEN;
-        const ptr9 = passArrayF64ToWasm0(tile, wasm.__wbindgen_malloc);
+        const ptr9 = passArray16ToWasm0(feature_sublayer, wasm.__wbindgen_malloc);
         const len9 = WASM_VECTOR_LEN;
-        const ptr10 = passArray8ToWasm0(roofs, wasm.__wbindgen_malloc);
+        const ptr10 = passArrayF64ToWasm0(tile, wasm.__wbindgen_malloc);
         const len10 = WASM_VECTOR_LEN;
-        const ptr11 = passArrayF32ToWasm0(roof_heights, wasm.__wbindgen_malloc);
+        const ptr11 = passArray8ToWasm0(roofs, wasm.__wbindgen_malloc);
         const len11 = WASM_VECTOR_LEN;
-        const ptr12 = passArrayF64ToWasm0(roof_outlines, wasm.__wbindgen_malloc);
+        const ptr12 = passArrayF32ToWasm0(roof_heights, wasm.__wbindgen_malloc);
         const len12 = WASM_VECTOR_LEN;
-        const ptr13 = passArray32ToWasm0(roof_outline_start, wasm.__wbindgen_malloc);
+        const ptr13 = passArrayF64ToWasm0(roof_outlines, wasm.__wbindgen_malloc);
         const len13 = WASM_VECTOR_LEN;
-        const ret = wasm.engine_setVectorTile(this.__wbg_ptr, id, key, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, feature_count, ptr9, len9, ptr10, len10, ptr11, len11, ptr12, len12, ptr13, len13, roof_metres);
+        const ptr14 = passArray32ToWasm0(roof_outline_start, wasm.__wbindgen_malloc);
+        const len14 = WASM_VECTOR_LEN;
+        const ret = wasm.engine_setVectorTile(this.__wbg_ptr, id, key, ptr0, len0, ptr1, len1, ptr2, len2, ptr3, len3, ptr4, len4, ptr5, len5, ptr6, len6, ptr7, len7, ptr8, len8, ptr9, len9, ptr10, len10, ptr11, len11, ptr12, len12, ptr13, len13, ptr14, len14, roof_metres);
         if (ret[1]) {
             throw takeFromExternrefTable0(ret[0]);
         }
@@ -2231,6 +2238,14 @@ function __wbg_get_imports() {
             const ret = arg0.isContextLost();
             return ret;
         },
+        __wbg_isEnabled_a3522bc4076e6296: function(arg0, arg1) {
+            const ret = arg0.isEnabled(arg1 >>> 0);
+            return ret;
+        },
+        __wbg_isEnabled_acb9d89bd88c16bd: function(arg0, arg1) {
+            const ret = arg0.isEnabled(arg1 >>> 0);
+            return ret;
+        },
         __wbg_is_4b278c0bd3caba97: function(arg0, arg1) {
             const ret = Object.is(arg0, arg1);
             return ret;
@@ -2672,7 +2687,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: 119, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 122, 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;
         },
@@ -2995,6 +3010,13 @@ function makeMutClosure(arg0, arg1, f) {
     return real;
 }
 
+function passArray16ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 2, 2) >>> 0;
+    getUint16ArrayMemory0().set(arg, ptr / 2);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 function passArray32ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 4, 4) >>> 0;
     getUint32ArrayMemory0().set(arg, ptr / 4);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isard",
-  "version": "1.14.0",
+  "version": "1.16.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",