@deck.gl/extensions 9.0.40 → 9.1.0-beta.3

package/dist/collision-filter/collision-filter-pass.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { _LayersPass as LayersPass } from '@deck.gl/core';
 export default class CollisionFilterPass extends LayersPass {
     renderCollisionMap(target, options) {
@@ -7,17 +10,25 @@ export default class CollisionFilterPass extends LayersPass {
         this.render({ ...options, clearColor, scissorRect, target, pass: 'collision' });
     }
     getLayerParameters(layer, layerIndex, viewport) {
-        return { ...layer.props.parameters, blend: false, depthRange: [0, 1], depthTest: true };
+        return {
+            ...layer.props.parameters,
+            blend: false,
+            depthWriteEnabled: true,
+            depthCompare: 'less-equal'
+        };
     }
-    getModuleParameters() {
+    getShaderModuleProps() {
         // Draw picking colors into collision FBO
         return {
-            drawToCollisionMap: true,
+            collision: {
+                drawToCollisionMap: true
+            },
             picking: {
                 isActive: 1,
                 isAttribute: false
             },
-            lightSources: {}
+            lighting: { enabled: false }
         };
     }
 }
+//# sourceMappingURL=collision-filter-pass.js.map

package/dist/collision-filter/collision-filter-pass.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collision-filter-pass.js","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAQ,WAAW,IAAI,UAAU,EAAoC,MAAM,eAAe,CAAC;AAIlG,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,kBAAkB,CAAC,MAAmB,EAAE,OAAyC;QAC/E,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAChC,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAEhG,IAAI,CAAC,MAAM,CAAC,EAAC,GAAG,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAC,CAAC,CAAC;IAChF,CAAC;IAES,kBAAkB,CAAC,KAAY,EAAE,UAAkB,EAAE,QAAkB;QAC/E,OAAO;YACL,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU;YACzB,KAAK,EAAE,KAAK;YACZ,iBAAiB,EAAE,IAAI;YACvB,YAAY,EAAE,YAAY;SAC3B,CAAC;IACJ,CAAC;IAED,oBAAoB;QAClB,yCAAyC;QACzC,OAAO;YACL,SAAS,EAAE;gBACT,kBAAkB,EAAE,IAAI;aACzB;YACD,OAAO,EAAE;gBACP,QAAQ,EAAE,CAAC;gBACX,WAAW,EAAE,KAAK;aACnB;YACD,QAAQ,EAAE,EAAC,OAAO,EAAE,KAAK,EAAC;SAC3B,CAAC;IACJ,CAAC;CACF"}

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

@@ -1,10 +1,11 @@
 import { Framebuffer, Texture } from '@luma.gl/core';
 import type { ShaderModule } from '@luma.gl/shadertools';
-type CollisionModuleSettings = {
+export type CollisionModuleProps = {
+    enabled: boolean;
     collisionFBO?: Framebuffer;
     drawToCollisionMap?: boolean;
     dummyCollisionMap?: Texture;
 };
-declare const _default: ShaderModule<CollisionModuleSettings>;
+declare const _default: ShaderModule<CollisionModuleProps>;
 export default _default;
 //# sourceMappingURL=shader-module.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AA4EvD,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;;AAqBF,wBAM2C"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAc,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AA8EvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;wBAsCG,YAAY,CAAC,oBAAoB,CAAC;AAVvC,wBAUwC"}

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

@@ -1,78 +1,101 @@
+// 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'
+    }
 };
+//# sourceMappingURL=shader-module.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module.js","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAEtC,MAAM,EAAE,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDrB,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,UAAU,EAAE,UAAU,CAAC;;CAExB;IACC,8BAA8B,EAAE,UAAU,CAAC;;;;;;;;;;;;;;;GAe1C;IACD,wBAAwB,EAAE,UAAU,CAAC;;GAEpC;CACF,CAAC;AAmBF,MAAM,oBAAoB,GAAG,CAC3B,IAA+B,EACQ,EAAE;IACzC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,mBAAmB,IAAI,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,EAAC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAC,GAAG,IAAI,CAAC;IAC5E,OAAO;QACL,OAAO,EAAE,OAAO,IAAI,CAAC,kBAAkB;QACvC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC;QACjC,iBAAiB,EACf,CAAC,kBAAkB,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;KAC7F,CAAC;AACJ,CAAC,CAAC;AAEF,aAAa;AACb,eAAe;IACb,IAAI,EAAE,WAAW;IACjB,YAAY,EAAE,CAAC,OAAO,CAAC;IACvB,EAAE;IACF,MAAM;IACN,WAAW,EAAE,oBAAoB;IACjC,YAAY,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,KAAK;KACf;CACoC,CAAC"}

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,21 @@ 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'
 };
+//# sourceMappingURL=aggregator.js.map

package/dist/data-filter/aggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aggregator.js","sourceRoot":"","sources":["../../src/data-filter/aggregator.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,KAAK,EAAa,MAAM,iBAAiB,CAAC;AAElD,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCpB,CAAC;AAEF,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;CAepB,CAAC;AAEF,MAAM,qBAAqB,GAAoB;IAC7C,0BAA0B,EAAE,qCAAqC;IACjE,2BAA2B,CAAC,mDAAmD;CAChF,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,OAAO,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,cAAuB;IACpE,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,iBAAiB,CAAC;YAC9B,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,gBAAgB,EAAE;gBAChB,MAAM,CAAC,aAAa,CAAC;oBACnB,MAAM,EAAE,aAAa;oBACrB,OAAO,EAAE,KAAK;iBACf,CAAC;aACH;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,iBAAiB,CAAC;QAC9B,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,EAAE;QACV,gBAAgB,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAC,CAAC,CAAC;KACjF,CAAC,CAAC;AACL,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,QAAQ,CACtB,MAAc,EACd,YAAwC,EACxC,aAAkB,EAClB,cAAuB;IAEvB,aAAa,CAAC,OAAO,CAAC,mBAAmB,GAAG,CAAC,CAAC;IAC9C,IAAI,cAAc,EAAE,CAAC;QACnB,aAAa,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACvB,EAAE,EAAE,+BAA+B;QACnC,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE,YAAY;QACtB,EAAE,EAAE,YAAY;QAChB,EAAE,EAAE,YAAY;QAChB,YAAY;QACZ,GAAG,aAAa;KACjB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAA6B;IAClD,KAAK,EAAE,IAAI;IACX,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,mBAAmB,EAAE,KAAK;IAC1B,YAAY,EAAE,OAAO;CACb,CAAC"}

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":"AAMA,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAA0B,cAAc,EAAM,MAAM,eAAe,CAAC;AAwB3E,KAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtC,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,GAAG,IAAI;IAClD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACpD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,cAAc,EAAE,CAAC,CAAC;IACvE;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACpD;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC;IAC/D;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,gBAAgB,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,EAAE,CAAC;IACxD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,GAAG,EAAE;QAC5B,kCAAkC;QAClC,EAAE,EAAE,MAAM,CAAC;QACX,uDAAuD;QACvD,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,IAAI,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAsBF,0IAA0I;AAC1I,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,cAAc,CAC7D,QAAQ,CAAC,0BAA0B,CAAC,CACrC;IACC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAyB;gBAEjC,IAAI,GAAE,0BAA+B;IAIjD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAkBvE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAqE7F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACrC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,EACjF,SAAS,EAAE,IAAI;IAuCjB,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;IA2ExE,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC;IASnD;;;;OAIG;IACH,sBAAsB,CACpB,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACrC,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,IAAI,GACd,IAAI;IAwBP;;;OAGG;IACH,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACrC,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM;CAQlB"}

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 },
@@ -37,6 +21,12 @@ const defaultOptions = {
     fp64: false,
     countItems: false
 };
+const CATEGORY_TYPE_FROM_SIZE = {
+    1: 'uint',
+    2: 'uvec2',
+    3: 'uvec3',
+    4: 'uvec4'
+};
 const DATA_TYPE_FROM_SIZE = {
     1: 'float',
     2: 'vec2',
@@ -52,14 +42,16 @@ class DataFilterExtension extends LayerExtension {
         const { categorySize, filterSize, fp64 } = extension.opts;
         const defines = {};
         if (categorySize) {
-            defines.DATACATEGORY_TYPE = DATA_TYPE_FROM_SIZE[categorySize];
+            defines.DATACATEGORY_TYPE = CATEGORY_TYPE_FROM_SIZE[categorySize];
             defines.DATACATEGORY_CHANNELS = categorySize;
         }
         if (filterSize) {
             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();
@@ -81,6 +73,7 @@ class DataFilterExtension extends LayerExtension {
                         size: categorySize,
                         stepMode: 'dynamic',
                         accessor: 'getFilterCategory',
+                        type: 'uint32',
                         transform: categorySize === 1
                             ? d => extension._getCategoryKey.call(this, d, 0)
                             : d => d.map((x, i) => extension._getCategoryKey.call(this, x, i))
@@ -95,7 +88,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 +107,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 +150,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++) {
@@ -242,3 +251,4 @@ class DataFilterExtension extends LayerExtension {
 DataFilterExtension.defaultProps = defaultProps;
 DataFilterExtension.extensionName = 'DataFilterExtension';
 export default DataFilterExtension;
+//# sourceMappingURL=data-filter-extension.js.map

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

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

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

@@ -1,10 +1,10 @@
 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.
      */
-    DATACATEGORY_TYPE?: 'float' | 'vec2' | 'vec3' | 'vec4';
+    DATACATEGORY_TYPE?: 'uint' | 'uvec2' | 'uvec3' | 'uvec4';
     /**
      * Number of category filtering channels. Must match dimension of `DATACATEGORY_TYPE`
      */
@@ -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,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IACzD;;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"}