@deck.gl/extensions 9.3.2 → 9.3.4

package/dist/dist.dev.js

@@ -4254,6 +4254,7 @@ in vec2 mask_texCoords;
       viewports,
       onViewportActive,
       views,
+      effects,
       isPicking
     }) {
       let didRender = false;
@@ -4279,6 +4280,7 @@ in vec2 mask_texCoords;
           layerFilter,
           onViewportActive,
           views,
+          effects,
           viewport,
           viewportChanged
         });
@@ -4291,6 +4293,7 @@ in vec2 mask_texCoords;
       layerFilter,
       onViewportActive,
       views,
+      effects,
       viewport,
       viewportChanged
     }) {
@@ -4339,6 +4342,7 @@ in vec2 mask_texCoords;
             viewports: maskViewport ? [maskViewport] : [],
             onViewportActive,
             views,
+            effects,
             shaderModuleProps: {
               project: {
                 devicePixelRatio: 1
@@ -4581,7 +4585,10 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
     },
     // eslint-disable-next-line complexity
     getUniforms: (opts = {}) => {
-      if ("dummyHeightMap" in opts) {
+      if (!opts.dummyHeightMap) {
+        return {};
+      }
+      if ("terrainSkipRender" in opts || "drawToTerrainHeightMap" in opts) {
         const {
           drawToTerrainHeightMap,
           heightMap,
@@ -4605,18 +4612,16 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
           bounds = heightMapBounds;
         } else if (terrainCover) {
           const fbo = opts.isPicking ? terrainCover.getPickingFramebuffer() : terrainCover.getRenderFramebuffer();
-          sampler = fbo?.colorAttachments[0].texture;
+          const coverTexture = fbo?.colorAttachments[0].texture;
           if (opts.isPicking) {
             mode = TERRAIN_MODE.SKIP;
           }
-          if (sampler) {
+          if (coverTexture) {
+            sampler = coverTexture;
             mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;
             bounds = terrainCover.bounds;
-          } else {
-            sampler = dummyHeightMap;
-            if (opts.isPicking && !terrainSkipRender) {
-              mode = TERRAIN_MODE.NONE;
-            }
+          } else if (opts.isPicking && !terrainSkipRender) {
+            mode = TERRAIN_MODE.NONE;
           }
         }
         return {
@@ -4631,7 +4636,11 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
           ] : [0, 0, 0, 0]
         };
       }
-      return {};
+      return {
+        mode: TERRAIN_MODE.NONE,
+        terrain_map: opts.dummyHeightMap,
+        bounds: [0, 0, 0, 0]
+      };
     },
     uniformTypes: {
       mode: "f32",
@@ -5541,7 +5550,6 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         target,
         pass: `terrain-cover-${terrainCover.id}`,
         layers,
-        effects: [],
         viewports: [viewport],
         clearColor: [0, 0, 0, 0]
       });
@@ -5610,7 +5618,6 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         pickingFBO: target,
         pass: `terrain-cover-picking-${terrainCover.id}`,
         layers,
-        effects: [],
         viewports: [viewport],
         // Disable the default culling because TileLayer would cull sublayers based on the screen viewport,
         // not the viewport of the terrain cover. Culling is already done by `terrainCover.filterLayers`
@@ -5786,9 +5793,20 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         }
       }
       const drapeLayers = layers.filter((l) => l.state.terrainDrawMode === "drape");
-      this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
+      const nonTerrainEffects = opts.effects?.filter((e) => e !== this);
+      this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, {
+        ...opts,
+        effects: nonTerrainEffects
+      });
     }
     getShaderModuleProps(layer, otherShaderModuleProps) {
+      if (layer.props.operation.includes("mask")) {
+        return {
+          terrain: {
+            dummyHeightMap: this.dummyHeightMap
+          }
+        };
+      }
       const { terrainDrawMode } = layer.state;
       const terrainCover = this.isDrapingEnabled ? this.terrainCovers.get(layer.id) ?? null : null;
       if (this.isPicking && layer.props.operation.includes("terrain")) {

package/dist/index.cjs

@@ -2489,7 +2489,7 @@ var MaskEffect = class {
     this.maskPass = new MaskPass(device, { id: "default-mask" });
     this.maskMap = this.maskPass.maskMap;
   }
-  preRender({ layers, layerFilter, viewports, onViewportActive, views, isPicking }) {
+  preRender({ layers, layerFilter, viewports, onViewportActive, views, effects, isPicking }) {
     let didRender = false;
     if (isPicking) {
       return { didRender };
@@ -2513,6 +2513,7 @@ var MaskEffect = class {
         layerFilter,
         onViewportActive,
         views,
+        effects,
         viewport,
         viewportChanged
       });
@@ -2521,7 +2522,7 @@ var MaskEffect = class {
     return { didRender };
   }
   /* eslint-disable-next-line complexity */
-  _renderChannel(channelInfo, { layerFilter, onViewportActive, views, viewport, viewportChanged }) {
+  _renderChannel(channelInfo, { layerFilter, onViewportActive, views, effects, viewport, viewportChanged }) {
     let didRender = false;
     const oldChannelInfo = this.channels[channelInfo.index];
     if (!oldChannelInfo) {
@@ -2565,6 +2566,7 @@ var MaskEffect = class {
           viewports: maskViewport ? [maskViewport] : [],
           onViewportActive,
           views,
+          effects,
           shaderModuleProps: {
             project: {
               devicePixelRatio: 1
@@ -2809,7 +2811,10 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
   },
   // eslint-disable-next-line complexity
   getUniforms: (opts = {}) => {
-    if ("dummyHeightMap" in opts) {
+    if (!opts.dummyHeightMap) {
+      return {};
+    }
+    if ("terrainSkipRender" in opts || "drawToTerrainHeightMap" in opts) {
       const { drawToTerrainHeightMap, heightMap, heightMapBounds, dummyHeightMap, terrainCover, useTerrainHeightMap, terrainSkipRender } = opts;
       const projectUniforms = import_core22.project.getUniforms(opts.project);
       const { commonOrigin } = projectUniforms;
@@ -2825,18 +2830,16 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         bounds = heightMapBounds;
       } else if (terrainCover) {
         const fbo = opts.isPicking ? terrainCover.getPickingFramebuffer() : terrainCover.getRenderFramebuffer();
-        sampler = fbo == null ? void 0 : fbo.colorAttachments[0].texture;
+        const coverTexture = fbo == null ? void 0 : fbo.colorAttachments[0].texture;
         if (opts.isPicking) {
           mode = TERRAIN_MODE.SKIP;
         }
-        if (sampler) {
+        if (coverTexture) {
+          sampler = coverTexture;
           mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;
           bounds = terrainCover.bounds;
-        } else {
-          sampler = dummyHeightMap;
-          if (opts.isPicking && !terrainSkipRender) {
-            mode = TERRAIN_MODE.NONE;
-          }
+        } else if (opts.isPicking && !terrainSkipRender) {
+          mode = TERRAIN_MODE.NONE;
         }
       }
       return {
@@ -2851,7 +2854,11 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         ] : [0, 0, 0, 0]
       };
     }
-    return {};
+    return {
+      mode: TERRAIN_MODE.NONE,
+      terrain_map: opts.dummyHeightMap,
+      bounds: [0, 0, 0, 0]
+    };
   },
   uniformTypes: {
     mode: "f32",
@@ -3103,7 +3110,6 @@ var TerrainPass = class extends import_core23._LayersPass {
       target,
       pass: `terrain-cover-${terrainCover.id}`,
       layers,
-      effects: [],
       viewports: [viewport],
       clearColor: [0, 0, 0, 0]
     });
@@ -3167,7 +3173,6 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
       pickingFBO: target,
       pass: `terrain-cover-picking-${terrainCover.id}`,
       layers,
-      effects: [],
       viewports: [viewport],
       // Disable the default culling because TileLayer would cull sublayers based on the screen viewport,
       // not the viewport of the terrain cover. Culling is already done by `terrainCover.filterLayers`
@@ -3309,6 +3314,7 @@ var TerrainEffect = class {
     deck._addDefaultShaderModule(terrainModule);
   }
   preRender(opts) {
+    var _a;
     if (opts.pickZ) {
       this.isDrapingEnabled = false;
       return;
@@ -3330,10 +3336,21 @@ var TerrainEffect = class {
       }
     }
     const drapeLayers = layers.filter((l) => l.state.terrainDrawMode === "drape");
-    this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
+    const nonTerrainEffects = (_a = opts.effects) == null ? void 0 : _a.filter((e) => e !== this);
+    this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, {
+      ...opts,
+      effects: nonTerrainEffects
+    });
   }
   getShaderModuleProps(layer, otherShaderModuleProps) {
     var _a, _b, _c;
+    if (layer.props.operation.includes("mask")) {
+      return {
+        terrain: {
+          dummyHeightMap: this.dummyHeightMap
+        }
+      };
+    }
     const { terrainDrawMode } = layer.state;
     const terrainCover = this.isDrapingEnabled ? this.terrainCovers.get(layer.id) ?? null : null;
     if (this.isPicking && layer.props.operation.includes("terrain")) {