@deck.gl/extensions 8.9.0-beta.2 → 8.9.0-beta.3

package/dist/esm/{collide/collide-effect.js → collision-filter/collision-filter-effect.js}

@@ -2,12 +2,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { Framebuffer, Renderbuffer, Texture2D, cssToDeviceRatio } from '@luma.gl/core';
 import { equals } from '@math.gl/core';
 import { _deepEqual as deepEqual } from '@deck.gl/core';
-import CollidePass from './collide-pass';
+import CollisionFilterPass from './collision-filter-pass';
 import MaskEffect from '../mask/mask-effect';
 const DOWNSCALE = 2;
-export default class CollideEffect {
+export default class CollisionFilterEffect {
   constructor() {
-    _defineProperty(this, "id", 'collide-effect');
+    _defineProperty(this, "id", 'collision-filter-effect');
 
     _defineProperty(this, "props", null);
 
@@ -17,11 +17,11 @@ export default class CollideEffect {
 
     _defineProperty(this, "channels", {});
 
-    _defineProperty(this, "collidePass", void 0);
+    _defineProperty(this, "collisionFilterPass", void 0);
 
-    _defineProperty(this, "collideFBOs", {});
+    _defineProperty(this, "collisionFBOs", {});
 
-    _defineProperty(this, "dummyCollideMap", void 0);
+    _defineProperty(this, "dummyCollisionMap", void 0);
 
     _defineProperty(this, "lastViewport", void 0);
   }
@@ -38,8 +38,8 @@ export default class CollideEffect {
   }) {
     var _preRenderStats$mask;
 
-    if (!this.dummyCollideMap) {
-      this.dummyCollideMap = new Texture2D(gl, {
+    if (!this.dummyCollisionMap) {
+      this.dummyCollisionMap = new Texture2D(gl, {
         width: 1,
         height: 1
       });
@@ -49,36 +49,36 @@ export default class CollideEffect {
       return;
     }
 
-    const collideLayers = layers.filter(({
+    const collisionLayers = layers.filter(({
       props: {
         visible,
-        collideEnabled
+        collisionEnabled
       }
-    }) => visible && collideEnabled);
+    }) => visible && collisionEnabled);
 
-    if (collideLayers.length === 0) {
+    if (collisionLayers.length === 0) {
       this.channels = {};
       return;
     }
 
-    if (!this.collidePass) {
-      this.collidePass = new CollidePass(gl, {
-        id: 'default-collide'
+    if (!this.collisionFilterPass) {
+      this.collisionFilterPass = new CollisionFilterPass(gl, {
+        id: 'default-collision-filter'
       });
     }
 
     const effects = allEffects === null || allEffects === void 0 ? void 0 : allEffects.filter(e => e.constructor === MaskEffect);
     const maskEffectRendered = (_preRenderStats$mask = preRenderStats['mask-effect']) === null || _preRenderStats$mask === void 0 ? void 0 : _preRenderStats$mask.didRender;
 
-    const channels = this._groupByCollideGroup(gl, collideLayers);
+    const channels = this._groupByCollisionGroup(gl, collisionLayers);
 
     const viewport = viewports[0];
     const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport) || maskEffectRendered;
 
-    for (const collideGroup in channels) {
-      const collideFBO = this.collideFBOs[collideGroup];
-      const renderInfo = channels[collideGroup];
-      collideFBO.resize({
+    for (const collisionGroup in channels) {
+      const collisionFBO = this.collisionFBOs[collisionGroup];
+      const renderInfo = channels[collisionGroup];
+      collisionFBO.resize({
         width: gl.canvas.width / DOWNSCALE,
         height: gl.canvas.height / DOWNSCALE
       });
@@ -103,22 +103,22 @@ export default class CollideEffect {
     viewportChanged
   }) {
     const {
-      collideGroup
+      collisionGroup
     } = renderInfo;
-    const oldRenderInfo = this.channels[collideGroup];
+    const oldRenderInfo = this.channels[collisionGroup];
 
     if (!oldRenderInfo) {
       return;
     }
 
-    const needsRender = viewportChanged || renderInfo === oldRenderInfo || !deepEqual(oldRenderInfo.layers, renderInfo.layers, 0) || renderInfo.layerBounds.some((b, i) => !equals(b, oldRenderInfo.layerBounds[i]));
-    this.channels[collideGroup] = renderInfo;
+    const needsRender = viewportChanged || renderInfo === oldRenderInfo || !deepEqual(oldRenderInfo.layers, renderInfo.layers, 0) || renderInfo.layerBounds.some((b, i) => !equals(b, oldRenderInfo.layerBounds[i])) || renderInfo.allLayersLoaded !== oldRenderInfo.allLayersLoaded || renderInfo.layers.some(layer => layer.props.transitions);
+    this.channels[collisionGroup] = renderInfo;
 
     if (needsRender) {
       this.lastViewport = viewport;
-      const collideFBO = this.collideFBOs[collideGroup];
-      this.collidePass.renderCollideMap(collideFBO, {
-        pass: 'collide',
+      const collisionFBO = this.collisionFBOs[collisionGroup];
+      this.collisionFilterPass.renderCollisionMap(collisionFBO, {
+        pass: 'collision-filter',
         isPicking: true,
         layers: renderInfo.layers,
         effects,
@@ -127,48 +127,53 @@ export default class CollideEffect {
         onViewportActive,
         views,
         moduleParameters: {
-          dummyCollideMap: this.dummyCollideMap,
-          devicePixelRatio: cssToDeviceRatio(collideFBO.gl) / DOWNSCALE
+          dummyCollisionMap: this.dummyCollisionMap,
+          devicePixelRatio: cssToDeviceRatio(collisionFBO.gl) / DOWNSCALE
         }
       });
     }
   }
 
-  _groupByCollideGroup(gl, collideLayers) {
+  _groupByCollisionGroup(gl, collisionLayers) {
     const channelMap = {};
 
-    for (const layer of collideLayers) {
+    for (const layer of collisionLayers) {
       const {
-        collideGroup
+        collisionGroup
       } = layer.props;
-      let channelInfo = channelMap[collideGroup];
+      let channelInfo = channelMap[collisionGroup];
 
       if (!channelInfo) {
         channelInfo = {
-          collideGroup,
+          collisionGroup,
           layers: [],
-          layerBounds: []
+          layerBounds: [],
+          allLayersLoaded: true
         };
-        channelMap[collideGroup] = channelInfo;
+        channelMap[collisionGroup] = channelInfo;
       }
 
       channelInfo.layers.push(layer);
       channelInfo.layerBounds.push(layer.getBounds());
+
+      if (!layer.isLoaded) {
+        channelInfo.allLayersLoaded = false;
+      }
     }
 
-    for (const collideGroup of Object.keys(channelMap)) {
-      if (!this.collideFBOs[collideGroup]) {
-        this.createFBO(gl, collideGroup);
+    for (const collisionGroup of Object.keys(channelMap)) {
+      if (!this.collisionFBOs[collisionGroup]) {
+        this.createFBO(gl, collisionGroup);
       }
 
-      if (!this.channels[collideGroup]) {
-        this.channels[collideGroup] = channelMap[collideGroup];
+      if (!this.channels[collisionGroup]) {
+        this.channels[collisionGroup] = channelMap[collisionGroup];
       }
     }
 
-    for (const collideGroup of Object.keys(this.collideFBOs)) {
-      if (!channelMap[collideGroup]) {
-        this.destroyFBO(collideGroup);
+    for (const collisionGroup of Object.keys(this.collisionFBOs)) {
+      if (!channelMap[collisionGroup]) {
+        this.destroyFBO(collisionGroup);
       }
     }
 
@@ -177,40 +182,40 @@ export default class CollideEffect {
 
   getModuleParameters(layer) {
     const {
-      collideGroup
+      collisionGroup
     } = layer.props;
     const {
-      collideFBOs,
-      dummyCollideMap
+      collisionFBOs,
+      dummyCollisionMap
     } = this;
     return {
-      collideFBO: collideFBOs[collideGroup],
-      dummyCollideMap
+      collisionFBO: collisionFBOs[collisionGroup],
+      dummyCollisionMap
     };
   }
 
   cleanup() {
-    if (this.dummyCollideMap) {
-      this.dummyCollideMap.delete();
-      this.dummyCollideMap = undefined;
+    if (this.dummyCollisionMap) {
+      this.dummyCollisionMap.delete();
+      this.dummyCollisionMap = undefined;
     }
 
     this.channels = {};
 
-    for (const collideGroup of Object.keys(this.collideFBOs)) {
-      this.destroyFBO(collideGroup);
+    for (const collisionGroup of Object.keys(this.collisionFBOs)) {
+      this.destroyFBO(collisionGroup);
     }
 
-    this.collideFBOs = {};
+    this.collisionFBOs = {};
     this.lastViewport = undefined;
   }
 
-  createFBO(gl, collideGroup) {
+  createFBO(gl, collisionGroup) {
     const {
       width,
       height
     } = gl.canvas;
-    const collideMap = new Texture2D(gl, {
+    const collisionMap = new Texture2D(gl, {
       width,
       height,
       parameters: {
@@ -225,27 +230,27 @@ export default class CollideEffect {
       width,
       height
     });
-    this.collideFBOs[collideGroup] = new Framebuffer(gl, {
-      id: "Collide-".concat(collideGroup),
+    this.collisionFBOs[collisionGroup] = new Framebuffer(gl, {
+      id: "Collision-".concat(collisionGroup),
       width,
       height,
       attachments: {
-        [36064]: collideMap,
+        [36064]: collisionMap,
         [36096]: depthBuffer
       }
     });
   }
 
-  destroyFBO(collideGroup) {
-    const fbo = this.collideFBOs[collideGroup];
+  destroyFBO(collisionGroup) {
+    const fbo = this.collisionFBOs[collisionGroup];
 
     for (const attachment of Object.values(fbo.attachments)) {
       attachment.delete();
     }
 
     fbo.delete();
-    delete this.collideFBOs[collideGroup];
+    delete this.collisionFBOs[collisionGroup];
   }
 
 }
-//# sourceMappingURL=collide-effect.js.map
+//# sourceMappingURL=collision-filter-effect.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collision-filter/collision-filter-effect.ts"],"names":["Framebuffer","Renderbuffer","Texture2D","cssToDeviceRatio","equals","_deepEqual","deepEqual","CollisionFilterPass","MaskEffect","DOWNSCALE","CollisionFilterEffect","preRender","gl","effects","allEffects","layers","layerFilter","viewports","onViewportActive","views","isPicking","preRenderStats","dummyCollisionMap","width","height","collisionLayers","filter","props","visible","collisionEnabled","length","channels","collisionFilterPass","id","e","constructor","maskEffectRendered","didRender","_groupByCollisionGroup","viewport","viewportChanged","lastViewport","collisionGroup","collisionFBO","collisionFBOs","renderInfo","resize","canvas","_render","oldRenderInfo","needsRender","layerBounds","some","b","i","allLayersLoaded","layer","transitions","renderCollisionMap","pass","moduleParameters","devicePixelRatio","channelMap","channelInfo","push","getBounds","isLoaded","Object","keys","createFBO","destroyFBO","getModuleParameters","cleanup","delete","undefined","collisionMap","parameters","depthBuffer","format","attachments","fbo","attachment","values"],"mappings":"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","sourcesContent":["import {Framebuffer, Renderbuffer, Texture2D, cssToDeviceRatio} from '@luma.gl/core';\nimport {equals} from '@math.gl/core';\nimport {_deepEqual as deepEqual} from '@deck.gl/core';\nimport type {Effect, Layer, PreRenderOptions, Viewport} from '@deck.gl/core';\nimport CollisionFilterPass from './collision-filter-pass';\nimport MaskEffect, {MaskPreRenderStats} from '../mask/mask-effect';\n// import {debugFBO} from '../utils/debug';\n\ntype CollisionFilterExtensionProps = {\n  collisionTestProps?: {};\n  collisionGroup: string;\n};\n\n// Factor by which to downscale Collision FBO relative to canvas\nconst DOWNSCALE = 2;\n\ntype RenderInfo = {\n  collisionGroup: string;\n  layers: Layer<CollisionFilterExtensionProps>[];\n  layerBounds: ([number[], number[]] | null)[];\n  allLayersLoaded: boolean;\n};\n\nexport default class CollisionFilterEffect implements Effect {\n  id = 'collision-filter-effect';\n  props = null;\n  useInPicking = true;\n  order = 1;\n\n  private channels: Record<string, RenderInfo> = {};\n  private collisionFilterPass?: CollisionFilterPass;\n  private collisionFBOs: Record<string, Framebuffer> = {};\n  private dummyCollisionMap?: Texture2D;\n  private lastViewport?: Viewport;\n\n  preRender(\n    gl: WebGLRenderingContext,\n    {\n      effects: allEffects,\n      layers,\n      layerFilter,\n      viewports,\n      onViewportActive,\n      views,\n      isPicking,\n      preRenderStats = {}\n    }: PreRenderOptions\n  ): void {\n    if (!this.dummyCollisionMap) {\n      this.dummyCollisionMap = new Texture2D(gl, {width: 1, height: 1});\n    }\n\n    if (isPicking) {\n      // Do not update on picking pass\n      return;\n    }\n\n    const collisionLayers = layers.filter(\n      // @ts-ignore\n      ({props: {visible, collisionEnabled}}) => visible && collisionEnabled\n    ) as Layer<CollisionFilterExtensionProps>[];\n    if (collisionLayers.length === 0) {\n      this.channels = {};\n      return;\n    }\n\n    if (!this.collisionFilterPass) {\n      this.collisionFilterPass = new CollisionFilterPass(gl, {id: 'default-collision-filter'});\n    }\n\n    // Detect if mask has rendered. TODO: better dependency system for Effects\n    const effects = allEffects?.filter(e => e.constructor === MaskEffect);\n    const maskEffectRendered = (preRenderStats['mask-effect'] as MaskPreRenderStats)?.didRender;\n\n    // Collect layers to render\n    const channels = this._groupByCollisionGroup(gl, collisionLayers);\n\n    const viewport = viewports[0];\n    const viewportChanged =\n      !this.lastViewport || !this.lastViewport.equals(viewport) || maskEffectRendered;\n\n    // Resize framebuffers to match canvas\n    for (const collisionGroup in channels) {\n      const collisionFBO = this.collisionFBOs[collisionGroup];\n      const renderInfo = channels[collisionGroup];\n      collisionFBO.resize({\n        width: gl.canvas.width / DOWNSCALE,\n        height: gl.canvas.height / DOWNSCALE\n      });\n      this._render(renderInfo, {\n        effects,\n        layerFilter,\n        onViewportActive,\n        views,\n        viewport,\n        viewportChanged\n      });\n    }\n\n    // debugFBO(this.collisionFBOs[Object.keys(channels)[0]], {minimap: true});\n  }\n\n  private _render(\n    renderInfo: RenderInfo,\n    {\n      effects,\n      layerFilter,\n      onViewportActive,\n      views,\n      viewport,\n      viewportChanged\n    }: {\n      effects: PreRenderOptions['effects'];\n      layerFilter: PreRenderOptions['layerFilter'];\n      onViewportActive: PreRenderOptions['onViewportActive'];\n      views: PreRenderOptions['views'];\n      viewport: Viewport;\n      viewportChanged: boolean;\n    }\n  ) {\n    const {collisionGroup} = renderInfo;\n    const oldRenderInfo = this.channels[collisionGroup];\n    if (!oldRenderInfo) {\n      return;\n    }\n\n    const needsRender =\n      viewportChanged ||\n      // If render info is new\n      renderInfo === oldRenderInfo ||\n      // If sublayers have changed\n      !deepEqual(oldRenderInfo.layers, renderInfo.layers, 0) ||\n      // If a sublayer's bounds have been updated\n      renderInfo.layerBounds.some((b, i) => !equals(b, oldRenderInfo.layerBounds[i])) ||\n      // If a sublayer's isLoaded state has been updated\n      renderInfo.allLayersLoaded !== oldRenderInfo.allLayersLoaded ||\n      // Some prop is in transition\n      renderInfo.layers.some(layer => layer.props.transitions);\n\n    this.channels[collisionGroup] = renderInfo;\n\n    if (needsRender) {\n      this.lastViewport = viewport;\n      const collisionFBO = this.collisionFBOs[collisionGroup];\n\n      // Rerender collision FBO\n      this.collisionFilterPass!.renderCollisionMap(collisionFBO, {\n        pass: 'collision-filter',\n        isPicking: true,\n        layers: renderInfo.layers,\n        effects,\n        layerFilter,\n        viewports: viewport ? [viewport] : [],\n        onViewportActive,\n        views,\n        moduleParameters: {\n          // To avoid feedback loop forming between Framebuffer and active Texture.\n          dummyCollisionMap: this.dummyCollisionMap,\n          devicePixelRatio: cssToDeviceRatio(collisionFBO.gl) / DOWNSCALE\n        }\n      });\n    }\n  }\n\n  /**\n   * Group layers by collisionGroup\n   * Returns a map from collisionGroup to render info\n   */\n  private _groupByCollisionGroup(\n    gl: WebGLRenderingContext,\n    collisionLayers: Layer<CollisionFilterExtensionProps>[]\n  ): Record<string, RenderInfo> {\n    const channelMap = {};\n    for (const layer of collisionLayers) {\n      const {collisionGroup} = layer.props;\n      let channelInfo = channelMap[collisionGroup];\n      if (!channelInfo) {\n        channelInfo = {collisionGroup, layers: [], layerBounds: [], allLayersLoaded: true};\n        channelMap[collisionGroup] = channelInfo;\n      }\n      channelInfo.layers.push(layer);\n      channelInfo.layerBounds.push(layer.getBounds());\n      if (!layer.isLoaded) {\n        channelInfo.allLayersLoaded = false;\n      }\n    }\n\n    // Create any new passes and remove any old ones\n    for (const collisionGroup of Object.keys(channelMap)) {\n      if (!this.collisionFBOs[collisionGroup]) {\n        this.createFBO(gl, collisionGroup);\n      }\n      if (!this.channels[collisionGroup]) {\n        this.channels[collisionGroup] = channelMap[collisionGroup];\n      }\n    }\n    for (const collisionGroup of Object.keys(this.collisionFBOs)) {\n      if (!channelMap[collisionGroup]) {\n        this.destroyFBO(collisionGroup);\n      }\n    }\n\n    return channelMap;\n  }\n\n  getModuleParameters(layer: Layer): {\n    collisionFBO: Framebuffer;\n    dummyCollisionMap: Texture2D;\n  } {\n    const {collisionGroup} = (layer as Layer<CollisionFilterExtensionProps>).props;\n    const {collisionFBOs, dummyCollisionMap} = this;\n    return {collisionFBO: collisionFBOs[collisionGroup], dummyCollisionMap};\n  }\n\n  cleanup(): void {\n    if (this.dummyCollisionMap) {\n      this.dummyCollisionMap.delete();\n      this.dummyCollisionMap = undefined;\n    }\n    this.channels = {};\n    for (const collisionGroup of Object.keys(this.collisionFBOs)) {\n      this.destroyFBO(collisionGroup);\n    }\n    this.collisionFBOs = {};\n    this.lastViewport = undefined;\n  }\n\n  createFBO(gl: WebGLRenderingContext, collisionGroup: string) {\n    const {width, height} = gl.canvas;\n    const collisionMap = new Texture2D(gl, {\n      width,\n      height,\n      parameters: {\n        [gl.TEXTURE_MIN_FILTER]: gl.NEAREST,\n        [gl.TEXTURE_MAG_FILTER]: gl.NEAREST,\n        [gl.TEXTURE_WRAP_S]: gl.CLAMP_TO_EDGE,\n        [gl.TEXTURE_WRAP_T]: gl.CLAMP_TO_EDGE\n      }\n    });\n\n    const depthBuffer = new Renderbuffer(gl, {format: gl.DEPTH_COMPONENT16, width, height});\n    this.collisionFBOs[collisionGroup] = new Framebuffer(gl, {\n      id: `Collision-${collisionGroup}`,\n      width,\n      height,\n      attachments: {\n        [gl.COLOR_ATTACHMENT0]: collisionMap,\n        [gl.DEPTH_ATTACHMENT]: depthBuffer\n      }\n    });\n  }\n\n  destroyFBO(collisionGroup: string) {\n    const fbo = this.collisionFBOs[collisionGroup];\n    for (const attachment of Object.values(fbo.attachments as Texture2D[])) {\n      attachment.delete();\n    }\n    fbo.delete();\n    delete this.collisionFBOs[collisionGroup];\n  }\n}\n"],"file":"collision-filter-effect.js"}

package/dist/esm/{collide/collide-pass.js → collision-filter/collision-filter-pass.js}

@@ -1,7 +1,7 @@
 import { withParameters } from '@luma.gl/core';
 import { _LayersPass as LayersPass } from '@deck.gl/core';
-export default class CollidePass extends LayersPass {
-  renderCollideMap(target, options) {
+export default class CollisionFilterPass extends LayersPass {
+  renderCollisionMap(target, options) {
     const gl = this.gl;
     const padding = 1;
     return withParameters(gl, {
@@ -13,13 +13,13 @@ export default class CollidePass extends LayersPass {
       depthRange: [0, 1]
     }, () => this.render({ ...options,
       target,
-      pass: 'collide'
+      pass: 'collision'
     }));
   }
 
   getModuleParameters() {
     return {
-      drawToCollideMap: true,
+      drawToCollisionMap: true,
       pickingActive: 1,
       pickingAttribute: false,
       lightSources: {}
@@ -27,4 +27,4 @@ export default class CollidePass extends LayersPass {
   }
 
 }
-//# sourceMappingURL=collide-pass.js.map
+//# sourceMappingURL=collision-filter-pass.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collision-filter/collision-filter-pass.ts"],"names":["withParameters","_LayersPass","LayersPass","CollisionFilterPass","renderCollisionMap","target","options","gl","padding","scissorTest","scissor","width","height","clearColor","blend","depthTest","depthRange","render","pass","getModuleParameters","drawToCollisionMap","pickingActive","pickingAttribute","lightSources"],"mappings":"AAAA,SAAqBA,cAArB,QAA0C,eAA1C;AACA,SAAQC,WAAW,IAAIC,UAAvB,QAAiE,eAAjE;AAIA,eAAe,MAAMC,mBAAN,SAAkCD,UAAlC,CAA6C;AAC1DE,EAAAA,kBAAkB,CAACC,MAAD,EAAsBC,OAAtB,EAAiE;AACjF,UAAMC,EAAE,GAAG,KAAKA,EAAhB;AAEA,UAAMC,OAAO,GAAG,CAAhB;AAEA,WAAOR,cAAc,CACnBO,EADmB,EAEnB;AACEE,MAAAA,WAAW,EAAE,IADf;AAEEC,MAAAA,OAAO,EAAE,CAACF,OAAD,EAAUA,OAAV,EAAmBH,MAAM,CAACM,KAAP,GAAe,IAAIH,OAAtC,EAA+CH,MAAM,CAACO,MAAP,GAAgB,IAAIJ,OAAnE,CAFX;AAGEK,MAAAA,UAAU,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAHd;AAIEC,MAAAA,KAAK,EAAE,KAJT;AAKEC,MAAAA,SAAS,EAAE,IALb;AAMEC,MAAAA,UAAU,EAAE,CAAC,CAAD,EAAI,CAAJ;AANd,KAFmB,EAUnB,MAAM,KAAKC,MAAL,CAAY,EAAC,GAAGX,OAAJ;AAAaD,MAAAA,MAAb;AAAqBa,MAAAA,IAAI,EAAE;AAA3B,KAAZ,CAVa,CAArB;AAYD;;AAEDC,EAAAA,mBAAmB,GAAG;AAEpB,WAAO;AACLC,MAAAA,kBAAkB,EAAE,IADf;AAELC,MAAAA,aAAa,EAAE,CAFV;AAGLC,MAAAA,gBAAgB,EAAE,KAHb;AAILC,MAAAA,YAAY,EAAE;AAJT,KAAP;AAMD;;AA5ByD","sourcesContent":["import {Framebuffer, withParameters} from '@luma.gl/core';\nimport {_LayersPass as LayersPass, LayersPassRenderOptions} from '@deck.gl/core';\n\ntype CollisionFilterPassRenderOptions = LayersPassRenderOptions & {};\n\nexport default class CollisionFilterPass extends LayersPass {\n  renderCollisionMap(target: Framebuffer, options: CollisionFilterPassRenderOptions) {\n    const gl = this.gl;\n\n    const padding = 1;\n\n    return withParameters(\n      gl,\n      {\n        scissorTest: true,\n        scissor: [padding, padding, target.width - 2 * padding, target.height - 2 * padding],\n        clearColor: [0, 0, 0, 0],\n        blend: false,\n        depthTest: true,\n        depthRange: [0, 1]\n      },\n      () => this.render({...options, target, pass: 'collision'})\n    );\n  }\n\n  getModuleParameters() {\n    // Draw picking colors into collision FBO\n    return {\n      drawToCollisionMap: true,\n      pickingActive: 1,\n      pickingAttribute: false,\n      lightSources: {}\n    };\n  }\n}\n"],"file":"collision-filter-pass.js"}

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

@@ -0,0 +1,78 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { LayerExtension } from '@deck.gl/core';
+import collision from './shader-module';
+import CollisionFilterEffect from './collision-filter-effect';
+const defaultProps = {
+  getCollisionPriority: {
+    type: 'accessor',
+    value: 0
+  },
+  collisionEnabled: true,
+  collisionGroup: {
+    type: 'string',
+    value: 'default'
+  },
+  collisionTestProps: {}
+};
+export default class CollisionFilterExtension extends LayerExtension {
+  getShaders() {
+    return {
+      modules: [collision]
+    };
+  }
+
+  draw({
+    uniforms,
+    context,
+    moduleParameters
+  }) {
+    const {
+      collisionEnabled
+    } = this.props;
+    const {
+      collisionFBO,
+      drawToCollisionMap
+    } = moduleParameters;
+    const enabled = collisionEnabled && Boolean(collisionFBO);
+    uniforms.collision_enabled = enabled;
+
+    if (drawToCollisionMap) {
+      this.props = this.clone(this.props.collisionTestProps).props;
+    }
+  }
+
+  initializeState(context, extension) {
+    var _this$context$deck;
+
+    if (this.getAttributeManager() === null) {
+      return;
+    }
+
+    (_this$context$deck = this.context.deck) === null || _this$context$deck === void 0 ? void 0 : _this$context$deck._addDefaultEffect(new CollisionFilterEffect());
+    const attributeManager = this.getAttributeManager();
+    attributeManager.add({
+      collisionPriorities: {
+        size: 1,
+        accessor: 'getCollisionPriority',
+        shaderAttributes: {
+          collisionPriorities: {
+            divisor: 0
+          },
+          instanceCollisionPriorities: {
+            divisor: 1
+          }
+        }
+      }
+    });
+  }
+
+  getNeedsPickingBuffer() {
+    return this.props.collisionEnabled;
+  }
+
+}
+
+_defineProperty(CollisionFilterExtension, "defaultProps", defaultProps);
+
+_defineProperty(CollisionFilterExtension, "extensionName", 'CollisionFilterExtension');
+//# sourceMappingURL=collision-filter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collision-filter/collision-filter.ts"],"names":["LayerExtension","collision","CollisionFilterEffect","defaultProps","getCollisionPriority","type","value","collisionEnabled","collisionGroup","collisionTestProps","CollisionFilterExtension","getShaders","modules","draw","uniforms","context","moduleParameters","props","collisionFBO","drawToCollisionMap","enabled","Boolean","collision_enabled","clone","initializeState","extension","getAttributeManager","deck","_addDefaultEffect","attributeManager","add","collisionPriorities","size","accessor","shaderAttributes","divisor","instanceCollisionPriorities","getNeedsPickingBuffer"],"mappings":";AAAA,SAAuCA,cAAvC,QAA4D,eAA5D;AACA,OAAOC,SAAP,MAAsB,iBAAtB;AACA,OAAOC,qBAAP,MAAkC,2BAAlC;AAEA,MAAMC,YAAY,GAAG;AACnBC,EAAAA,oBAAoB,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAE;AAA1B,GADH;AAEnBC,EAAAA,gBAAgB,EAAE,IAFC;AAGnBC,EAAAA,cAAc,EAAE;AAACH,IAAAA,IAAI,EAAE,QAAP;AAAiBC,IAAAA,KAAK,EAAE;AAAxB,GAHG;AAInBG,EAAAA,kBAAkB,EAAE;AAJD,CAArB;AA+BA,eAAe,MAAMC,wBAAN,SAAuCV,cAAvC,CAAsD;AAInEW,EAAAA,UAAU,GAAkD;AAC1D,WAAO;AAACC,MAAAA,OAAO,EAAE,CAACX,SAAD;AAAV,KAAP;AACD;;AAGDY,EAAAA,IAAI,CAA6C;AAACC,IAAAA,QAAD;AAAWC,IAAAA,OAAX;AAAoBC,IAAAA;AAApB,GAA7C,EAAyF;AAC3F,UAAM;AAACT,MAAAA;AAAD,QAAqB,KAAKU,KAAhC;AACA,UAAM;AAACC,MAAAA,YAAD;AAAeC,MAAAA;AAAf,QAAqCH,gBAA3C;AACA,UAAMI,OAAO,GAAGb,gBAAgB,IAAIc,OAAO,CAACH,YAAD,CAA3C;AACAJ,IAAAA,QAAQ,CAACQ,iBAAT,GAA6BF,OAA7B;;AAEA,QAAID,kBAAJ,EAAwB;AAGtB,WAAKF,KAAL,GAAa,KAAKM,KAAL,CAAW,KAAKN,KAAL,CAAWR,kBAAtB,EAA0CQ,KAAvD;AACD;AACF;;AAEDO,EAAAA,eAAe,CAEbT,OAFa,EAGbU,SAHa,EAIb;AAAA;;AACA,QAAI,KAAKC,mBAAL,OAA+B,IAAnC,EAAyC;AACvC;AACD;;AACD,+BAAKX,OAAL,CAAaY,IAAb,0EAAmBC,iBAAnB,CAAqC,IAAI1B,qBAAJ,EAArC;AACA,UAAM2B,gBAAgB,GAAG,KAAKH,mBAAL,EAAzB;AACAG,IAAAA,gBAAgB,CAAEC,GAAlB,CAAsB;AACpBC,MAAAA,mBAAmB,EAAE;AACnBC,QAAAA,IAAI,EAAE,CADa;AAEnBC,QAAAA,QAAQ,EAAE,sBAFS;AAGnBC,QAAAA,gBAAgB,EAAE;AAChBH,UAAAA,mBAAmB,EAAE;AAACI,YAAAA,OAAO,EAAE;AAAV,WADL;AAEhBC,UAAAA,2BAA2B,EAAE;AAACD,YAAAA,OAAO,EAAE;AAAV;AAFb;AAHC;AADD,KAAtB;AAUD;;AAEDE,EAAAA,qBAAqB,GAAsD;AACzE,WAAO,KAAKpB,KAAL,CAAWV,gBAAlB;AACD;;AA9CkE;;gBAAhDG,wB,kBACGP,Y;;gBADHO,wB,mBAEI,0B","sourcesContent":["import {Accessor, Layer, LayerContext, LayerExtension} from '@deck.gl/core';\nimport collision from './shader-module';\nimport CollisionFilterEffect from './collision-filter-effect';\n\nconst defaultProps = {\n  getCollisionPriority: {type: 'accessor', value: 0},\n  collisionEnabled: true,\n  collisionGroup: {type: 'string', value: 'default'},\n  collisionTestProps: {}\n};\n\nexport type CollisionFilterExtensionProps<DataT = any> = {\n  /**\n   * Accessor for collision priority. Must return a number in the range -1000 -> 1000. Features with higher values are shown preferentially.\n   */\n  getCollisionPriority?: Accessor<DataT, number>;\n\n  /**\n   * Enable/disable collisions. If collisions are disabled, all objects are rendered.\n   * @default true\n   */\n  collisionEnabled: boolean;\n\n  /**\n   * Collision group this layer belongs to. If it is not set, the 'default' collision group is used\n   */\n  collisionGroup?: string;\n\n  /**\n   * Props to override when rendering collision map\n   */\n  collisionTestProps?: {};\n};\n\n/** Allows layers to hide overlapping objects. */\nexport default class CollisionFilterExtension extends LayerExtension {\n  static defaultProps = defaultProps;\n  static extensionName = 'CollisionFilterExtension';\n\n  getShaders(this: Layer<CollisionFilterExtensionProps>): any {\n    return {modules: [collision]};\n  }\n\n  /* eslint-disable camelcase */\n  draw(this: Layer<CollisionFilterExtensionProps>, {uniforms, context, moduleParameters}: any) {\n    const {collisionEnabled} = this.props;\n    const {collisionFBO, drawToCollisionMap} = moduleParameters;\n    const enabled = collisionEnabled && Boolean(collisionFBO);\n    uniforms.collision_enabled = enabled;\n\n    if (drawToCollisionMap) {\n      // Override any props with those defined in collisionTestProps\n      // @ts-ignore\n      this.props = this.clone(this.props.collisionTestProps).props;\n    }\n  }\n\n  initializeState(\n    this: Layer<CollisionFilterExtensionProps>,\n    context: LayerContext,\n    extension: this\n  ) {\n    if (this.getAttributeManager() === null) {\n      return;\n    }\n    this.context.deck?._addDefaultEffect(new CollisionFilterEffect());\n    const attributeManager = this.getAttributeManager();\n    attributeManager!.add({\n      collisionPriorities: {\n        size: 1,\n        accessor: 'getCollisionPriority',\n        shaderAttributes: {\n          collisionPriorities: {divisor: 0},\n          instanceCollisionPriorities: {divisor: 1}\n        }\n      }\n    });\n  }\n\n  getNeedsPickingBuffer(this: Layer<CollisionFilterExtensionProps>): boolean {\n    return this.props.collisionEnabled;\n  }\n}\n"],"file":"collision-filter.js"}

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

@@ -0,0 +1,32 @@
+import { project } from '@deck.gl/core';
+const vs = "\n#ifdef NON_INSTANCED_MODEL\nattribute float collisionPriorities;\n#else\nattribute float instanceCollisionPriorities;\n#endif\n\nuniform sampler2D collision_texture;\nuniform bool collision_sort;\nuniform bool collision_enabled;\n\nvec2 collision_getCoords(vec4 position) {\n  vec4 collision_clipspace = project_common_position_to_clipspace(position);\n  return (1.0 + collision_clipspace.xy / collision_clipspace.w) / 2.0;\n}\n\nfloat collision_match(vec2 tex, vec3 pickingColor) {\n  vec4 collision_pickingColor = texture2D(collision_texture, tex);\n  float delta = dot(abs(collision_pickingColor.rgb - pickingColor), vec3(1.0));\n  float e = 0.001;\n  return step(delta, e);\n}\n\nfloat collision_isVisible(vec2 texCoords, vec3 pickingColor) {\n  if (!collision_enabled) {\n    return 1.0;\n  }\n\n  // Visibility test, sample area of 5x5 pixels in order to fade in/out.\n  // Due to the locality, the lookups will be cached\n  // This reduces the flicker present when objects are shown/hidden\n  const int N = 2;\n  float accumulator = 0.0;\n  vec2 step = vec2(1.0 / project_uViewportSize);\n\n  const float floatN = float(N);\n  vec2 delta = -floatN * step;\n  for(int i = -N; i <= N; i++) {\n    delta.x = -step.x * floatN;\n    for(int j = -N; j <= N; j++) {\n      accumulator += collision_match(texCoords + delta, pickingColor);\n      delta.x += step.x;\n    }\n    delta.y += step.y;\n  }\n\n  float W = 2.0 * floatN + 1.0;\n  return pow(accumulator / (W * W), 2.2);\n}\n";
+const inject = {
+  'vs:#decl': "\n  float collision_fade = 1.0;\n",
+  'vs:DECKGL_FILTER_GL_POSITION': "\n  if (collision_sort) {\n    #ifdef NON_INSTANCED_MODEL\n    float collisionPriority = collisionPriorities;\n    #else\n    float collisionPriority = instanceCollisionPriorities;\n    #endif\n    position.z = -0.001 * collisionPriority * position.w; // Support range -1000 -> 1000\n  }\n\n  if (collision_enabled) {\n    vec4 collision_common_position = project_position(vec4(geometry.worldPosition, 1.0));\n    vec2 collision_texCoords = collision_getCoords(collision_common_position);\n    collision_fade = collision_isVisible(collision_texCoords, geometry.pickingColor / 255.0);\n    if (collision_fade < 0.0001) {\n      position = vec4(0.);\n    }\n  }\n  ",
+  'vs:DECKGL_FILTER_COLOR': "\n  color.a *= collision_fade;\n  "
+};
+
+const getCollisionUniforms = (opts, uniforms) => {
+  if (!opts || !('dummyCollisionMap' in opts)) {
+    return {};
+  }
+
+  const {
+    collisionFBO,
+    drawToCollisionMap,
+    dummyCollisionMap
+  } = opts;
+  return {
+    collision_sort: Boolean(drawToCollisionMap),
+    collision_texture: !drawToCollisionMap && collisionFBO ? collisionFBO : dummyCollisionMap
+  };
+};
+
+export default {
+  name: 'collision',
+  dependencies: [project],
+  vs,
+  inject,
+  getUniforms: getCollisionUniforms
+};
+//# sourceMappingURL=shader-module.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collision-filter/shader-module.ts"],"names":["project","vs","inject","getCollisionUniforms","opts","uniforms","collisionFBO","drawToCollisionMap","dummyCollisionMap","collision_sort","Boolean","collision_texture","name","dependencies","getUniforms"],"mappings":"AACA,SAAQA,OAAR,QAAsB,eAAtB;AAGA,MAAMC,EAAE,i9CAAR;AAmDA,MAAMC,MAAM,GAAG;AACb,iDADa;AAIb,2rBAJa;AAuBb;AAvBa,CAAf;;AAqCA,MAAMC,oBAAoB,GAAG,CAC3BC,IAD2B,EAE3BC,QAF2B,KAGL;AACtB,MAAI,CAACD,IAAD,IAAS,EAAE,uBAAuBA,IAAzB,CAAb,EAA6C;AAC3C,WAAO,EAAP;AACD;;AACD,QAAM;AAACE,IAAAA,YAAD;AAAeC,IAAAA,kBAAf;AAAmCC,IAAAA;AAAnC,MAAwDJ,IAA9D;AACA,SAAO;AACLK,IAAAA,cAAc,EAAEC,OAAO,CAACH,kBAAD,CADlB;AAELI,IAAAA,iBAAiB,EAAE,CAACJ,kBAAD,IAAuBD,YAAvB,GAAsCA,YAAtC,GAAqDE;AAFnE,GAAP;AAID,CAZD;;AAcA,eAAe;AACbI,EAAAA,IAAI,EAAE,WADO;AAEbC,EAAAA,YAAY,EAAE,CAACb,OAAD,CAFD;AAGbC,EAAAA,EAHa;AAIbC,EAAAA,MAJa;AAKbY,EAAAA,WAAW,EAAEX;AALA,CAAf","sourcesContent":["import {Framebuffer, Texture2D} from '@luma.gl/core';\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nconst vs = `\n#ifdef NON_INSTANCED_MODEL\nattribute float collisionPriorities;\n#else\nattribute float instanceCollisionPriorities;\n#endif\n\nuniform sampler2D collision_texture;\nuniform bool collision_sort;\nuniform bool collision_enabled;\n\nvec2 collision_getCoords(vec4 position) {\n  vec4 collision_clipspace = project_common_position_to_clipspace(position);\n  return (1.0 + collision_clipspace.xy / collision_clipspace.w) / 2.0;\n}\n\nfloat collision_match(vec2 tex, vec3 pickingColor) {\n  vec4 collision_pickingColor = texture2D(collision_texture, tex);\n  float delta = dot(abs(collision_pickingColor.rgb - pickingColor), vec3(1.0));\n  float e = 0.001;\n  return step(delta, e);\n}\n\nfloat collision_isVisible(vec2 texCoords, vec3 pickingColor) {\n  if (!collision_enabled) {\n    return 1.0;\n  }\n\n  // Visibility test, sample area of 5x5 pixels in order to fade in/out.\n  // Due to the locality, the lookups will be cached\n  // This reduces the flicker present when objects are shown/hidden\n  const int N = 2;\n  float accumulator = 0.0;\n  vec2 step = vec2(1.0 / project_uViewportSize);\n\n  const float floatN = float(N);\n  vec2 delta = -floatN * step;\n  for(int i = -N; i <= N; i++) {\n    delta.x = -step.x * floatN;\n    for(int j = -N; j <= N; j++) {\n      accumulator += collision_match(texCoords + delta, pickingColor);\n      delta.x += step.x;\n    }\n    delta.y += step.y;\n  }\n\n  float W = 2.0 * floatN + 1.0;\n  return pow(accumulator / (W * W), 2.2);\n}\n`;\n\nconst inject = {\n  'vs:#decl': `\n  float collision_fade = 1.0;\n`,\n  'vs:DECKGL_FILTER_GL_POSITION': `\n  if (collision_sort) {\n    #ifdef NON_INSTANCED_MODEL\n    float collisionPriority = collisionPriorities;\n    #else\n    float collisionPriority = instanceCollisionPriorities;\n    #endif\n    position.z = -0.001 * collisionPriority * position.w; // Support range -1000 -> 1000\n  }\n\n  if (collision_enabled) {\n    vec4 collision_common_position = project_position(vec4(geometry.worldPosition, 1.0));\n    vec2 collision_texCoords = collision_getCoords(collision_common_position);\n    collision_fade = collision_isVisible(collision_texCoords, geometry.pickingColor / 255.0);\n    if (collision_fade < 0.0001) {\n      position = vec4(0.);\n    }\n  }\n  `,\n  'vs:DECKGL_FILTER_COLOR': `\n  color.a *= collision_fade;\n  `\n};\n\ntype CollisionModuleSettings = {\n  collisionFBO?: Framebuffer;\n  drawToCollisionMap?: boolean;\n  dummyCollisionMap?: Texture2D;\n};\n\n/* eslint-disable camelcase */\ntype CollisionUniforms = {collision_sort?: boolean; collision_texture?: Framebuffer | Texture2D};\n\nconst getCollisionUniforms = (\n  opts: CollisionModuleSettings | {},\n  uniforms: Record<string, any>\n): CollisionUniforms => {\n  if (!opts || !('dummyCollisionMap' in opts)) {\n    return {};\n  }\n  const {collisionFBO, drawToCollisionMap, dummyCollisionMap} = opts;\n  return {\n    collision_sort: Boolean(drawToCollisionMap),\n    collision_texture: !drawToCollisionMap && collisionFBO ? collisionFBO : dummyCollisionMap\n  };\n};\n\nexport default {\n  name: 'collision',\n  dependencies: [project],\n  vs,\n  inject,\n  getUniforms: getCollisionUniforms\n} as ShaderModule;\n"],"file":"shader-module.js"}

package/dist/esm/index.js

@@ -4,8 +4,8 @@ export { default as Fp64Extension } from './fp64/fp64';
 export { default as PathStyleExtension } from './path-style/path-style';
 export { default as FillStyleExtension } from './fill-style/fill-style';
 export { default as ClipExtension } from './clip/clip';
-export { default as CollideExtension } from './collide/collide';
+export { default as CollisionFilterExtension } from './collision-filter/collision-filter';
 export { default as MaskExtension } from './mask/mask';
-export { default as TerrainExtension } from './terrain/terrain';
+export { default as _TerrainExtension } from './terrain/terrain';
 export { default as project64 } from './fp64/project64';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","CollideExtension","MaskExtension","TerrainExtension","project64"],"mappings":"AAAA,SAAQA,OAAO,IAAIC,iBAAnB,QAA2C,qBAA3C;AACA,SAAQD,OAAO,IAAIE,mBAAnB,QAA6C,2BAA7C;AACA,SAAQF,OAAO,IAAIG,aAAnB,QAAuC,aAAvC;AACA,SAAQH,OAAO,IAAII,kBAAnB,QAA4C,yBAA5C;AACA,SAAQJ,OAAO,IAAIK,kBAAnB,QAA4C,yBAA5C;AACA,SAAQL,OAAO,IAAIM,aAAnB,QAAuC,aAAvC;AACA,SAAQN,OAAO,IAAIO,gBAAnB,QAA0C,mBAA1C;AACA,SAAQP,OAAO,IAAIQ,aAAnB,QAAuC,aAAvC;AACA,SAAQR,OAAO,IAAIS,gBAAnB,QAA0C,mBAA1C;AAGA,SAAQT,OAAO,IAAIU,SAAnB,QAAmC,kBAAnC","sourcesContent":["export {default as BrushingExtension} from './brushing/brushing';\nexport {default as DataFilterExtension} from './data-filter/data-filter';\nexport {default as Fp64Extension} from './fp64/fp64';\nexport {default as PathStyleExtension} from './path-style/path-style';\nexport {default as FillStyleExtension} from './fill-style/fill-style';\nexport {default as ClipExtension} from './clip/clip';\nexport {default as CollideExtension} from './collide/collide';\nexport {default as MaskExtension} from './mask/mask';\nexport {default as TerrainExtension} from './terrain/terrain';\n\n// Shader module\nexport {default as project64} from './fp64/project64';\n\n// Types\nexport type {BrushingExtensionProps} from './brushing/brushing';\nexport type {DataFilterExtensionProps} from './data-filter/data-filter';\nexport type {PathStyleExtensionProps} from './path-style/path-style';\nexport type {FillStyleExtensionProps} from './fill-style/fill-style';\nexport type {ClipExtensionProps} from './clip/clip';\nexport type {CollideExtensionProps} from './collide/collide';\nexport type {MaskExtensionProps} from './mask/mask';\nexport type {TerrainExtensionProps} from './terrain/terrain';\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/index.ts"],"names":["default","BrushingExtension","DataFilterExtension","Fp64Extension","PathStyleExtension","FillStyleExtension","ClipExtension","CollisionFilterExtension","MaskExtension","_TerrainExtension","project64"],"mappings":"AAAA,SAAQA,OAAO,IAAIC,iBAAnB,QAA2C,qBAA3C;AACA,SAAQD,OAAO,IAAIE,mBAAnB,QAA6C,2BAA7C;AACA,SAAQF,OAAO,IAAIG,aAAnB,QAAuC,aAAvC;AACA,SAAQH,OAAO,IAAII,kBAAnB,QAA4C,yBAA5C;AACA,SAAQJ,OAAO,IAAIK,kBAAnB,QAA4C,yBAA5C;AACA,SAAQL,OAAO,IAAIM,aAAnB,QAAuC,aAAvC;AACA,SAAQN,OAAO,IAAIO,wBAAnB,QAAkD,qCAAlD;AACA,SAAQP,OAAO,IAAIQ,aAAnB,QAAuC,aAAvC;AACA,SAAQR,OAAO,IAAIS,iBAAnB,QAA2C,mBAA3C;AAGA,SAAQT,OAAO,IAAIU,SAAnB,QAAmC,kBAAnC","sourcesContent":["export {default as BrushingExtension} from './brushing/brushing';\nexport {default as DataFilterExtension} from './data-filter/data-filter';\nexport {default as Fp64Extension} from './fp64/fp64';\nexport {default as PathStyleExtension} from './path-style/path-style';\nexport {default as FillStyleExtension} from './fill-style/fill-style';\nexport {default as ClipExtension} from './clip/clip';\nexport {default as CollisionFilterExtension} from './collision-filter/collision-filter';\nexport {default as MaskExtension} from './mask/mask';\nexport {default as _TerrainExtension} from './terrain/terrain';\n\n// Shader module\nexport {default as project64} from './fp64/project64';\n\n// Types\nexport type {BrushingExtensionProps} from './brushing/brushing';\nexport type {DataFilterExtensionProps} from './data-filter/data-filter';\nexport type {PathStyleExtensionProps} from './path-style/path-style';\nexport type {FillStyleExtensionProps} from './fill-style/fill-style';\nexport type {ClipExtensionProps} from './clip/clip';\nexport type {CollisionFilterExtensionProps} from './collision-filter/collision-filter';\nexport type {MaskExtensionProps} from './mask/mask';\nexport type {TerrainExtensionProps} from './terrain/terrain';\n"],"file":"index.js"}

package/dist/esm/mask/mask-effect.js

@@ -3,7 +3,7 @@ import { log } from '@deck.gl/core';
 import { Texture2D } from '@luma.gl/core';
 import { equals } from '@math.gl/core';
 import MaskPass from './mask-pass';
-import { getMaskBounds, getMaskViewport } from './utils';
+import { joinLayerBounds, getRenderBounds, makeViewport } from '../utils/projection-utils';
 export default class MaskEffect {
   constructor() {
     _defineProperty(this, "id", 'mask-effect');
@@ -74,6 +74,13 @@ export default class MaskEffect {
     const viewport = viewports[0];
     const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport);
 
+    if (viewport.resolution !== undefined) {
+      log.warn('MaskExtension is not supported in GlobeView')();
+      return {
+        didRender
+      };
+    }
+
     for (const maskId in channelMap) {
       const result = this._renderChannel(channelMap[maskId], {
         layerFilter,
@@ -112,21 +119,20 @@ export default class MaskEffect {
 
     if (maskChanged || viewportChanged) {
       this.lastViewport = viewport;
-      channelInfo.bounds = getMaskBounds({
-        layers: channelInfo.layers,
-        viewport
-      });
+      const layerBounds = joinLayerBounds(channelInfo.layers, viewport);
+      channelInfo.bounds = layerBounds && getRenderBounds(layerBounds, viewport);
 
       if (maskChanged || !equals(channelInfo.bounds, oldChannelInfo.bounds)) {
         const {
           maskPass,
           maskMap
         } = this;
-        const maskViewport = getMaskViewport({
+        const maskViewport = layerBounds && makeViewport({
           bounds: channelInfo.bounds,
           viewport,
           width: maskMap.width,
-          height: maskMap.height
+          height: maskMap.height,
+          border: 1
         });
         channelInfo.maskBounds = maskViewport ? maskViewport.getBounds() : [0, 0, 1, 1];
         maskPass.render({