deck.gl 9.2.0-beta.3 → 9.2.0-beta.4

package/dist/dist.dev.js

@@ -1907,7 +1907,7 @@ or create a device with the 'debug: true' prop.`;
         VERSION = (
           // Version detection using build plugin
           // @ts-expect-error no-undef
-          true ? "9.2.0" : "running from source"
+          true ? "9.2.2" : "running from source"
         );
         spector;
         preregisteredAdapters = /* @__PURE__ */ new Map();
@@ -9603,7 +9603,7 @@ ${source4}`;
          * @param gl
          * @returns
          */
-        async attach(gl) {
+        async attach(gl, props = {}) {
           const { WebGLDevice: WebGLDevice2 } = await Promise.resolve().then(() => (init_webgl_device(), webgl_device_exports));
           if (gl instanceof WebGLDevice2) {
             return gl;
@@ -9614,9 +9614,11 @@ ${source4}`;
           if (!isWebGL(gl)) {
             throw new Error("Invalid WebGL2RenderingContext");
           }
+          const createCanvasContext = props.createCanvasContext === true ? {} : props.createCanvasContext;
           return new WebGLDevice2({
+            ...props,
             _handle: gl,
-            createCanvasContext: { canvas: gl.canvas, autoResize: false }
+            createCanvasContext: { canvas: gl.canvas, autoResize: false, ...createCanvasContext }
           });
         }
         async create(props = {}) {
@@ -43265,7 +43267,7 @@ void main() {
         if (props.gl instanceof WebGLRenderingContext) {
           log_default.error("WebGL1 context not supported.")();
         }
-        deviceOrPromise = webgl2Adapter.attach(props.gl);
+        deviceOrPromise = webgl2Adapter.attach(props.gl, this.props.deviceProps);
       }
       if (!deviceOrPromise) {
         deviceOrPromise = this._createDevice(props);
@@ -44531,7 +44533,7 @@ void main() {
     }
     // Use generic value
     // Returns true if successful
-    setConstantValue(value) {
+    setConstantValue(context, value) {
       const isWebGPU = this.device.type === "webgpu";
       if (isWebGPU || value === void 0 || typeof value === "function") {
         if (isWebGPU && typeof value !== "function") {
@@ -44542,7 +44544,8 @@ void main() {
         }
         return false;
       }
-      const hasChanged = this.setData({ constant: true, value });
+      const transformedValue = this.settings.transform && context ? this.settings.transform.call(context, value) : value;
+      const hasChanged = this.setData({ constant: true, value: transformedValue });
       if (hasChanged) {
         this.setNeedsRedraw();
       }
@@ -45571,7 +45574,7 @@ void main(void) {
           typeof accessorName === "string" ? buffers[accessorName] : void 0,
           data.startIndices
         )) {
-        } else if (typeof accessorName === "string" && !buffers[accessorName] && attribute.setConstantValue(props[accessorName])) {
+        } else if (typeof accessorName === "string" && !buffers[accessorName] && attribute.setConstantValue(context, props[accessorName])) {
         } else if (attribute.needsUpdate()) {
           updated = true;
           this._updateAttribute({
@@ -45687,7 +45690,7 @@ void main(void) {
       const { attribute, numInstances } = opts;
       debug(TRACE_ATTRIBUTE_UPDATE_START, attribute);
       if (attribute.constant) {
-        attribute.setConstantValue(attribute.value);
+        attribute.setConstantValue(opts.context, attribute.value);
         return;
       }
       if (attribute.allocate(numInstances)) {
@@ -50017,6 +50020,7 @@ void main(void) {
   var uniformBlock9 = `uniform iconUniforms {
   float sizeScale;
   vec2 iconsTextureDim;
+  float sizeBasis;
   float sizeMinPixels;
   float sizeMaxPixels;
   bool billboard;
@@ -50031,6 +50035,7 @@ void main(void) {
     uniformTypes: {
       sizeScale: "f32",
       iconsTextureDim: "vec2<f32>",
+      sizeBasis: "f32",
       sizeMinPixels: "f32",
       sizeMaxPixels: "f32",
       billboard: "f32",
@@ -50084,8 +50089,9 @@ void main(void) {
     icon.sizeMinPixels, icon.sizeMaxPixels
   );
 
-  // scale icon height to match instanceSize
-  float instanceScale = iconSize.y == 0.0 ? 0.0 : sizePixels / iconSize.y;
+  // Choose correct constraint based on the 'sizeBasis' value (0.0 = width, 1.0 = height)
+  float iconConstraint = icon.sizeBasis == 0.0 ? iconSize.x : iconSize.y;
+  float instanceScale = iconConstraint == 0.0 ? 0.0 : sizePixels / iconConstraint;
 
   // scale and rotate vertex in "pixel" value and convert back to fraction in clipspace
   vec2 pixelOffset = positions / 2.0 * iconSize + instanceOffsets;
@@ -50099,7 +50105,6 @@ void main(void) {
     vec3 offset = vec3(pixelOffset, 0.0);
     DECKGL_FILTER_SIZE(offset, geometry);
     gl_Position.xy += project_pixel_size_to_clipspace(offset.xy);
-
   } else {
     vec3 offset_common = vec3(project_pixel_size(pixelOffset), 0.0);
     DECKGL_FILTER_SIZE(offset_common, geometry);
@@ -50448,6 +50453,7 @@ void main(void) {
     sizeScale: { type: "number", value: 1, min: 0 },
     billboard: true,
     sizeUnits: "pixels",
+    sizeBasis: "height",
     sizeMinPixels: { type: "number", min: 0, value: 0 },
     //  min point radius in pixels
     sizeMaxPixels: { type: "number", min: 0, value: Number.MAX_SAFE_INTEGER },
@@ -50566,7 +50572,7 @@ void main(void) {
       this.state.iconManager.finalize();
     }
     draw({ uniforms }) {
-      const { sizeScale, sizeMinPixels, sizeMaxPixels, sizeUnits, billboard, alphaCutoff } = this.props;
+      const { sizeScale, sizeBasis, sizeMinPixels, sizeMaxPixels, sizeUnits, billboard, alphaCutoff } = this.props;
       const { iconManager } = this.state;
       const iconsTexture = iconManager.getTexture();
       if (iconsTexture) {
@@ -50576,6 +50582,7 @@ void main(void) {
           iconsTextureDim: [iconsTexture.width, iconsTexture.height],
           sizeUnits: UNIT[sizeUnits],
           sizeScale,
+          sizeBasis: sizeBasis === "height" ? 1 : 0,
           sizeMinPixels,
           sizeMaxPixels,
           billboard,
@@ -56287,12 +56294,21 @@ void main(void) {
       featureIds: lines.featureIds
     };
     layerProps.lines._pathType = "open";
+    const vertexCount = polygons.positions.value.length / polygons.positions.size;
+    const vertexValid = Array(vertexCount).fill(1);
+    for (const index of polygons.primitivePolygonIndices.value) {
+      vertexValid[index - 1] = 0;
+    }
     layerProps.polygons.data = {
       length: polygons.polygonIndices.value.length - 1,
       startIndices: polygons.polygonIndices.value,
       attributes: {
         ...polygons.attributes,
         getPolygon: polygons.positions,
+        instanceVertexValid: {
+          size: 1,
+          value: new Uint16Array(vertexValid)
+        },
         pickingColors: {
           size: 4,
           value: customPickingColors.polygons
@@ -102273,16 +102289,24 @@ void main() {
             return;
         }
       };
-      const { interleaved = false, ...otherProps } = props;
+      const { interleaved = false } = props;
       this._interleaved = interleaved;
-      this._props = otherProps;
+      this._props = this.filterProps(props);
+    }
+    /** Filter out props to pass to Deck **/
+    filterProps(props) {
+      const { interleaved = false, useDevicePixels, ...deckProps } = props;
+      if (!interleaved && useDevicePixels !== void 0) {
+        deckProps.useDevicePixels = useDevicePixels;
+      }
+      return deckProps;
     }
     /** Update (partial) props of the underlying Deck instance. */
     setProps(props) {
       if (this._interleaved && props.layers) {
         resolveLayers(this._map, this._deck, this._props.layers, props.layers);
       }
-      Object.assign(this._props, props);
+      Object.assign(this._props, this.filterProps(props));
       if (this._deck && this._map) {
         this._deck.setProps({
           ...this._props,
@@ -102342,7 +102366,11 @@ void main() {
         gl,
         deck: new Deck({
           ...this._props,
-          gl
+          gl,
+          parameters: { ...getDefaultParameters(map6, false), ...this._props.parameters },
+          deviceProps: {
+            createCanvasContext: { autoResize: true }
+          }
         })
       });
       map6.on("styledata", this._handleStyleChange);
@@ -104904,7 +104932,7 @@ void main() {
       requestAnimationFrame(() => this._animate());
     }
     _getFps() {
-      return Math.round(this.deck.metrics.fps ?? 0);
+      return Math.round(this.deck?.metrics.fps ?? 0);
     }
   };
   var FpsWidget = _FpsWidget;