@deck.gl/extensions 9.2.11 → 9.3.0-alpha.1

package/dist/dist.dev.js

@@ -4061,6 +4061,9 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
             bounds = terrainCover.bounds;
           } else {
             sampler = dummyHeightMap;
+            if (opts.isPicking && !terrainSkipRender) {
+              mode = TERRAIN_MODE.NONE;
+            }
           }
         }
         return {
@@ -5047,6 +5050,8 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         layers.unshift(terrainLayer);
       }
       target.resize(viewport);
+      const terrainParams = this.drawParameters[terrainLayer.id];
+      const terrainAlpha = terrainParams?.blendColor?.[3] ?? 0;
       this.render({
         ...opts,
         pickingFBO: target,
@@ -5058,7 +5063,8 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         // not the viewport of the terrain cover. Culling is already done by `terrainCover.filterLayers`
         cullRect: void 0,
         deviceRect: viewport,
-        pickZ: false
+        pickZ: false,
+        clearColor: [0, 0, 0, terrainAlpha]
       });
     }
     getLayerParameters(layer, layerIndex, viewport) {
@@ -5069,7 +5075,7 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
         parameters2 = super.getLayerParameters(layer, layerIndex, viewport);
         parameters2.blend = true;
       }
-      return { ...parameters2, depthCompare: "always" };
+      return { ...parameters2, depthCompare: "always", blendAlphaSrcFactor: "constant" };
     }
     getShaderModuleProps(layer, effects, otherShaderModuleProps) {
       const base = super.getShaderModuleProps(layer, effects, otherShaderModuleProps);
@@ -5231,6 +5237,10 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
     }
     getShaderModuleProps(layer, otherShaderModuleProps) {
       const { terrainDrawMode } = layer.state;
+      const terrainCover = this.isDrapingEnabled ? this.terrainCovers.get(layer.id) ?? null : null;
+      if (this.isPicking && layer.props.operation.includes("terrain")) {
+        layer.state._hasPickingCover = Boolean(terrainCover?.getPickingFramebuffer());
+      }
       return {
         terrain: {
           project: otherShaderModuleProps.project,
@@ -5238,7 +5248,7 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
           heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
           heightMapBounds: this.heightMap?.bounds,
           dummyHeightMap: this.dummyHeightMap,
-          terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
+          terrainCover,
           useTerrainHeightMap: terrainDrawMode === "offset",
           terrainSkipRender: terrainDrawMode === "drape" || !layer.props.operation.includes("draw")
         }

package/dist/index.cjs

@@ -2550,6 +2550,9 @@ if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_US
           bounds = terrainCover.bounds;
         } else {
           sampler = dummyHeightMap;
+          if (opts.isPicking && !terrainSkipRender) {
+            mode = TERRAIN_MODE.NONE;
+          }
         }
       }
       return {
@@ -2861,6 +2864,7 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
     return result;
   }
   renderTerrainCover(terrainCover, opts) {
+    var _a;
     const target = terrainCover.getPickingFramebuffer();
     const viewport = terrainCover.renderViewport;
     if (!target || !viewport) {
@@ -2872,6 +2876,8 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
       layers.unshift(terrainLayer);
     }
     target.resize(viewport);
+    const terrainParams = this.drawParameters[terrainLayer.id];
+    const terrainAlpha = ((_a = terrainParams == null ? void 0 : terrainParams.blendColor) == null ? void 0 : _a[3]) ?? 0;
     this.render({
       ...opts,
       pickingFBO: target,
@@ -2883,7 +2889,8 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
       // not the viewport of the terrain cover. Culling is already done by `terrainCover.filterLayers`
       cullRect: void 0,
       deviceRect: viewport,
-      pickZ: false
+      pickZ: false,
+      clearColor: [0, 0, 0, terrainAlpha]
     });
   }
   getLayerParameters(layer, layerIndex, viewport) {
@@ -2894,7 +2901,7 @@ var TerrainPickingPass = class extends import_core24._PickLayersPass {
       parameters2 = super.getLayerParameters(layer, layerIndex, viewport);
       parameters2.blend = true;
     }
-    return { ...parameters2, depthCompare: "always" };
+    return { ...parameters2, depthCompare: "always", blendAlphaSrcFactor: "constant" };
   }
   getShaderModuleProps(layer, effects, otherShaderModuleProps) {
     const base = super.getShaderModuleProps(layer, effects, otherShaderModuleProps);
@@ -3044,6 +3051,10 @@ var TerrainEffect = class {
   getShaderModuleProps(layer, otherShaderModuleProps) {
     var _a, _b, _c;
     const { terrainDrawMode } = layer.state;
+    const terrainCover = this.isDrapingEnabled ? this.terrainCovers.get(layer.id) ?? null : null;
+    if (this.isPicking && layer.props.operation.includes("terrain")) {
+      layer.state._hasPickingCover = Boolean(terrainCover == null ? void 0 : terrainCover.getPickingFramebuffer());
+    }
     return {
       terrain: {
         project: otherShaderModuleProps.project,
@@ -3051,7 +3062,7 @@ var TerrainEffect = class {
         heightMap: ((_b = (_a = this.heightMap) == null ? void 0 : _a.getRenderFramebuffer()) == null ? void 0 : _b.colorAttachments[0].texture) || null,
         heightMapBounds: (_c = this.heightMap) == null ? void 0 : _c.bounds,
         dummyHeightMap: this.dummyHeightMap,
-        terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
+        terrainCover,
         useTerrainHeightMap: terrainDrawMode === "offset",
         terrainSkipRender: terrainDrawMode === "drape" || !layer.props.operation.includes("draw")
       }