@deck.gl/extensions 9.0.35 → 9.1.0-beta.1

package/dist/collision-filter/shader-module.js

@@ -1,78 +1,100 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { project } from '@deck.gl/core';
-import { glsl } from "../utils/syntax-tags.js";
-const vs = `
+const vs = /* glsl */ `
 in float collisionPriorities;
+
 uniform sampler2D collision_texture;
-uniform bool collision_sort;
-uniform bool collision_enabled;
+
+uniform collisionUniforms {
+  bool sort;
+  bool enabled;
+} collision;
+
 vec2 collision_getCoords(vec4 position) {
-vec4 collision_clipspace = project_common_position_to_clipspace(position);
-return (1.0 + collision_clipspace.xy / collision_clipspace.w) / 2.0;
+  vec4 collision_clipspace = project_common_position_to_clipspace(position);
+  return (1.0 + collision_clipspace.xy / collision_clipspace.w) / 2.0;
 }
+
 float collision_match(vec2 tex, vec3 pickingColor) {
-vec4 collision_pickingColor = texture(collision_texture, tex);
-float delta = dot(abs(collision_pickingColor.rgb - pickingColor), vec3(1.0));
-float e = 0.001;
-return step(delta, e);
+  vec4 collision_pickingColor = texture(collision_texture, tex);
+  float delta = dot(abs(collision_pickingColor.rgb - pickingColor), vec3(1.0));
+  float e = 0.001;
+  return step(delta, e);
 }
+
 float collision_isVisible(vec2 texCoords, vec3 pickingColor) {
-if (!collision_enabled) {
-return 1.0;
-}
-const int N = 2;
-float accumulator = 0.0;
-vec2 step = vec2(1.0 / project_uViewportSize);
-const float floatN = float(N);
-vec2 delta = -floatN * step;
-for(int i = -N; i <= N; i++) {
-delta.x = -step.x * floatN;
-for(int j = -N; j <= N; j++) {
-accumulator += collision_match(texCoords + delta, pickingColor);
-delta.x += step.x;
-}
-delta.y += step.y;
-}
-float W = 2.0 * floatN + 1.0;
-return pow(accumulator / (W * W), 2.2);
+  if (!collision.enabled) {
+    return 1.0;
+  }
+
+  // Visibility test, sample area of 5x5 pixels in order to fade in/out.
+  // Due to the locality, the lookups will be cached
+  // This reduces the flicker present when objects are shown/hidden
+  const int N = 2;
+  float accumulator = 0.0;
+  vec2 step = vec2(1.0 / project.viewportSize);
+
+  const float floatN = float(N);
+  vec2 delta = -floatN * step;
+  for(int i = -N; i <= N; i++) {
+    delta.x = -step.x * floatN;
+    for(int j = -N; j <= N; j++) {
+      accumulator += collision_match(texCoords + delta, pickingColor);
+      delta.x += step.x;
+    }
+    delta.y += step.y;
+  }
+
+  float W = 2.0 * floatN + 1.0;
+  return pow(accumulator / (W * W), 2.2);
 }
 `;
 const inject = {
-    'vs:#decl': `
-float collision_fade = 1.0;
-`,
-    'vs:DECKGL_FILTER_GL_POSITION': `
-if (collision_sort) {
-float collisionPriority = collisionPriorities;
-position.z = -0.001 * collisionPriority * position.w;
-}
-if (collision_enabled) {
-vec4 collision_common_position = project_position(vec4(geometry.worldPosition, 1.0));
-vec2 collision_texCoords = collision_getCoords(collision_common_position);
-collision_fade = collision_isVisible(collision_texCoords, geometry.pickingColor / 255.0);
-if (collision_fade < 0.0001) {
-position = vec4(0.0, 0.0, 2.0, 1.0);
-}
-}
+    'vs:#decl': /* glsl */ `
+  float collision_fade = 1.0;
 `,
-    'vs:DECKGL_FILTER_COLOR': `
-color.a *= collision_fade;
-`
+    'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
+  if (collision.sort) {
+    float collisionPriority = collisionPriorities;
+    position.z = -0.001 * collisionPriority * position.w; // Support range -1000 -> 1000
+  }
+
+  if (collision.enabled) {
+    vec4 collision_common_position = project_position(vec4(geometry.worldPosition, 1.0));
+    vec2 collision_texCoords = collision_getCoords(collision_common_position);
+    collision_fade = collision_isVisible(collision_texCoords, geometry.pickingColor / 255.0);
+    if (collision_fade < 0.0001) {
+      // Position outside clip space bounds to discard
+      position = vec4(0.0, 0.0, 2.0, 1.0);
+    }
+  }
+  `,
+    'vs:DECKGL_FILTER_COLOR': /* glsl */ `
+  color.a *= collision_fade;
+  `
 };
-const getCollisionUniforms = (opts, uniforms) => {
+const getCollisionUniforms = (opts) => {
     if (!opts || !('dummyCollisionMap' in opts)) {
         return {};
     }
-    const { collisionFBO, drawToCollisionMap, dummyCollisionMap } = opts;
+    const { enabled, collisionFBO, drawToCollisionMap, dummyCollisionMap } = opts;
     return {
-        collision_sort: Boolean(drawToCollisionMap),
-        // @ts-ignore (v9 not sure why this isn't allowed now)
+        enabled: enabled && !drawToCollisionMap,
+        sort: Boolean(drawToCollisionMap),
         collision_texture: !drawToCollisionMap && collisionFBO ? collisionFBO.colorAttachments[0] : dummyCollisionMap
     };
 };
+// @ts-ignore
 export default {
     name: 'collision',
     dependencies: [project],
     vs,
     inject,
-    getUniforms: getCollisionUniforms
+    getUniforms: getCollisionUniforms,
+    uniformTypes: {
+        sort: 'i32',
+        enabled: 'i32'
+    }
 };

package/dist/data-filter/aggregator.d.ts

@@ -1,13 +1,7 @@
-import { Device, Framebuffer } from '@luma.gl/core';
-import { Model } from '@luma.gl/engine';
-import { GL } from '@luma.gl/constants';
+import { Device, Framebuffer, RenderPipelineParameters } from '@luma.gl/core';
+import { Model, ModelProps } from '@luma.gl/engine';
 export declare function supportsFloatTarget(device: Device): boolean;
 export declare function getFramebuffer(device: Device, useFloatTarget: boolean): Framebuffer;
-export declare function getModel(device: Device, shaderOptions: any, useFloatTarget: boolean): Model;
-export declare const parameters: {
-    readonly blend: true;
-    readonly blendFunc: readonly [GL.LINES, GL.LINES, GL.LINES, GL.LINES];
-    readonly blendEquation: readonly [GL.FUNC_ADD, GL.FUNC_ADD];
-    readonly depthTest: false;
-};
+export declare function getModel(device: Device, bufferLayout: ModelProps['bufferLayout'], shaderOptions: any, useFloatTarget: boolean): Model;
+export declare const parameters: RenderPipelineParameters;
 //# sourceMappingURL=aggregator.d.ts.map

package/dist/data-filter/aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregator.d.ts","sourceRoot":"","sources":["../../src/data-filter/aggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAiB,WAAW,EAAC,MAAM,eAAe,CAAC;AACjE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AA0DtC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE3D;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,WAAW,CAmBnF;AAGD,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,cAAc,EAAE,OAAO,GAAG,KAAK,CAe3F;AAED,eAAO,MAAM,UAAU;;;;;CAKb,CAAC"}
+{"version":3,"file":"aggregator.d.ts","sourceRoot":"","sources":["../../src/data-filter/aggregator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAiB,WAAW,EAAE,wBAAwB,EAAC,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAC,KAAK,EAAE,UAAU,EAAC,MAAM,iBAAiB,CAAC;AA0DlD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE3D;AAGD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,WAAW,CAkBnF;AAGD,wBAAgB,QAAQ,CACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,EACxC,aAAa,EAAE,GAAG,EAClB,cAAc,EAAE,OAAO,GACtB,KAAK,CAgBP;AAED,eAAO,MAAM,UAAU,EAAE,wBASf,CAAC"}

package/dist/data-filter/aggregator.js

@@ -1,5 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { Model } from '@luma.gl/engine';
-import { GL } from '@luma.gl/constants';
 const AGGREGATE_VS = `\
 #version 300 es
 #define SHADER_NAME data-filter-vertex-shader
@@ -65,7 +67,6 @@ export function getFramebuffer(device, useFloatTarget) {
             colorAttachments: [
                 device.createTexture({
                     format: 'rgba32float',
-                    type: 5126,
                     mipmaps: false
                 })
             ]
@@ -74,11 +75,11 @@ export function getFramebuffer(device, useFloatTarget) {
     return device.createFramebuffer({
         width: 256,
         height: 64,
-        colorAttachments: [device.createTexture({ format: 'rgba8unorm', type: 5126, mipmaps: false })]
+        colorAttachments: [device.createTexture({ format: 'rgba8unorm', mipmaps: false })]
     });
 }
 // Increments the counter based on dataFilter_value
-export function getModel(device, shaderOptions, useFloatTarget) {
+export function getModel(device, bufferLayout, shaderOptions, useFloatTarget) {
     shaderOptions.defines.NON_INSTANCED_MODEL = 1;
     if (useFloatTarget) {
         shaderOptions.defines.FLOAT_TARGET = 1;
@@ -87,15 +88,20 @@ export function getModel(device, shaderOptions, useFloatTarget) {
         id: 'data-filter-aggregation-model',
         vertexCount: 1,
         isInstanced: false,
-        drawMode: 0,
+        topology: 'point-list',
         vs: AGGREGATE_VS,
         fs: AGGREGATE_FS,
+        bufferLayout,
         ...shaderOptions
     });
 }
 export const parameters = {
     blend: true,
-    blendFunc: [1, 1, 1, 1],
-    blendEquation: [32774, 32774],
-    depthTest: false
+    blendColorSrcFactor: 'one',
+    blendColorDstFactor: 'one',
+    blendAlphaSrcFactor: 'one',
+    blendAlphaDstFactor: 'one',
+    blendColorOperation: 'add',
+    blendAlphaOperation: 'add',
+    depthCompare: 'never'
 };

package/dist/data-filter/data-filter-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-filter-extension.d.ts","sourceRoot":"","sources":["../../src/data-filter/data-filter-extension.ts"],"names":[],"mappings":"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"}

package/dist/data-filter/data-filter-extension.js

@@ -1,24 +1,8 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { _deepEqual as deepEqual, LayerExtension, log } from '@deck.gl/core';
-import { shaderModule, shaderModule64 } from "./shader-module.js";
+import { dataFilter, dataFilter64 } from "./shader-module.js";
 import * as aggregator from "./aggregator.js";
 const defaultProps = {
     getFilterValue: { type: 'accessor', value: 0 },
@@ -59,7 +43,9 @@ class DataFilterExtension extends LayerExtension {
             defines.DATAFILTER_TYPE = DATA_TYPE_FROM_SIZE[filterSize];
             defines.DATAFILTER_DOUBLE = Boolean(fp64);
         }
-        return { modules: [fp64 ? shaderModule64 : shaderModule], defines };
+        const module = fp64 ? dataFilter64 : dataFilter;
+        module.uniformTypes = module.uniformTypesFromOptions(extension.opts);
+        return { modules: [module], defines };
     }
     initializeState(context, extension) {
         const attributeManager = this.getAttributeManager();
@@ -95,7 +81,7 @@ class DataFilterExtension extends LayerExtension {
             // The vertex shader checks if a vertex has the same "index" as the previous vertex
             // so that we only write one count cross multiple vertices of the same object
             attributeManager.add({
-                filterIndices: {
+                filterVertexIndices: {
                     size: useFloatTarget ? 1 : 2,
                     vertexOffset: 1,
                     type: 'unorm8',
@@ -114,7 +100,7 @@ class DataFilterExtension extends LayerExtension {
                 }
             });
             const filterFBO = aggregator.getFramebuffer(device, useFloatTarget);
-            const filterModel = aggregator.getModel(device, extension.getShaders.call(this, extension), useFloatTarget);
+            const filterModel = aggregator.getModel(device, attributeManager.getBufferLayouts({ isInstanced: false }), extension.getShaders.call(this, extension), useFloatTarget);
             this.setState({ filterFBO, filterModel });
         }
     }
@@ -157,32 +143,48 @@ class DataFilterExtension extends LayerExtension {
         const filterFBO = this.state.filterFBO;
         const filterModel = this.state.filterModel;
         const filterNeedsUpdate = this.state.filterNeedsUpdate;
-        const { onFilteredItemsChange } = this.props;
         if (!this.state.categoryBitMask) {
             extension._updateCategoryBitMask.call(this, params, extension);
         }
+        const { onFilteredItemsChange, extensions, filterEnabled, filterRange, filterSoftRange, filterTransformSize, filterTransformColor, filterCategories } = this.props;
+        const dataFilterProps = {
+            extensions,
+            filterEnabled,
+            filterRange,
+            filterSoftRange,
+            filterTransformSize,
+            filterTransformColor,
+            filterCategories
+        };
+        if (this.state.categoryBitMask) {
+            dataFilterProps.categoryBitMask = this.state.categoryBitMask;
+        }
+        this.setShaderModuleProps({ dataFilter: dataFilterProps });
         /* eslint-disable-next-line camelcase */
-        params.uniforms.filter_categoryBitMask = this.state.categoryBitMask;
         if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {
-            const { attributes: { filterValues, filterCategoryValues, filterIndices } } = this.getAttributeManager();
+            const attributeManager = this.getAttributeManager();
+            const { attributes: { filterValues, filterCategoryValues, filterVertexIndices } } = attributeManager;
             filterModel.setVertexCount(this.getNumInstances());
-            this.context.device.clearWebGL({ framebuffer: filterFBO, color: [0, 0, 0, 0] });
-            filterModel.updateModuleSettings(params.moduleParameters);
-            // @ts-expect-error filterValue and filterIndices should always have buffer value
-            filterModel.setAttributes({
+            // @ts-expect-error filterValue and filterVertexIndices should always have buffer value
+            const attributes = {
                 ...filterValues?.getValue(),
                 ...filterCategoryValues?.getValue(),
-                ...filterIndices?.getValue()
+                ...filterVertexIndices?.getValue()
+            };
+            filterModel.setAttributes(attributes);
+            filterModel.shaderInputs.setProps({
+                dataFilter: dataFilterProps
             });
-            filterModel.setUniforms(params.uniforms);
-            filterModel.device.withParametersWebGL({
+            const viewport = [0, 0, filterFBO.width, filterFBO.height];
+            const renderPass = filterModel.device.beginRenderPass({
+                id: 'data-filter-aggregation',
                 framebuffer: filterFBO,
-                // ts-ignore 'readonly' cannot be assigned to the mutable type '[GLBlendEquation, GLBlendEquation]'
-                ...aggregator.parameters,
-                viewport: [0, 0, filterFBO.width, filterFBO.height]
-            }, () => {
-                filterModel.draw(this.context.renderPass);
+                parameters: { viewport },
+                clearColor: [0, 0, 0, 0]
             });
+            filterModel.setParameters(aggregator.parameters);
+            filterModel.draw(renderPass);
+            renderPass.end();
             const color = filterModel.device.readPixelsToArrayWebGL(filterFBO);
             let count = 0;
             for (let i = 0; i < color.length; i++) {

package/dist/data-filter/shader-module.d.ts

@@ -1,5 +1,5 @@
 import type { ShaderModule } from '@luma.gl/shadertools';
-import type { DataFilterExtensionProps } from "./data-filter-extension.js";
+import type { DataFilterExtensionOptions, DataFilterExtensionProps } from "./data-filter-extension.js";
 export type Defines = {
     /**
      * Primitive type of parameter used for category filtering. If undefined, category filtering disabled.
@@ -18,10 +18,17 @@ export type Defines = {
      */
     DATAFILTER_DOUBLE?: boolean;
 };
-type DataFilterModuleSettings = {
+export type CategoryBitMask = Uint32Array;
+export type DataFilterModuleProps = {
     extensions: any[];
+    categoryBitMask?: CategoryBitMask;
 } & DataFilterExtensionProps;
-export declare const shaderModule: ShaderModule<DataFilterModuleSettings>;
-export declare const shaderModule64: ShaderModule<DataFilterModuleSettings>;
+type UniformTypesFunc = (opts: DataFilterExtensionOptions) => any;
+export declare const dataFilter: ShaderModule<DataFilterModuleProps> & {
+    uniformTypesFromOptions: UniformTypesFunc;
+};
+export declare const dataFilter64: ShaderModule<DataFilterModuleProps> & {
+    uniformTypesFromOptions: UniformTypesFunc;
+};
 export {};
 //# sourceMappingURL=shader-module.d.ts.map

package/dist/data-filter/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AAMtE,MAAM,MAAM,OAAO,GAAG;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAoGF,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AA0G7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/data-filter/shader-module.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,0BAA0B,EAAE,wBAAwB,EAAC,mCAAgC;AAMlG,MAAM,MAAM,OAAO,GAAG;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAErD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAqHF,MAAM,MAAM,eAAe,GAAG,WAAW,CAAC;AAC1C,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,GAAG,wBAAwB,CAAC;AA4G7B,KAAK,gBAAgB,GAAG,CAAC,IAAI,EAAE,0BAA0B,KAAK,GAAG,CAAC;AA6BlE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,qBAAqB,CAAC,GAAG;IAC7D,uBAAuB,EAAE,gBAAgB,CAAC;CAQ3C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,qBAAqB,CAAC,GAAG;IAC/D,uBAAuB,EAAE,gBAAgB,CAAC;CAQ3C,CAAC"}