@deck.gl/extensions 9.0.0-beta.5 → 9.0.0-beta.7

package/dist/brushing/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAEjE,KAAK,sBAAsB,GAAG;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;;AAkF3B,wBA4B0C"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAGjE,KAAK,sBAAsB,GAAG;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;;AAkF3B,wBA4B0C"}

package/dist/brushing/shader-module.js

@@ -1,40 +1,35 @@
 import { project } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 const vs = `
-  uniform bool brushing_enabled;
-  uniform int brushing_target;
-  uniform vec2 brushing_mousePos;
-  uniform float brushing_radius;
-
-  #ifdef NON_INSTANCED_MODEL
-  in vec2 brushingTargets;
-  #else
-  in vec2 instanceBrushingTargets;
-  #endif
-
-  out float brushing_isVisible;
-
-  bool brushing_isPointInRange(vec2 position) {
-    if (!brushing_enabled) {
-      return true;
-    }
-    vec2 source_commonspace = project_position(position);
-    vec2 target_commonspace = project_position(brushing_mousePos);
-    float distance = length((target_commonspace - source_commonspace) / project_uCommonUnitsPerMeter.xy);
-
-    return distance <= brushing_radius;
-  }
-
-  bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {
-    return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);
-  }
-
-  void brushing_setVisible(bool visible) {
-    brushing_isVisible = float(visible);
-  }
+uniform bool brushing_enabled;
+uniform int brushing_target;
+uniform vec2 brushing_mousePos;
+uniform float brushing_radius;
+#ifdef NON_INSTANCED_MODEL
+in vec2 brushingTargets;
+#else
+in vec2 instanceBrushingTargets;
+#endif
+out float brushing_isVisible;
+bool brushing_isPointInRange(vec2 position) {
+if (!brushing_enabled) {
+return true;
+}
+vec2 source_commonspace = project_position(position);
+vec2 target_commonspace = project_position(brushing_mousePos);
+float distance = length((target_commonspace - source_commonspace) / project_uCommonUnitsPerMeter.xy);
+return distance <= brushing_radius;
+}
+bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {
+return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);
+}
+void brushing_setVisible(bool visible) {
+brushing_isVisible = float(visible);
+}
 `;
 const fs = `
-  uniform bool brushing_enabled;
-  in float brushing_isVisible;
+uniform bool brushing_enabled;
+in float brushing_isVisible;
 `;
 const TARGET = {
     source: 0,
@@ -44,30 +39,30 @@ const TARGET = {
 };
 const inject = {
     'vs:DECKGL_FILTER_GL_POSITION': `
-    vec2 brushingTarget;
-    vec2 brushingSource;
-    if (brushing_target == 3) {
-      brushingTarget = geometry.worldPositionAlt.xy;
-      brushingSource = geometry.worldPosition.xy;
-    } else if (brushing_target == 0) {
-      brushingTarget = geometry.worldPosition.xy;
-    } else if (brushing_target == 1) {
-      brushingTarget = geometry.worldPositionAlt.xy;
-    } else {
-      #ifdef NON_INSTANCED_MODEL
-      brushingTarget = brushingTargets;
-      #else
-      brushingTarget = instanceBrushingTargets;
-      #endif
-    }
-    bool visible;
-    if (brushing_target == 3) {
-      visible = brushing_arePointsInRange(brushingSource, brushingTarget);
-    } else {
-      visible = brushing_isPointInRange(brushingTarget);
-    }
-    brushing_setVisible(visible);
-  `,
+vec2 brushingTarget;
+vec2 brushingSource;
+if (brushing_target == 3) {
+brushingTarget = geometry.worldPositionAlt.xy;
+brushingSource = geometry.worldPosition.xy;
+} else if (brushing_target == 0) {
+brushingTarget = geometry.worldPosition.xy;
+} else if (brushing_target == 1) {
+brushingTarget = geometry.worldPositionAlt.xy;
+} else {
+#ifdef NON_INSTANCED_MODEL
+brushingTarget = brushingTargets;
+#else
+brushingTarget = instanceBrushingTargets;
+#endif
+}
+bool visible;
+if (brushing_target == 3) {
+visible = brushing_arePointsInRange(brushingSource, brushingTarget);
+} else {
+visible = brushing_isPointInRange(brushingTarget);
+}
+brushing_setVisible(visible);
+`,
     'fs:DECKGL_FILTER_COLOR': `
     if (brushing_enabled && brushing_isVisible < 0.5) {
       discard;

package/dist/clip/clip-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAOzC,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AA0DF,uEAAuE;AACvE,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,YAAY;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC;;;;;;;;;IAwB1C,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAC,EAAE,GAAG,GAAG,IAAI;CAgBvE"}
+{"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAQzC,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AA0DF,uEAAuE;AACvE,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,YAAY;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC;;;;;;;;;IAwB1C,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAC,EAAE,GAAG,GAAG,IAAI;CAgBvE"}

package/dist/clip/clip-extension.js

@@ -18,15 +18,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 import { LayerExtension } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 const defaultProps = {
     clipBounds: [0, 0, 1, 1],
     clipByInstance: undefined
 };
 const shaderFunction = `
 uniform vec4 clip_bounds;
-
 bool clip_isInBounds(vec2 position) {
-  return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.x < clip_bounds[2] && position.y < clip_bounds[3];
+return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.x < clip_bounds[2] && position.y < clip_bounds[3];
 }
 `;
 /*
@@ -42,13 +42,13 @@ const injectionVs = {
 out float clip_isVisible;
 `,
     'vs:DECKGL_FILTER_GL_POSITION': `
-  clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
+clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
 `,
     'fs:#decl': `
 in float clip_isVisible;
 `,
     'fs:DECKGL_FILTER_COLOR': `
-  if (clip_isVisible < 0.5) discard;
+if (clip_isVisible < 0.5) discard;
 `
 };
 /*
@@ -64,13 +64,13 @@ const injectionFs = {
 out vec2 clip_commonPosition;
 `,
     'vs:DECKGL_FILTER_GL_POSITION': `
-  clip_commonPosition = geometry.position.xy;
+clip_commonPosition = geometry.position.xy;
 `,
     'fs:#decl': `
 in vec2 clip_commonPosition;
 `,
     'fs:DECKGL_FILTER_COLOR': `
-  if (!clip_isInBounds(clip_commonPosition)) discard;
+if (!clip_isInBounds(clip_commonPosition)) discard;
 `
 };
 /** Adds support for clipping rendered layers by rectangular bounds. */

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;AAmFvD,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":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAoFvD,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;;AAsBF,wBAM2C"}

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

@@ -1,81 +1,70 @@
 import { project } from '@deck.gl/core';
+import { glsl } from "../utils/syntax-tags.js";
 const vs = `
 #ifdef NON_INSTANCED_MODEL
 in float collisionPriorities;
 #else
 in float instanceCollisionPriorities;
 #endif
-
 uniform sampler2D collision_texture;
 uniform bool collision_sort;
 uniform bool collision_enabled;
-
 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;
-  }
-
-  // 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_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;
+}
+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);
 }
 `;
 const inject = {
     'vs:#decl': `
-  float collision_fade = 1.0;
+float collision_fade = 1.0;
 `,
     'vs:DECKGL_FILTER_GL_POSITION': `
-  if (collision_sort) {
-    #ifdef NON_INSTANCED_MODEL
-    float collisionPriority = collisionPriorities;
-    #else
-    float collisionPriority = instanceCollisionPriorities;
-    #endif
-    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);
-    }
-  }
-  `,
+if (collision_sort) {
+#ifdef NON_INSTANCED_MODEL
+float collisionPriority = collisionPriorities;
+#else
+float collisionPriority = instanceCollisionPriorities;
+#endif
+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:DECKGL_FILTER_COLOR': `
-  color.a *= collision_fade;
-  `
+color.a *= collision_fade;
+`
 };
 const getCollisionUniforms = (opts, uniforms) => {
     if (!opts || !('dummyCollisionMap' in opts)) {
@@ -84,6 +73,7 @@ const getCollisionUniforms = (opts, uniforms) => {
     const { collisionFBO, drawToCollisionMap, dummyCollisionMap } = opts;
     return {
         collision_sort: Boolean(drawToCollisionMap),
+        // @ts-ignore (v9 not sure why this isn't allowed now)
         collision_texture: !drawToCollisionMap && collisionFBO ? collisionFBO.colorAttachments[0] : dummyCollisionMap
     };
 };

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,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,EAAE,EAAC,MAAM,oBAAoB,CAAC;AAqDtC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAY3D;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":"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"}

package/dist/data-filter/aggregator.js

@@ -49,15 +49,12 @@ void main() {
   fragColor = vColor;
 }
 `;
+const FLOAT_TARGET_FEATURES = [
+    'float32-renderable-webgl', // ability to render to float texture
+    'texture-blend-float-webgl' // ability to blend when rendering to float texture
+];
 export function supportsFloatTarget(device) {
-    // @ts-expect-error
-    const gl = device.gl;
-    // https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/WebGL_best_practices#Support_for_float_textures_doesnt_mean_you_can_render_into_them!
-    return Boolean(gl.getExtension('EXT_float_blend') &&
-        // WebGL 2
-        (gl.getExtension('EXT_color_buffer_float') ||
-            // WebGL 1
-            gl.getExtension('WEBGL_color_buffer_float')));
+    return FLOAT_TARGET_FEATURES.every(feature => device.features.has(feature));
 }
 // A 1x1 framebuffer object that encodes the total count of filtered items
 export function getFramebuffer(device, useFloatTarget) {
@@ -67,8 +64,8 @@ export function getFramebuffer(device, useFloatTarget) {
             height: 1,
             colorAttachments: [
                 device.createTexture({
-                    format: device.info.type === 'webgl2' ? 'rgba32float' : 'rgba8unorm',
-                    type: GL.FLOAT,
+                    format: 'rgba32float',
+                    type: 5126,
                     mipmaps: false
                 })
             ]
@@ -77,7 +74,7 @@ export function getFramebuffer(device, useFloatTarget) {
     return device.createFramebuffer({
         width: 256,
         height: 64,
-        colorAttachments: [device.createTexture({ format: 'rgba8unorm', type: GL.FLOAT, mipmaps: false })]
+        colorAttachments: [device.createTexture({ format: 'rgba8unorm', type: 5126, mipmaps: false })]
     });
 }
 // Increments the counter based on dataFilter_value
@@ -90,7 +87,7 @@ export function getModel(device, shaderOptions, useFloatTarget) {
         id: 'data-filter-aggregation-model',
         vertexCount: 1,
         isInstanced: false,
-        drawMode: GL.POINTS,
+        drawMode: 0,
         vs: AGGREGATE_VS,
         fs: AGGREGATE_FS,
         ...shaderOptions
@@ -98,7 +95,7 @@ export function getModel(device, shaderOptions, useFloatTarget) {
 }
 export const parameters = {
     blend: true,
-    blendFunc: [GL.ONE, GL.ONE, GL.ONE, GL.ONE],
-    blendEquation: [GL.FUNC_ADD, GL.FUNC_ADD],
+    blendFunc: [1, 1, 1, 1],
+    blendEquation: [32774, 32774],
     depthTest: false
 };

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":"AAuBA,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AACnF,OAAO,EAA0B,cAAc,EAAM,MAAM,eAAe,CAAC;AAiB3E,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,KAAK,0BAA0B,GAAG;IAChC;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAgBF,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,EAAE,0BAA0B;IAI5C,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAcvE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA4E7F,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;IAiDxE,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;IAyBP;;;OAGG;IACH,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,wBAAwB,CAAC,EACrC,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM;CAQlB"}
+{"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

@@ -17,7 +17,6 @@
 // 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.
-import { GL } from '@luma.gl/constants';
 import { _deepEqual as deepEqual, LayerExtension, log } from '@deck.gl/core';
 import { shaderModule, shaderModule64 } from "./shader-module.js";
 import * as aggregator from "./aggregator.js";
@@ -70,7 +69,7 @@ export default class DataFilterExtension extends LayerExtension {
             attributeManager.add({
                 filterValues: {
                     size: filterSize,
-                    type: fp64 ? GL.DOUBLE : GL.FLOAT,
+                    type: fp64 ? 'float64' : 'float32',
                     accessor: 'getFilterValue',
                     shaderAttributes: {
                         filterValues: {
@@ -83,7 +82,6 @@ export default class DataFilterExtension extends LayerExtension {
                 },
                 filterCategoryValues: {
                     size: categorySize,
-                    type: GL.FLOAT,
                     accessor: 'getFilterCategory',
                     transform: categorySize === 1
                         ? d => extension._getCategoryKey.call(this, d, 0)
@@ -109,8 +107,7 @@ export default class DataFilterExtension extends LayerExtension {
                 filterIndices: {
                     size: useFloatTarget ? 1 : 2,
                     vertexOffset: 1,
-                    type: GL.UNSIGNED_BYTE,
-                    normalized: true,
+                    type: 'unorm8',
                     accessor: (object, { index }) => {
                         const i = object && object.__source ? object.__source.index : index;
                         return useFloatTarget ? (i + 1) % 255 : [(i + 1) % 255, Math.floor(i / 255) % 255];

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;AA8FtE,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AAkG7B,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":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAC,wBAAwB,EAAC,mCAAgC;AA+FtE,KAAK,wBAAwB,GAAG;IAC9B,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB,GAAG,wBAAwB,CAAC;AAkG7B,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,wBAAwB,CAM/D,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,wBAAwB,CAMjE,CAAC"}

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

@@ -1,3 +1,4 @@
+import { glsl } from "../utils/syntax-tags.js";
 /*
  * data filter shader module
  */
@@ -10,78 +11,69 @@ uniform bool filter_useSoftMargin;
 uniform bool filter_enabled;
 uniform bool filter_transformSize;
 uniform ivec4 filter_categoryBitMask;
-
 #ifdef NON_INSTANCED_MODEL
-  #define DATAFILTER_ATTRIB filterValues
-  #define DATAFILTER_ATTRIB_64LOW filterValues64Low
-  #define DATACATEGORY_ATTRIB filterCategoryValues
+#define DATAFILTER_ATTRIB filterValues
+#define DATAFILTER_ATTRIB_64LOW filterValues64Low
+#define DATACATEGORY_ATTRIB filterCategoryValues
 #else
-  #define DATAFILTER_ATTRIB instanceFilterValues
-  #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
-  #define DATACATEGORY_ATTRIB instanceFilterCategoryValues
+#define DATAFILTER_ATTRIB instanceFilterValues
+#define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low
+#define DATACATEGORY_ATTRIB instanceFilterCategoryValues
 #endif
-
 in DATAFILTER_TYPE DATAFILTER_ATTRIB;
 #ifdef DATAFILTER_DOUBLE
-  in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
-
-  uniform DATAFILTER_TYPE filter_min64High;
-  uniform DATAFILTER_TYPE filter_max64High;
+in DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;
+uniform DATAFILTER_TYPE filter_min64High;
+uniform DATAFILTER_TYPE filter_max64High;
 #endif
 in DATACATEGORY_TYPE DATACATEGORY_ATTRIB;
-
 out float dataFilter_value;
-
 float dataFilter_reduceValue(float value) {
-  return value;
+return value;
 }
 float dataFilter_reduceValue(vec2 value) {
-  return min(value.x, value.y);
+return min(value.x, value.y);
 }
 float dataFilter_reduceValue(vec3 value) {
-  return min(min(value.x, value.y), value.z);
+return min(min(value.x, value.y), value.z);
 }
 float dataFilter_reduceValue(vec4 value) {
-  return min(min(value.x, value.y), min(value.z, value.w));
+return min(min(value.x, value.y), min(value.z, value.w));
 }
 void dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax, DATACATEGORY_TYPE category) {
-  if (filter_enabled) {
-    if (filter_useSoftMargin) {
-      dataFilter_value = dataFilter_reduceValue(
-        smoothstep(filter_min, filter_softMin, valueFromMin) *
-        (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
-      );
-    } else {
-      dataFilter_value = dataFilter_reduceValue(
-        step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
-      );
-    }
-
-    #if DATACATEGORY_CHANNELS == 1 // One 128-bit mask
-      int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
-    #elif DATACATEGORY_CHANNELS == 2 // Two 64-bit masks
-      ivec2 dataFilter_masks = ivec2(
-        filter_categoryBitMask[int(category.x / 32.0)],
-        filter_categoryBitMask[int(category.y / 32.0) + 2]
-      );
-    #elif DATACATEGORY_CHANNELS == 3 // Three 32-bit masks
-      ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
-    #else // Four 32-bit masks
-      ivec4 dataFilter_masks = filter_categoryBitMask;
-    #endif
-
-    // Shift mask and extract relevant bits
-    DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) / pow(DATACATEGORY_TYPE(2.0), mod(category, 32.0));
-    dataFilter_bits = mod(floor(dataFilter_bits), 2.0);
-
-    #if DATACATEGORY_CHANNELS == 1
-      if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
-    #else
-    if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
-    #endif
-  } else {
-    dataFilter_value = 1.0;
-  }
+if (filter_enabled) {
+if (filter_useSoftMargin) {
+dataFilter_value = dataFilter_reduceValue(
+smoothstep(filter_min, filter_softMin, valueFromMin) *
+(1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))
+);
+} else {
+dataFilter_value = dataFilter_reduceValue(
+step(filter_min, valueFromMin) * step(valueFromMax, filter_max)
+);
+}
+#if DATACATEGORY_CHANNELS == 1
+int dataFilter_masks = filter_categoryBitMask[int(category / 32.0)];
+#elif DATACATEGORY_CHANNELS == 2
+ivec2 dataFilter_masks = ivec2(
+filter_categoryBitMask[int(category.x / 32.0)],
+filter_categoryBitMask[int(category.y / 32.0) + 2]
+);
+#elif DATACATEGORY_CHANNELS == 3
+ivec3 dataFilter_masks = filter_categoryBitMask.xyz;
+#else
+ivec4 dataFilter_masks = filter_categoryBitMask;
+#endif
+DATACATEGORY_TYPE dataFilter_bits = DATACATEGORY_TYPE(dataFilter_masks) / pow(DATACATEGORY_TYPE(2.0), mod(category, 32.0));
+dataFilter_bits = mod(floor(dataFilter_bits), 2.0);
+#if DATACATEGORY_CHANNELS == 1
+if(dataFilter_bits == 0.0) dataFilter_value = 0.0;
+#else
+if(any(equal(dataFilter_bits, DATACATEGORY_TYPE(0.0)))) dataFilter_value = 0.0;
+#endif
+} else {
+dataFilter_value = 1.0;
+}
 }
 `;
 const fs = `
@@ -144,32 +136,32 @@ function getUniforms64(opts) {
 }
 const inject = {
     'vs:#main-start': `
-    #ifdef DATAFILTER_DOUBLE
-      dataFilter_setValue(
-        DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
-        DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
-        DATACATEGORY_ATTRIB
-      );
-    #else
-      dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
-    #endif
-  `,
+#ifdef DATAFILTER_DOUBLE
+dataFilter_setValue(
+DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,
+DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW,
+DATACATEGORY_ATTRIB
+);
+#else
+dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB, DATACATEGORY_ATTRIB);
+#endif
+`,
     'vs:#main-end': `
-    if (dataFilter_value == 0.0) {
-      gl_Position = vec4(0.);
-    }
-  `,
+if (dataFilter_value == 0.0) {
+gl_Position = vec4(0.);
+}
+`,
     'vs:DECKGL_FILTER_SIZE': `
-    if (filter_transformSize) {
-      size = size * dataFilter_value;
-    }
-  `,
+if (filter_transformSize) {
+size = size * dataFilter_value;
+}
+`,
     'fs:DECKGL_FILTER_COLOR': `
-    if (dataFilter_value == 0.0) discard;
-    if (filter_transformColor) {
-      color.a *= dataFilter_value;
-    }
-  `
+if (dataFilter_value == 0.0) discard;
+if (filter_transformColor) {
+color.a *= dataFilter_value;
+}
+`
 };
 export const shaderModule = {
     name: 'data-filter',