@deck.gl/extensions 9.0.0-beta.9 → 9.0.0

package/dist/mask/mask-effect.d.ts

@@ -1,9 +1,9 @@
-import { Effect, PreRenderOptions, CoordinateSystem } from '@deck.gl/core';
-import type { Device, Texture } from '@luma.gl/core';
+import { Effect, EffectContext, PreRenderOptions, CoordinateSystem } from '@deck.gl/core';
+import type { Texture } from '@luma.gl/core';
 import { Bounds } from "../utils/projection-utils.js";
 type Mask = {
     /** The channel index */
-    index: number;
+    index: 0 | 1 | 2 | 3;
     bounds: Bounds;
     coordinateOrigin: [number, number, number];
     coordinateSystem: CoordinateSystem;
@@ -22,7 +22,8 @@ export default class MaskEffect implements Effect {
     private maskPass?;
     private maskMap?;
     private lastViewport?;
-    preRender(device: Device, { layers, layerFilter, viewports, onViewportActive, views, isPicking }: PreRenderOptions): MaskPreRenderStats;
+    setup({ device }: EffectContext): void;
+    preRender({ layers, layerFilter, viewports, onViewportActive, views, isPicking }: PreRenderOptions): MaskPreRenderStats;
     private _renderChannel;
     /**
      * Find a channel to render each mask into

package/dist/mask/mask-effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mask-effect.d.ts","sourceRoot":"","sources":["../../src/mask/mask-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAM,MAAM,eAAe,CAAC;AAC/F,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAGjG,KAAK,IAAI,GAAG;IACV,wBAAwB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAaF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,UAAW,YAAW,MAAM;IAC/C,EAAE,SAAiB;IACnB,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,YAAY,CAAC,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,YAAY,CAAC,CAAW;IAEhC,SAAS,CACP,MAAM,EAAE,MAAM,EACd,EAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAC,EAAE,gBAAgB,GACrF,kBAAkB;IAsDrB,OAAO,CAAC,cAAc;IAgGtB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IA4CzB,mBAAmB,IAAI;QACrB,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC;KAC3C;IAOD,OAAO,IAAI,IAAI;CAgBhB"}
+{"version":3,"file":"mask-effect.d.ts","sourceRoot":"","sources":["../../src/mask/mask-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EACN,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAEjB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3C,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAGjG,KAAK,IAAI,GAAG;IACV,wBAAwB;IACxB,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,gBAAgB,EAAE,gBAAgB,CAAC;CACpC,CAAC;AAaF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,UAAW,YAAW,MAAM;IAC/C,EAAE,SAAiB;IACnB,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,YAAY,CAAC,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAW;IAC5B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,YAAY,CAAC,CAAW;IAEhC,KAAK,CAAC,EAAC,MAAM,EAAC,EAAE,aAAa;IAU7B,SAAS,CAAC,EACR,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACV,EAAE,gBAAgB,GAAG,kBAAkB;IA2CxC,OAAO,CAAC,cAAc;IAgGtB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IA4CzB,mBAAmB,IAAI;QACrB,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC;KAC3C;IAOD,OAAO,IAAI,IAAI;CAgBhB"}

package/dist/mask/mask-effect.js

@@ -12,14 +12,16 @@ export default class MaskEffect {
         this.channels = [];
         this.masks = null;
     }
-    preRender(device, { layers, layerFilter, viewports, onViewportActive, views, isPicking }) {
+    setup({ device }) {
+        this.dummyMaskMap = device.createTexture({
+            width: 1,
+            height: 1
+        });
+        this.maskPass = new MaskPass(device, { id: 'default-mask' });
+        this.maskMap = this.maskPass.maskMap;
+    }
+    preRender({ layers, layerFilter, viewports, onViewportActive, views, isPicking }) {
         let didRender = false;
-        if (!this.dummyMaskMap) {
-            this.dummyMaskMap = device.createTexture({
-                width: 1,
-                height: 1
-            });
-        }
         if (isPicking) {
             // Do not update on picking pass
             return { didRender };
@@ -31,10 +33,6 @@ export default class MaskEffect {
             return { didRender };
         }
         this.masks = {};
-        if (!this.maskPass) {
-            this.maskPass = new MaskPass(device, { id: 'default-mask' });
-            this.maskMap = this.maskPass.maskMap;
-        }
         // Map layers to channels
         const channelMap = this._sortMaskChannels(maskLayers);
         // TODO - support multiple views

package/dist/mask/mask-pass.d.ts

@@ -1,8 +1,8 @@
 import type { Device, Framebuffer, Texture } from '@luma.gl/core';
-import { _LayersPass as LayersPass, LayersPassRenderOptions } from '@deck.gl/core';
+import { Layer, _LayersPass as LayersPass, LayersPassRenderOptions, Viewport } from '@deck.gl/core';
 type MaskPassRenderOptions = LayersPassRenderOptions & {
     /** The channel to render into, 0:red, 1:green, 2:blue, 3:alpha */
-    channel: number;
+    channel: 0 | 1 | 2 | 3;
 };
 export default class MaskPass extends LayersPass {
     maskMap: Texture;
@@ -11,7 +11,8 @@ export default class MaskPass extends LayersPass {
         id: string;
         mapSize?: number;
     });
-    render(options: MaskPassRenderOptions): any;
+    render(options: MaskPassRenderOptions): void;
+    protected getLayerParameters(layer: Layer<{}>, layerIndex: number, viewport: Viewport): any;
     shouldDrawLayer(layer: any): any;
     delete(): void;
 }

package/dist/mask/mask-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mask-pass.d.ts","sourceRoot":"","sources":["../../src/mask/mask-pass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAC,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAEjF,KAAK,qBAAqB,GAAG,uBAAuB,GAAG;IACrD,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,UAAU;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,WAAW,CAAC;gBAEL,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;IAyBjE,MAAM,CAAC,OAAO,EAAE,qBAAqB;IAiBrC,eAAe,CAAC,KAAK,KAAA;IAIrB,MAAM;CAIP"}
+{"version":3,"file":"mask-pass.d.ts","sourceRoot":"","sources":["../../src/mask/mask-pass.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAA4B,OAAO,EAAC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAC,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAElG,KAAK,qBAAqB,GAAG,uBAAuB,GAAG;IACrD,kEAAkE;IAClE,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;CACxB,CAAC;AAWF,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,UAAU;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,WAAW,CAAC;gBAEL,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC;IAyBjE,MAAM,CAAC,OAAO,EAAE,qBAAqB;IAMrC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IASrF,eAAe,CAAC,KAAK,KAAA;IAIrB,MAAM;CAIP"}

package/dist/mask/mask-pass.js

@@ -1,5 +1,12 @@
-import { GL } from '@luma.gl/constants';
 import { _LayersPass as LayersPass } from '@deck.gl/core';
+const MASK_BLENDING = {
+    blendColorOperation: 'subtract',
+    blendColorSrcFactor: 'zero',
+    blendColorDstFactor: 'one',
+    blendAlphaOperation: 'subtract',
+    blendAlphaSrcFactor: 'zero',
+    blendAlphaDstFactor: 'one'
+};
 export default class MaskPass extends LayersPass {
     constructor(device, props) {
         super(device, props);
@@ -23,16 +30,17 @@ export default class MaskPass extends LayersPass {
         });
     }
     render(options) {
-        const colorMask = [false, false, false, false];
-        colorMask[options.channel] = true;
+        const colorMask = 2 ** options.channel;
         const clearColor = [255, 255, 255, 255];
-        return this.device.withParametersWebGL({
+        super.render({ ...options, clearColor, colorMask, target: this.fbo, pass: 'mask' });
+    }
+    getLayerParameters(layer, layerIndex, viewport) {
+        return {
+            ...layer.props.parameters,
             blend: true,
-            blendFunc: [0, 1],
-            blendEquation: 32778,
-            colorMask,
-            depthTest: false
-        }, () => super.render({ ...options, clearColor, target: this.fbo, pass: 'mask' }));
+            depthTest: false,
+            ...MASK_BLENDING
+        };
     }
     shouldDrawLayer(layer) {
         return layer.props.operation.includes('mask');

package/dist/path-style/path-style-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path-style-extension.d.ts","sourceRoot":"","sources":["../../src/path-style/path-style-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAgC,MAAM,eAAe,CAAC;AAI5E,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAUnF,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;;OAGG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B;;;OAGG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EACV,IAAY,EACZ,MAAc,EACd,iBAAyB,EAC1B,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAI1C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAiBtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAgC5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACxD,SAAS,EAAE,IAAI;IAgBjB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;CAoB5F"}
+{"version":3,"file":"path-style-extension.d.ts","sourceRoot":"","sources":["../../src/path-style/path-style-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAgC,MAAM,eAAe,CAAC;AAI5E,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAUnF,MAAM,MAAM,uBAAuB,CAAC,KAAK,GAAG,GAAG,IAAI;IACjD;;;OAGG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B;;;OAGG;IACH,IAAI,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,kGAAkG;AAClG,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,cAAc,CAAC,yBAAyB,CAAC;IACvF,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAwB;gBAEhC,EACV,IAAY,EACZ,MAAc,EACd,iBAAyB,EAC1B,GAAE,OAAO,CAAC,yBAAyB,CAAM;IAI1C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,GAAG,OAAO;IAIzD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,IAAI,GAAG,GAAG;IAiBtE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAgC5F,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACpC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,EACxD,SAAS,EAAE,IAAI;IAgBjB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE;CAqB5F"}

package/dist/path-style/path-style-extension.js

@@ -106,6 +106,7 @@ export default class PathStyleExtension extends LayerExtension {
             }
             prevP = p;
         }
+        result[geometrySize - 1] = 0;
         return result;
     }
 }

package/dist/terrain/terrain-effect.d.ts

@@ -1,6 +1,5 @@
-import { Device } from '@luma.gl/core';
 import { TerrainModuleSettings } from "./shader-module.js";
-import type { Effect, PreRenderOptions, Layer } from '@deck.gl/core';
+import type { Effect, EffectContext, PreRenderOptions, Layer } from '@deck.gl/core';
 /** Class to manage terrain effect */
 export declare class TerrainEffect implements Effect {
     id: string;
@@ -18,10 +17,10 @@ export declare class TerrainEffect implements Effect {
     private terrainPickingPass;
     /** One texture for each primitive terrain layer, into which the draped layers render */
     private terrainCovers;
-    initialize(device: Device): void;
-    preRender(device: Device, opts: PreRenderOptions): void;
+    setup({ device, deck }: EffectContext): void;
+    preRender(opts: PreRenderOptions): void;
     getModuleParameters(layer: Layer): Omit<TerrainModuleSettings, 'picking'>;
-    cleanup(): void;
+    cleanup({ deck }: EffectContext): void;
     private _updateHeightMap;
     private _updateTerrainCovers;
     private _updateTerrainCover;

package/dist/terrain/terrain-effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-effect.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAU,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAgB,qBAAqB,EAAC,2BAAwB;AAMrE,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAW,MAAM,eAAe,CAAC;AAE7E,qCAAqC;AACrC,qBAAa,aAAc,YAAW,MAAM;IAC1C,EAAE,SAAoB;IACtB,KAAK,OAAQ;IACb,YAAY,UAAQ;IAEpB,0CAA0C;IAC1C,OAAO,CAAC,SAAS,CAAkB;IACnC,6CAA6C;IAC7C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,sCAAsC;IACtC,OAAO,CAAC,cAAc,CAAC,CAAU;IACjC,wGAAwG;IACxG,OAAO,CAAC,SAAS,CAAC,CAAmB;IACrC,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,kBAAkB,CAAsB;IAChD,wFAAwF;IACxF,OAAO,CAAC,aAAa,CAAwC;IAE7D,UAAU,CAAC,MAAM,EAAE,MAAM;IAkBzB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA+CvD,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;IAazE,OAAO,IAAI,IAAI;IAiBf,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,mBAAmB;CAY5B"}
+{"version":3,"file":"terrain-effect.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,qBAAqB,EAAC,2BAAwB;AAMrE,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,KAAK,EAAW,MAAM,eAAe,CAAC;AAE5F,qCAAqC;AACrC,qBAAa,aAAc,YAAW,MAAM;IAC1C,EAAE,SAAoB;IACtB,KAAK,OAAQ;IACb,YAAY,UAAQ;IAEpB,0CAA0C;IAC1C,OAAO,CAAC,SAAS,CAAkB;IACnC,6CAA6C;IAC7C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,sCAAsC;IACtC,OAAO,CAAC,cAAc,CAAC,CAAU;IACjC,wGAAwG;IACxG,OAAO,CAAC,SAAS,CAAC,CAAmB;IACrC,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,kBAAkB,CAAsB;IAChD,wFAAwF;IACxF,OAAO,CAAC,aAAa,CAAwC;IAE7D,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,aAAa;IAkBnC,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAoCvC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;IAazE,OAAO,CAAC,EAAC,IAAI,EAAC,EAAE,aAAa,GAAG,IAAI;IAmBpC,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,mBAAmB;CAY5B"}

package/dist/terrain/terrain-effect.js

@@ -1,4 +1,4 @@
-import { log, getShaderAssembler } from '@deck.gl/core';
+import { log } from '@deck.gl/core';
 import { terrainModule } from "./shader-module.js";
 import { TerrainCover } from "./terrain-cover.js";
 import { TerrainPass } from "./terrain-pass.js";
@@ -17,7 +17,7 @@ export class TerrainEffect {
         /** One texture for each primitive terrain layer, into which the draped layers render */
         this.terrainCovers = new Map();
     }
-    initialize(device) {
+    setup({ device, deck }) {
         this.dummyHeightMap = device.createTexture({
             width: 1,
             height: 1,
@@ -31,19 +31,9 @@ export class TerrainEffect {
         else {
             log.warn('Terrain offset mode is not supported by this browser')();
         }
-        getShaderAssembler().addDefaultModule(terrainModule);
+        deck._addDefaultShaderModule(terrainModule);
     }
-    preRender(device, opts) {
-        if (!this.dummyHeightMap) {
-            // First time this effect is in use, initialize resources and register the shader module
-            this.initialize(device);
-            for (const layer of opts.layers) {
-                // Force the terrain layer (and its descendents) to rebuild their models with the new shader
-                if (layer.props.operation.includes('terrain')) {
-                    layer.setChangeFlags({ extensionsChanged: true });
-                }
-            }
-        }
+    preRender(opts) {
         // @ts-expect-error pickZ only defined in picking pass
         if (opts.pickZ) {
             // Do not update if picking attributes
@@ -81,7 +71,7 @@ export class TerrainEffect {
             terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
         };
     }
-    cleanup() {
+    cleanup({ deck }) {
         if (this.dummyHeightMap) {
             this.dummyHeightMap.delete();
             this.dummyHeightMap = undefined;
@@ -94,6 +84,7 @@ export class TerrainEffect {
             terrainCover.delete();
         }
         this.terrainCovers.clear();
+        deck._removeDefaultShaderModule(terrainModule);
     }
     _updateHeightMap(terrainLayers, viewport, opts) {
         if (!this.heightMap) {

package/dist/terrain/terrain-pass.d.ts

@@ -7,5 +7,6 @@ export declare class TerrainPass extends LayersPass {
     getRenderableLayers(viewport: Viewport, opts: TerrainPassRenderOptions): Layer[];
     renderHeightMap(heightMap: HeightMapBuilder, opts: Partial<TerrainPassRenderOptions>): void;
     renderTerrainCover(terrainCover: TerrainCover, opts: Partial<TerrainPassRenderOptions>): void;
+    protected getLayerParameters(layer: Layer<{}>, layerIndex: number, viewport: Viewport): any;
 }
 //# sourceMappingURL=terrain-pass.d.ts.map

package/dist/terrain/terrain-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-pass.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAClG,OAAO,KAAK,EAAC,gBAAgB,EAAC,gCAA6B;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;AAE/D,6DAA6D;AAC7D,qBAAa,WAAY,SAAQ,UAAU;IACzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,KAAK,EAAE;IAchF,eAAe,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;IA+BpF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;CA4BvF"}
+{"version":3,"file":"terrain-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-pass.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAClG,OAAO,KAAK,EAAC,gBAAgB,EAAC,gCAA6B;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;AAW/D,6DAA6D;AAC7D,qBAAa,WAAY,SAAQ,UAAU;IACzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,KAAK,EAAE;IAchF,eAAe,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;IAsBpF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;IAuBtF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;CAQtF"}

package/dist/terrain/terrain-pass.js

@@ -1,5 +1,12 @@
-import { GL } from '@luma.gl/constants';
 import { _LayersPass as LayersPass } from '@deck.gl/core';
+const TERRAIN_BLENDING = {
+    blendColorOperation: 'max',
+    blendColorSrcFactor: 'one',
+    blendColorDstFactor: 'one',
+    blendAlphaOperation: 'max',
+    blendAlphaSrcFactor: 'one',
+    blendAlphaDstFactor: 'one'
+};
 /** Renders textures used by the TerrainEffect render pass */
 export class TerrainPass extends LayersPass {
     getRenderableLayers(viewport, opts) {
@@ -22,20 +29,15 @@ export class TerrainPass extends LayersPass {
             return;
         }
         target.resize(viewport);
-        this.device.withParametersWebGL({
-            clearColor: [0, 0, 0, 0],
-            blend: true,
-            blendFunc: [1, 1],
-            blendEquation: 32776,
-            depthTest: false
-        }, () => this.render({
+        this.render({
             ...opts,
             target,
             pass: 'terrain-height-map',
             layers: opts.layers,
             viewports: [viewport],
-            effects: []
-        }));
+            effects: [],
+            clearColor: [0, 0, 0, 0]
+        });
     }
     renderTerrainCover(terrainCover, opts) {
         // console.log('Updating terrain cover ' + terrainCover.id)
@@ -46,16 +48,22 @@ export class TerrainPass extends LayersPass {
         }
         const layers = terrainCover.filterLayers(opts.layers);
         target.resize(viewport);
-        this.device.withParametersWebGL({
-            clearColor: [0, 0, 0, 0],
-            depthTest: false
-        }, () => this.render({
+        this.render({
             ...opts,
             target,
             pass: `terrain-cover-${terrainCover.id}`,
             layers,
             effects: [],
-            viewports: [viewport]
-        }));
+            viewports: [viewport],
+            clearColor: [0, 0, 0, 0]
+        });
+    }
+    getLayerParameters(layer, layerIndex, viewport) {
+        return {
+            ...layer.props.parameters,
+            blend: true,
+            depthTest: false,
+            ...(layer.props.operation.includes('terrain') && TERRAIN_BLENDING)
+        };
     }
 }

package/dist/terrain/terrain-picking-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-picking-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-picking-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,QAAQ,EACR,uBAAuB,EACvB,eAAe,IAAI,cAAc,EAClC,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,MAAM,MAAM,+BAA+B,GAAG,uBAAuB,GAAG;IACtE,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,8DAA8D;AAC9D,qBAAa,kBAAmB,SAAQ,cAAc;IACpD;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,+BAA+B,GAAG,KAAK,EAAE;IAiBvF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC;IAqC7F,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;CAQxF"}
+{"version":3,"file":"terrain-picking-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-picking-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,QAAQ,EACR,uBAAuB,EACvB,eAAe,IAAI,cAAc,EAClC,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,MAAM,MAAM,+BAA+B,GAAG,uBAAuB,GAAG;IACtE,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,8DAA8D;AAC9D,qBAAa,kBAAmB,SAAQ,cAAc;IACpD;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,+BAA+B,GAAG,KAAK,EAAE;IAiBvF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC;IA+B7F,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;CAUxF"}

package/dist/terrain/terrain-picking-pass.js

@@ -39,9 +39,7 @@ export class TerrainPickingPass extends PickLayersPass {
             layers.unshift(terrainLayer);
         }
         target.resize(viewport);
-        this.device.withParametersWebGL({
-            depthTest: false
-        }, () => this.render({
+        this.render({
             ...opts,
             pickingFBO: target,
             pass: `terrain-cover-picking-${terrainCover.id}`,
@@ -53,14 +51,17 @@ export class TerrainPickingPass extends PickLayersPass {
             cullRect: undefined,
             deviceRect: viewport,
             pickZ: false
-        }));
+        });
     }
     getLayerParameters(layer, layerIndex, viewport) {
+        let parameters;
         if (this.drawParameters[layer.id]) {
-            return this.drawParameters[layer.id];
+            parameters = this.drawParameters[layer.id];
         }
-        const parameters = super.getLayerParameters(layer, layerIndex, viewport);
-        parameters.blend = true;
-        return parameters;
+        else {
+            parameters = super.getLayerParameters(layer, layerIndex, viewport);
+            parameters.blend = true;
+        }
+        return { ...parameters, depthTest: false };
     }
 }

package/dist/terrain/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/terrain/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAG1C,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,uCAoBF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/terrain/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAG1C,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IACJ,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,uCAqBF"}

package/dist/terrain/utils.js

@@ -4,6 +4,7 @@ export function createRenderTarget(device, opts) {
         id: opts.id,
         colorAttachments: [
             device.createTexture({
+                id: opts.id,
                 ...(opts.float && {
                     format: 'rgba32float',
                     type: 5126