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

package/dist/brushing/brushing-extension.d.ts

@@ -35,5 +35,6 @@ export default class BrushingExtension extends LayerExtension {
     getShaders(): any;
     initializeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this): void;
     finalizeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this): void;
+    draw(this: Layer<BrushingExtensionProps>, params: any, extension: this): void;
 }
 //# sourceMappingURL=brushing-extension.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA2B3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;CAW1F"}
+{"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA2B3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAYzF,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;CAYvE"}

package/dist/brushing/brushing-extension.js

@@ -1,22 +1,6 @@
-// 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 { LayerExtension } from '@deck.gl/core';
 import shaderModule from "./shader-module.js";
 const defaultProps = {
@@ -68,6 +52,18 @@ class BrushingExtension extends LayerExtension {
             });
         }
     }
+    draw(params, extension) {
+        const { viewport, mousePosition } = params.context;
+        const { brushingEnabled, brushingRadius, brushingTarget } = this.props;
+        const brushingProps = {
+            viewport,
+            mousePosition,
+            brushingEnabled,
+            brushingRadius,
+            brushingTarget
+        };
+        this.setShaderModuleProps({ brushing: brushingProps });
+    }
 }
 BrushingExtension.defaultProps = defaultProps;
 BrushingExtension.extensionName = 'BrushingExtension';

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

@@ -1,13 +1,19 @@
 import type { ShaderModule } from '@luma.gl/shadertools';
 import type { Viewport } from '@deck.gl/core';
 import type { BrushingExtensionProps } from "./brushing-extension.js";
-type BrushingModuleSettings = {
+export type BrushingModuleProps = {
     viewport: Viewport;
     mousePosition?: {
         x: number;
         y: number;
     };
 } & BrushingExtensionProps;
-declare const _default: ShaderModule<BrushingModuleSettings>;
+type BrushingModuleUniforms = {
+    enabled?: boolean;
+    target?: number;
+    mousePos?: [number, number];
+    radius?: number;
+};
+declare const _default: ShaderModule<BrushingModuleProps, BrushingModuleUniforms, {}>;
 export default _default;
 //# sourceMappingURL=shader-module.d.ts.map

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;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;;AA0E3B,wBA4B0C"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAKA,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,MAAM,MAAM,mBAAmB,GAAG;IAEhC,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;AAE3B,KAAK,sBAAsB,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;wBA0HG,YAAY,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,EAAE,CAAC;AAnClE,wBAmCmE"}

package/dist/brushing/shader-module.js

@@ -1,31 +1,49 @@
+// 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 uniformBlock = /* glsl */ `\
+uniform brushingUniforms {
+  bool enabled;
+  highp int target;
+  vec2 mousePos;
+  float radius;
+} brushing;
+`;
+const vertex = /* glsl */ `
+  in vec2 brushingTargets;
+
+  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.commonUnitsPerMeter.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 vs = `
-uniform bool brushing_enabled;
-uniform int brushing_target;
-uniform vec2 brushing_mousePos;
-uniform float brushing_radius;
-in vec2 brushingTargets;
-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);
-}
+${uniformBlock}
+${vertex}
+`;
+const fragment = /* glsl */ `
+  in float brushing_isVisible;
 `;
 const fs = `
-uniform bool brushing_enabled;
-in float brushing_isVisible;
+${uniformBlock}
+${fragment}
 `;
 const TARGET = {
     source: 0,
@@ -34,29 +52,29 @@ const TARGET = {
     source_target: 3
 };
 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 {
-brushingTarget = brushingTargets;
-}
-bool visible;
-if (brushing_target == 3) {
-visible = brushing_arePointsInRange(brushingSource, brushingTarget);
-} else {
-visible = brushing_isPointInRange(brushingTarget);
-}
-brushing_setVisible(visible);
-`,
+    'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
+    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 {
+      brushingTarget = brushingTargets;
+    }
+    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) {
+    if (brushing.enabled && brushing_isVisible < 0.5) {
       discard;
     }
   `
@@ -73,12 +91,18 @@ export default {
         }
         const { brushingEnabled = true, brushingRadius = 10000, brushingTarget = 'source', mousePosition, viewport } = opts;
         return {
-            brushing_enabled: Boolean(brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)),
-            brushing_radius: brushingRadius,
-            brushing_target: TARGET[brushingTarget] || 0,
-            brushing_mousePos: mousePosition
+            enabled: Boolean(brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)),
+            radius: brushingRadius,
+            target: TARGET[brushingTarget] || 0,
+            mousePos: mousePosition
                 ? viewport.unproject([mousePosition.x - viewport.x, mousePosition.y - viewport.y])
                 : [0, 0]
         };
+    },
+    uniformTypes: {
+        enabled: 'i32',
+        target: 'i32',
+        mousePos: 'vec2<f32>',
+        radius: 'f32'
     }
 };

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

@@ -12,6 +12,9 @@ export type ClipExtensionProps = {
      */
     clipByInstance?: boolean;
 };
+export type ClipModuleProps = {
+    bounds: [number, number, number, number];
+};
 /** Adds support for clipping rendered layers by rectangular bounds. */
 export default class ClipExtension extends LayerExtension {
     static defaultProps: {
@@ -20,7 +23,7 @@ export default class ClipExtension extends LayerExtension {
     };
     static extensionName: string;
     getShaders(this: Layer<ClipExtensionProps>): {
-        modules: ShaderModule[];
+        modules: ShaderModule<ClipModuleProps>[];
         inject: {
             'vs:#decl': string;
             'vs:DECKGL_FILTER_GL_POSITION': string;
@@ -28,6 +31,6 @@ export default class ClipExtension extends LayerExtension {
             'fs:DECKGL_FILTER_COLOR': string;
         };
     };
-    draw(this: Layer<Required<ClipExtensionProps>>, { uniforms }: any): void;
+    draw(this: Layer<Required<ClipExtensionProps>>): void;
 }
 //# sourceMappingURL=clip-extension.d.ts.map

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;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"}
+{"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAIA,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;AAYF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC;AAwDF,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,GAAG,IAAI;CAmBtD"}

package/dist/clip/clip-extension.js

@@ -1,32 +1,18 @@
-// 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 { 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;
+const shaderFunction = /* glsl */ `
+uniform clipUniforms {
+  vec4 bounds;
+} clip;
+
 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];
 }
 `;
 /*
@@ -34,21 +20,24 @@ return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.
  * e.g. ScatterplotLayer - show if the center of a circle is within bounds
  */
 const shaderModuleVs = {
-    name: 'clip-vs',
-    vs: shaderFunction
+    name: 'clip',
+    vs: shaderFunction,
+    uniformTypes: {
+        bounds: 'vec4<f32>'
+    }
 };
 const injectionVs = {
-    'vs:#decl': `
+    'vs:#decl': /* glsl */ `
 out float clip_isVisible;
 `,
-    'vs:DECKGL_FILTER_GL_POSITION': `
-clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
+    'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
+  clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
 `,
-    'fs:#decl': `
+    'fs:#decl': /* glsl */ `
 in float clip_isVisible;
 `,
-    'fs:DECKGL_FILTER_COLOR': `
-if (clip_isVisible < 0.5) discard;
+    'fs:DECKGL_FILTER_COLOR': /* glsl */ `
+  if (clip_isVisible < 0.5) discard;
 `
 };
 /*
@@ -56,21 +45,24 @@ if (clip_isVisible < 0.5) discard;
  * e.g. PolygonLayer - show the part of the polygon that intersect with the bounds
  */
 const shaderModuleFs = {
-    name: 'clip-fs',
-    fs: shaderFunction
+    name: 'clip',
+    fs: shaderFunction,
+    uniformTypes: {
+        bounds: 'vec4<f32>'
+    }
 };
 const injectionFs = {
-    'vs:#decl': `
+    'vs:#decl': /* glsl */ `
 out vec2 clip_commonPosition;
 `,
-    'vs:DECKGL_FILTER_GL_POSITION': `
-clip_commonPosition = geometry.position.xy;
+    'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
+  clip_commonPosition = geometry.position.xy;
 `,
-    'fs:#decl': `
+    'fs:#decl': /* glsl */ `
 in vec2 clip_commonPosition;
 `,
-    'fs:DECKGL_FILTER_COLOR': `
-if (!clip_isInBounds(clip_commonPosition)) discard;
+    'fs:DECKGL_FILTER_COLOR': /* glsl */ `
+  if (!clip_isInBounds(clip_commonPosition)) discard;
 `
 };
 /** Adds support for clipping rendered layers by rectangular bounds. */
@@ -96,21 +88,23 @@ class ClipExtension extends LayerExtension {
             };
     }
     /* eslint-disable camelcase */
-    draw({ uniforms }) {
+    draw() {
         const { clipBounds } = this.props;
+        const clipProps = {};
         if (this.state.clipByInstance) {
-            uniforms.clip_bounds = clipBounds;
+            clipProps.bounds = clipBounds;
         }
         else {
             const corner0 = this.projectPosition([clipBounds[0], clipBounds[1], 0]);
             const corner1 = this.projectPosition([clipBounds[2], clipBounds[3], 0]);
-            uniforms.clip_bounds = [
+            clipProps.bounds = [
                 Math.min(corner0[0], corner1[0]),
                 Math.min(corner0[1], corner1[1]),
                 Math.max(corner0[0], corner1[0]),
                 Math.max(corner0[1], corner1[1])
             ];
         }
+        this.setShaderModuleProps({ clip: clipProps });
     }
 }
 ClipExtension.defaultProps = defaultProps;

package/dist/collision-filter/collision-filter-effect.d.ts

@@ -1,5 +1,6 @@
-import { Device, Framebuffer, Texture } from '@luma.gl/core';
+import { Device } from '@luma.gl/core';
 import type { Effect, EffectContext, Layer, PreRenderOptions } from '@deck.gl/core';
+import type { CollisionModuleProps } from "./shader-module.js";
 export default class CollisionFilterEffect implements Effect {
     id: string;
     props: null;
@@ -19,9 +20,8 @@ export default class CollisionFilterEffect implements Effect {
      * Returns a map from collisionGroup to render info
      */
     private _groupByCollisionGroup;
-    getModuleParameters(layer: Layer): {
-        collisionFBO: Framebuffer;
-        dummyCollisionMap: Texture;
+    getShaderModuleProps(layer: Layer): {
+        collision: CollisionModuleProps;
     };
     cleanup(): void;
     createFBO(device: Device, collisionGroup: string): void;

package/dist/collision-filter/collision-filter-effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collision-filter-effect.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAW,MAAM,eAAe,CAAC;AAoB5F,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,MAAM;IAC1D,EAAE,SAA6B;IAC/B,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,OAAO,CAAC,CAAgB;IAChC,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,YAAY,CAAC,CAAW;IAEhC,KAAK,CAAC,OAAO,EAAE,aAAa;IAO5B,SAAS,CAAC,EACR,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,cAAmB,EACpB,EAAE,gBAAgB,GAAG,IAAI;IAoD1B,OAAO,CAAC,OAAO;IA+Df;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqC9B,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG;QACjC,YAAY,EAAE,WAAW,CAAC;QAC1B,iBAAiB,EAAE,OAAO,CAAC;KAC5B;IAMD,OAAO,IAAI,IAAI;IAaf,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAmChD,UAAU,CAAC,cAAc,EAAE,MAAM;CAOlC"}
+{"version":3,"file":"collision-filter-effect.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAuB,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAW,MAAM,eAAe,CAAC;AAM5F,OAAO,KAAK,EAAC,oBAAoB,EAAC,2BAAwB;AAY1D,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,MAAM;IAC1D,EAAE,SAA6B;IAC/B,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,OAAO,CAAC,CAAgB;IAChC,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,YAAY,CAAC,CAAW;IAEhC,KAAK,CAAC,OAAO,EAAE,aAAa;IAO5B,SAAS,CAAC,EACR,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,cAAmB,EACpB,EAAE,gBAAgB,GAAG,IAAI;IAoD1B,OAAO,CAAC,OAAO;IAoEf;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqC9B,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG;QAClC,SAAS,EAAE,oBAAoB,CAAC;KACjC;IAeD,OAAO,IAAI,IAAI;IAaf,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IA+BhD,UAAU,CAAC,cAAc,EAAE,MAAM;CAOlC"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { equals } from '@math.gl/core';
 import { _deepEqual as deepEqual } from '@deck.gl/core';
 import CollisionFilterPass from "./collision-filter-pass.js";
@@ -91,11 +94,16 @@ export default class CollisionFilterEffect {
                 viewports: viewport ? [viewport] : [],
                 onViewportActive,
                 views,
-                moduleParameters: {
-                    // To avoid feedback loop forming between Framebuffer and active Texture.
-                    dummyCollisionMap: this.dummyCollisionMap,
-                    // @ts-expect-error TODO - assuming WebGL context
-                    devicePixelRatio: collisionFBO.device.canvasContext.getDevicePixelRatio() / DOWNSCALE
+                shaderModuleProps: {
+                    collision: {
+                        enabled: true,
+                        // To avoid feedback loop forming between Framebuffer and active Texture.
+                        dummyCollisionMap: this.dummyCollisionMap
+                    },
+                    project: {
+                        // @ts-expect-error TODO - assuming WebGL context
+                        devicePixelRatio: collisionFBO.device.canvasContext.getDevicePixelRatio() / DOWNSCALE
+                    }
                 }
             });
         }
@@ -107,7 +115,7 @@ export default class CollisionFilterEffect {
     _groupByCollisionGroup(device, collisionLayers) {
         const channelMap = {};
         for (const layer of collisionLayers) {
-            const { collisionGroup } = layer.props;
+            const collisionGroup = layer.props.collisionGroup;
             let channelInfo = channelMap[collisionGroup];
             if (!channelInfo) {
                 channelInfo = { collisionGroup, layers: [], layerBounds: [], allLayersLoaded: true };
@@ -135,10 +143,19 @@ export default class CollisionFilterEffect {
         }
         return channelMap;
     }
-    getModuleParameters(layer) {
-        const { collisionGroup } = layer.props;
+    getShaderModuleProps(layer) {
+        const { collisionGroup, collisionEnabled } = layer
+            .props;
         const { collisionFBOs, dummyCollisionMap } = this;
-        return { collisionFBO: collisionFBOs[collisionGroup], dummyCollisionMap: dummyCollisionMap };
+        const collisionFBO = collisionFBOs[collisionGroup];
+        const enabled = collisionEnabled && Boolean(collisionFBO);
+        return {
+            collision: {
+                enabled,
+                collisionFBO,
+                dummyCollisionMap: dummyCollisionMap
+            }
+        };
     }
     cleanup() {
         if (this.dummyCollisionMap) {
@@ -171,10 +188,7 @@ export default class CollisionFilterEffect {
             format: 'depth16unorm',
             width,
             height,
-            mipmaps: false,
-            // TODO fix getWebGLTextureParameters() in luma to avoid passing deprecated parameters
-            dataFormat: 6402, // gl.DEPTH_COMPONENT
-            type: 5125 // gl.UNSIGNED_INT
+            mipmaps: false
         });
         this.collisionFBOs[collisionGroup] = device.createFramebuffer({
             id: `collision-${collisionGroup}`,

package/dist/collision-filter/collision-filter-extension.d.ts

@@ -34,7 +34,7 @@ export default class CollisionFilterExtension extends LayerExtension {
     };
     static extensionName: string;
     getShaders(this: Layer<CollisionFilterExtensionProps>): any;
-    draw(this: Layer<CollisionFilterExtensionProps>, { uniforms, context, moduleParameters }: any): void;
+    draw(this: Layer<CollisionFilterExtensionProps>, { shaderModuleProps }: any): void;
     initializeState(this: Layer<CollisionFilterExtensionProps>, context: LayerContext, extension: this): void;
     getNeedsPickingBuffer(this: Layer<CollisionFilterExtensionProps>): boolean;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,GAAG;IAa3F,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAgBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}
+{"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,iBAAiB,EAAC,EAAE,GAAG;IAQzE,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAgBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}

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

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { LayerExtension } from '@deck.gl/core';
 import collision from "./shader-module.js";
 import CollisionFilterEffect from "./collision-filter-effect.js";
@@ -13,12 +16,8 @@ class CollisionFilterExtension extends LayerExtension {
         return { modules: [collision] };
     }
     /* eslint-disable camelcase */
-    draw({ uniforms, context, moduleParameters }) {
-        const { collisionEnabled } = this.props;
-        const { collisionFBO, drawToCollisionMap } = moduleParameters;
-        const enabled = collisionEnabled && Boolean(collisionFBO);
-        uniforms.collision_enabled = enabled;
-        if (drawToCollisionMap) {
+    draw({ shaderModuleProps }) {
+        if (shaderModuleProps.collision?.drawToCollisionMap) {
             // Override any props with those defined in collisionTestProps
             // @ts-ignore
             this.props = this.clone(this.props.collisionTestProps).props;

package/dist/collision-filter/collision-filter-pass.d.ts

@@ -4,13 +4,17 @@ type CollisionFilterPassRenderOptions = LayersPassRenderOptions & {};
 export default class CollisionFilterPass extends LayersPass {
     renderCollisionMap(target: Framebuffer, options: CollisionFilterPassRenderOptions): void;
     protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): any;
-    getModuleParameters(): {
-        drawToCollisionMap: boolean;
+    getShaderModuleProps(): {
+        collision: {
+            drawToCollisionMap: boolean;
+        };
         picking: {
             isActive: number;
             isAttribute: boolean;
         };
-        lightSources: {};
+        lighting: {
+            enabled: boolean;
+        };
     };
 }
 export {};

package/dist/collision-filter/collision-filter-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collision-filter-pass.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAElG,KAAK,gCAAgC,GAAG,uBAAuB,GAAG,EAAE,CAAC;AAErE,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,gCAAgC;IAQjF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;IAIvF,mBAAmB;;;;;;;;CAWpB"}
+{"version":3,"file":"collision-filter-pass.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAElG,KAAK,gCAAgC,GAAG,uBAAuB,GAAG,EAAE,CAAC;AAErE,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,gCAAgC;IAQjF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;IAIvF,oBAAoB;;;;;;;;;;;;CAarB"}

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) {
@@ -9,15 +12,17 @@ export default class CollisionFilterPass extends LayersPass {
     getLayerParameters(layer, layerIndex, viewport) {
         return { ...layer.props.parameters, blend: false, depthRange: [0, 1], depthTest: true };
     }
-    getModuleParameters() {
+    getShaderModuleProps() {
         // Draw picking colors into collision FBO
         return {
-            drawToCollisionMap: true,
+            collision: {
+                drawToCollisionMap: true
+            },
             picking: {
                 isActive: 1,
                 isAttribute: false
             },
-            lightSources: {}
+            lighting: { enabled: false }
         };
     }
 }

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"}