@deck.gl/extensions 9.0.40 → 9.1.0-beta.3

package/dist/path-style/shaders.glsl.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export const dashShaders = {
     inject: {
         'vs:#decl': `
@@ -11,9 +14,10 @@ vDashArray = instanceDashArrays;
 vDashOffset = instanceDashOffsets / width.x;
 `,
         'fs:#decl': `
-uniform float dashAlignMode;
-uniform float capType;
-uniform bool dashGapPickable;
+uniform pathStyleUniforms {
+float dashAlignMode;
+bool dashGapPickable;
+} pathStyle;
 in vec2 vDashArray;
 in float vDashOffset;
 `,
@@ -31,7 +35,7 @@ float gapLength = vDashArray.y;
 float unitLength = solidLength + gapLength;
 float offset;
 if (unitLength > 0.0) {
-if (dashAlignMode == 0.0) {
+if (pathStyle.dashAlignMode == 0.0) {
 offset = vDashOffset;
 } else {
 unitLength = vPathLength / round(vPathLength / unitLength);
@@ -39,8 +43,8 @@ offset = solidLength / 2.0;
 }
 float unitOffset = mod(vPathPosition.y + offset, unitLength);
 if (gapLength > 0.0 && unitOffset > solidLength) {
-if (capType <= 0.5) {
-if (!(dashGapPickable && bool(picking.isActive))) {
+if (path.capType <= 0.5) {
+if (!(pathStyle.dashGapPickable && bool(picking.isActive))) {
 discard;
 }
 } else {
@@ -49,7 +53,7 @@ min(unitOffset - solidLength, unitLength - unitOffset),
 vPathPosition.x
 ));
 if (distToEnd > 1.0) {
-if (!(dashGapPickable && bool(picking.isActive))) {
+if (!(pathStyle.dashGapPickable && bool(picking.isActive))) {
 discard;
 }
 }
@@ -84,3 +88,4 @@ discard;
 `
     }
 };
+//# sourceMappingURL=shaders.glsl.js.map

package/dist/path-style/shaders.glsl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shaders.glsl.js","sourceRoot":"","sources":["../../src/path-style/shaders.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM,EAAE;QACN,UAAU,EAAE;;;;;CAKf;QAEG,cAAc,EAAE;;;CAGnB;QAEG,UAAU;;;;;;;CAQb;QAEG,0DAA0D;QAC1D,sDAAsD;QACtD,6CAA6C;QAC7C,aAAa;QACb,oBAAoB;QACpB,mEAAmE;QACnE,kEAAkE;QAClE,mEAAmE;QACnE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCnB;KACE;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE;QACN,UAAU,EAAE;;CAEf;QACG,uBAAuB;;;CAG1B;QACG,cAAc;;;;;;CAMjB;QACG,gBAAgB;;;;;;CAMnB;KACE;CACF,CAAC"}

package/dist/terrain/height-map-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"height-map-builder.d.ts","sourceRoot":"","sources":["../../src/terrain/height-map-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAGjG,OAAO,KAAK,EAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AAInD;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,6CAA6C;IAC7C,cAAc,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACvC,2DAA2D;IAC3D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,2BAA2B;IAC3B,OAAO,CAAC,MAAM,CAAe;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,YAAY,CAAuC;IAC3D,mDAAmD;IACnD,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAyB;IAE7C,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;gBAI/B,MAAM,EAAE,MAAM;IAI1B;;OAEG;IACH,oBAAoB,IAAI,WAAW,GAAG,IAAI;IAU1C,yEAAyE;IACzE,YAAY,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE;QAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAC,GAAG,OAAO;IAiEhF,MAAM;CAMP"}
+{"version":3,"file":"height-map-builder.d.ts","sourceRoot":"","sources":["../../src/terrain/height-map-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAGjG,OAAO,KAAK,EAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,eAAe,CAAC;AAInD;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAC3B,6CAA6C;IAC7C,cAAc,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACvC,2DAA2D;IAC3D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAC5B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,2BAA2B;IAC3B,OAAO,CAAC,MAAM,CAAe;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,YAAY,CAAuC;IAC3D,mDAAmD;IACnD,OAAO,CAAC,kBAAkB,CAAuB;IACjD,OAAO,CAAC,YAAY,CAAyB;IAE7C,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;gBAI/B,MAAM,EAAE,MAAM;IAI1B;;OAEG;IACH,oBAAoB,IAAI,WAAW,GAAG,IAAI;IAU1C,yEAAyE;IACzE,YAAY,CAAC,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAE;QAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAC,GAAG,OAAO;IAiEhF,MAAM;CAMP"}

package/dist/terrain/height-map-builder.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { joinLayerBounds, getRenderBounds, makeViewport } from "../utils/projection-utils.js";
 import { createRenderTarget } from "./utils.js";
 const MAP_MAX_SIZE = 2048;
@@ -102,3 +105,4 @@ export class HeightMapBuilder {
         }
     }
 }
+//# sourceMappingURL=height-map-builder.js.map

package/dist/terrain/height-map-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"height-map-builder.js","sourceRoot":"","sources":["../../src/terrain/height-map-builder.ts"],"names":[],"mappings":"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"}

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

@@ -1,12 +1,11 @@
-import type { ShaderModule } from '@luma.gl/shadertools';
+import { ProjectProps } from '@deck.gl/core';
 import type { Texture } from '@luma.gl/core';
 import type { Bounds } from "../utils/projection-utils.js";
 import type { TerrainCover } from "./terrain-cover.js";
 /** Module parameters expected by the terrain shader module */
-export type TerrainModuleSettings = {
-    picking: {
-        isActive?: boolean;
-    };
+export type TerrainModuleProps = {
+    project: ProjectProps;
+    isPicking: boolean;
     heightMap: Texture | null;
     heightMapBounds?: Bounds | null;
     dummyHeightMap: Texture;
@@ -29,5 +28,60 @@ export declare const TERRAIN_MODE: {
     /** Draped layer is rendered into a texture, and never to screen */
     SKIP: number;
 };
-export declare const terrainModule: ShaderModule<TerrainModuleSettings>;
+export declare const terrainModule: {
+    readonly name: "terrain";
+    readonly dependencies: [{
+        readonly name: "project";
+        readonly dependencies: [{
+            name: string;
+            vs: string;
+        }, {
+            readonly name: "geometry";
+            readonly vs: "\n#define SMOOTH_EDGE_RADIUS 0.5\n\nstruct VertexGeometry {\n  vec4 position;\n  vec3 worldPosition;\n  vec3 worldPositionAlt;\n  vec3 normal;\n  vec2 uv;\n  vec3 pickingColor;\n} geometry = VertexGeometry(\n  vec4(0.0, 0.0, 1.0, 0.0),\n  vec3(0.0),\n  vec3(0.0),\n  vec3(0.0),\n  vec2(0.0),\n  vec3(0.0)\n);\n";
+            readonly fs: "\n#define SMOOTH_EDGE_RADIUS 0.5\n\nstruct FragmentGeometry {\n  vec2 uv;\n} geometry;\n\nfloat smoothedge(float edge, float x) {\n  return smoothstep(edge - SMOOTH_EDGE_RADIUS, edge + SMOOTH_EDGE_RADIUS, x);\n}\n";
+        }];
+        readonly vs: string;
+        readonly getUniforms: (opts?: ProjectProps | {}) => {};
+        readonly uniformTypes: {
+            readonly wrapLongitude: "f32";
+            readonly coordinateSystem: "i32";
+            readonly commonUnitsPerMeter: "vec3<f32>";
+            readonly projectionMode: "i32";
+            readonly scale: "f32";
+            readonly commonUnitsPerWorldUnit: "vec3<f32>";
+            readonly commonUnitsPerWorldUnit2: "vec3<f32>";
+            readonly center: "vec4<f32>";
+            readonly modelMatrix: "mat4x4<f32>";
+            readonly viewProjectionMatrix: "mat4x4<f32>";
+            readonly viewportSize: "vec2<f32>";
+            readonly devicePixelRatio: "f32";
+            readonly focalDistance: "f32";
+            readonly cameraPosition: "vec3<f32>";
+            readonly coordinateOrigin: "vec3<f32>";
+            readonly commonOrigin: "vec3<f32>";
+            readonly pseudoMeters: "f32";
+        };
+    }];
+    readonly vs: string;
+    readonly fs: string;
+    readonly inject: {
+        readonly 'vs:#main-start': "\nif (terrain.mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n";
+        readonly 'vs:DECKGL_FILTER_GL_POSITION': "\ncommonPos = geometry.position.xyz;\nif (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n  commonPos.z += project.commonOrigin.z;\n}\nif (terrain.mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain.bounds.xy) / terrain.bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    ";
+        readonly 'fs:#main-start': "\nif (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    ";
+        readonly 'fs:DECKGL_FILTER_COLOR': "\nif ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;\n  vec4 pixel = texture(terrain_map, texCoords);\n  if (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    ";
+    };
+    readonly getUniforms: (opts?: Partial<TerrainModuleProps>) => {
+        mode: number;
+        terrain_map: Texture;
+        bounds: [number, number, number, number];
+    } | {
+        mode?: undefined;
+        terrain_map?: undefined;
+        bounds?: undefined;
+    };
+    readonly uniformTypes: {
+        readonly mode: "f32";
+        readonly bounds: "vec4<f32>";
+    };
+};
 //# sourceMappingURL=shader-module.d.ts.map

package/dist/terrain/shader-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,qCAAkC;AACtD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,kDAAkD;AAClD,eAAO,MAAM,YAAY;;IAEvB,6EAA6E;;IAE7E,2EAA2E;;IAE3E,6FAA6F;;IAE7F,0EAA0E;;IAE1E,mEAAmE;;CAEpE,CAAC;AAMF,eAAO,MAAM,aAAa,qCA8Hc,CAAC"}
+{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,YAAY,EAAkB,MAAM,eAAe,CAAC;AAErE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,qCAAkC;AACtD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAElD,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAWF,kDAAkD;AAClD,eAAO,MAAM,YAAY;;IAEvB,6EAA6E;;IAE7E,2EAA2E;;IAE3E,6FAA6F;;IAE7F,0EAA0E;;IAE1E,mEAAmE;;CAEpE,CAAC;AAkBF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAsDJ,OAAO,CAAC,kBAAkB,CAAC;;;;;;;;;;;;;CAiEkD,CAAC"}

package/dist/terrain/shader-module.js

@@ -1,6 +1,7 @@
-/* eslint-disable camelcase */
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { project } from '@deck.gl/core';
-import { glsl } from "../utils/syntax-tags.js";
 /** A model can have one of the following modes */
 export const TERRAIN_MODE = {
     NONE: 0,
@@ -18,72 +19,76 @@ export const TERRAIN_MODE = {
 const TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)
     .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)
     .join('\n');
+const uniformBlock = 
+// eslint-disable-next-line prefer-template
+TERRAIN_MODE_CONSTANTS +
+    /* glsl */ `
+uniform terrainUniforms {
+  float mode;
+  vec4 bounds;
+} terrain;
+
+uniform sampler2D terrain_map;
+`;
 export const terrainModule = {
     name: 'terrain',
     dependencies: [project],
+    // eslint-disable-next-line prefer-template
+    vs: uniformBlock + /* glsl */ 'out vec3 commonPos;',
+    // eslint-disable-next-line prefer-template
+    fs: uniformBlock + /* glsl */ 'in vec3 commonPos;',
     inject: {
-        'vs:#decl': `
-uniform float terrain_mode;
-uniform sampler2D terrain_map;
-uniform vec4 terrain_bounds;
-out vec3 commonPos;
-` + TERRAIN_MODE_CONSTANTS,
-        'vs:#main-start': `
-if (terrain_mode == TERRAIN_MODE_SKIP) {
-gl_Position = vec4(0.0);
-return;
+        'vs:#main-start': /* glsl */ `
+if (terrain.mode == TERRAIN_MODE_SKIP) {
+  gl_Position = vec4(0.0);
+  return;
 }
 `,
-        'vs:DECKGL_FILTER_GL_POSITION': `
+        'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
 commonPos = geometry.position.xyz;
-if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
-position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
-commonPos.z += project_uCommonOrigin.z;
-}
-if (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
-vec3 anchor = geometry.worldPosition;
-anchor.z = 0.0;
-vec3 anchorCommon = project_position(anchor);
-vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;
-if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {
-float terrainZ = texture(terrain_map, texCoords).r;
-geometry.position.z += terrainZ;
-position = project_common_position_to_clipspace(geometry.position);
-}
+if (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
+  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;
+  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
+  commonPos.z += project.commonOrigin.z;
 }
-`,
-        'fs:#decl': `
-uniform float terrain_mode;
-uniform sampler2D terrain_map;
-uniform vec4 terrain_bounds;
-in vec3 commonPos;
-` + TERRAIN_MODE_CONSTANTS,
-        'fs:#main-start': `
-if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
-fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
-return;
+if (terrain.mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
+  vec3 anchor = geometry.worldPosition;
+  anchor.z = 0.0;
+  vec3 anchorCommon = project_position(anchor);
+  vec2 texCoords = (anchorCommon.xy - terrain.bounds.xy) / terrain.bounds.zw;
+  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {
+    float terrainZ = texture(terrain_map, texCoords).r;
+    geometry.position.z += terrainZ;
+    position = project_common_position_to_clipspace(geometry.position);
+  }
 }
-`,
-        'fs:DECKGL_FILTER_COLOR': `
-if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {
-vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
-vec4 pixel = texture(terrain_map, texCoords);
-if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {
-color = pixel;
-} else {
-color = pixel + color * (1.0 - pixel.a);
+    `,
+        'fs:#main-start': /* glsl */ `
+if (terrain.mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
+  fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
+  return;
 }
-return;
+    `,
+        'fs:DECKGL_FILTER_COLOR': /* glsl */ `
+if ((terrain.mode == TERRAIN_MODE_USE_COVER) || (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY)) {
+  vec2 texCoords = (commonPos.xy - terrain.bounds.xy) / terrain.bounds.zw;
+  vec4 pixel = texture(terrain_map, texCoords);
+  if (terrain.mode == TERRAIN_MODE_USE_COVER_ONLY) {
+    color = pixel;
+  } else {
+    // pixel is premultiplied
+    color = pixel + color * (1.0 - pixel.a);
+  }
+  return;
 }
-`
+    `
     },
     // eslint-disable-next-line complexity
-    getUniforms: (opts = {}, uniforms) => {
+    getUniforms: (opts = {}) => {
         if ('dummyHeightMap' in opts) {
             const { drawToTerrainHeightMap, heightMap, heightMapBounds, dummyHeightMap, terrainCover, useTerrainHeightMap, terrainSkipRender } = opts;
-            // @ts-expect-error stricter luma gl types
-            const { project_uCommonOrigin } = uniforms;
+            const projectUniforms = project.getUniforms(opts.project);
+            const { commonOrigin } = projectUniforms;
             let mode = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;
             // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty
             let sampler = dummyHeightMap;
@@ -100,12 +105,11 @@ return;
             }
             else if (terrainCover) {
                 // This is a terrain layer
-                const isPicking = opts.picking?.isActive;
-                const fbo = isPicking
+                const fbo = opts.isPicking
                     ? terrainCover.getPickingFramebuffer()
                     : terrainCover.getRenderFramebuffer();
                 sampler = fbo?.colorAttachments[0].texture;
-                if (isPicking) {
+                if (opts.isPicking) {
                     // Never render the layer itself in picking pass
                     mode = TERRAIN_MODE.SKIP;
                 }
@@ -119,19 +123,24 @@ return;
             }
             /* eslint-disable camelcase */
             return {
-                terrain_mode: mode,
+                mode,
                 terrain_map: sampler,
                 // Convert bounds to the common space, as [minX, minY, width, height]
-                terrain_bounds: bounds
+                bounds: bounds
                     ? [
-                        bounds[0] - project_uCommonOrigin[0],
-                        bounds[1] - project_uCommonOrigin[1],
+                        bounds[0] - commonOrigin[0],
+                        bounds[1] - commonOrigin[1],
                         bounds[2] - bounds[0],
                         bounds[3] - bounds[1]
                     ]
                     : [0, 0, 0, 0]
             };
         }
-        return null;
+        return {};
+    },
+    uniformTypes: {
+        mode: 'f32',
+        bounds: 'vec4<f32>'
     }
 };
+//# sourceMappingURL=shader-module.js.map

package/dist/terrain/shader-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shader-module.js","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"terrain-cover.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-cover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,EAAC,KAAK,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAMjG;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,OAAO,EAAE,OAAO,CAAQ;IACxB,sDAAsD;IACtD,WAAW,EAAE,KAAK,CAAC;IACnB,6CAA6C;IAC7C,cAAc,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACvC,8DAA8D;IAC9D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B,OAAO,CAAC,GAAG,CAAC,CAAc;IAC1B,OAAO,CAAC,UAAU,CAAC,CAAc;IACjC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,IAAI,CAAoB;IAChC,gDAAgD;IAChD,OAAO,CAAC,YAAY,CAAqC;IACzD,sCAAsC;IACtC,OAAO,CAAC,kBAAkB,CAAuB;gBAErC,WAAW,EAAE,KAAK;IAK9B,IAAI,EAAE,WAEL;IAED,4EAA4E;IAC5E,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,YAAY,CAAC,EACX,WAAW,EACX,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,EAAE;QACD,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;QACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC5C,GAAG,OAAO;IAqBX,wEAAwE;IACxE,OAAO,CAAC,aAAa;IAuBrB,4FAA4F;IAC5F,OAAO,CAAC,eAAe;IAsDvB,oBAAoB,IAAI,WAAW,GAAG,IAAI;IAU1C,qBAAqB,IAAI,WAAW,GAAG,IAAI;IAa3C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;IAI5B,MAAM;CAWP"}
+{"version":3,"file":"terrain-cover.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-cover.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,EAAC,KAAK,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAMjG;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,OAAO,EAAE,OAAO,CAAQ;IACxB,sDAAsD;IACtD,WAAW,EAAE,KAAK,CAAC;IACnB,6CAA6C;IAC7C,cAAc,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACvC,8DAA8D;IAC9D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B,OAAO,CAAC,GAAG,CAAC,CAAc;IAC1B,OAAO,CAAC,UAAU,CAAC,CAAc;IACjC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,IAAI,CAAoB;IAChC,gDAAgD;IAChD,OAAO,CAAC,YAAY,CAAqC;IACzD,sCAAsC;IACtC,OAAO,CAAC,kBAAkB,CAAuB;gBAErC,WAAW,EAAE,KAAK;IAK9B,IAAI,EAAE,WAEL;IAED,4EAA4E;IAC5E,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,YAAY,CAAC,EACX,WAAW,EACX,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,EAAE;QACD,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;QACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC5C,GAAG,OAAO;IAqBX,wEAAwE;IACxE,OAAO,CAAC,aAAa;IAuBrB,4FAA4F;IAC5F,OAAO,CAAC,eAAe;IAsDvB,oBAAoB,IAAI,WAAW,GAAG,IAAI;IAU1C,qBAAqB,IAAI,WAAW,GAAG,IAAI;IAa3C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;IAI5B,MAAM;CAWP"}

package/dist/terrain/terrain-cover.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { createRenderTarget } from "./utils.js";
 import { joinLayerBounds, makeViewport, getRenderBounds } from "../utils/projection-utils.js";
 /**
@@ -186,3 +189,4 @@ function intersect(b1, b2) {
     }
     return false;
 }
+//# sourceMappingURL=terrain-cover.js.map

package/dist/terrain/terrain-cover.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terrain-cover.js","sourceRoot":"","sources":["../../src/terrain/terrain-cover.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,OAAO,EAAC,kBAAkB,EAAC,mBAAgB;AAC3C,OAAO,EAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAS,qCAAkC;AAMjG;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IAkBvB,YAAY,WAAkB;QAjB9B,YAAO,GAAY,IAAI,CAAC;QAGxB,6CAA6C;QAC7C,mBAAc,GAAoB,IAAI,CAAC;QACvC,8DAA8D;QAC9D,WAAM,GAAkB,IAAI,CAAC;QAIrB,WAAM,GAAa,EAAE,CAAC;QAE9B,gDAAgD;QACxC,iBAAY,GAAgC,IAAI,CAAC;QACzD,sCAAsC;QAC9B,uBAAkB,GAAkB,IAAI,CAAC;QAG/C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;IAC7B,CAAC;IAED,4EAA4E;IAC5E,IAAI,QAAQ;QACV,OAAO,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,YAAY,CAAC,EACX,WAAW,EACX,QAAQ,EACR,MAAM,EACN,gBAAgB,EAMjB;QACC,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QACjC,CAAC;QACD,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEtE,IAAI,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEhE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC7B,IAAI,gBAAgB,CAAC,EAAE,CAAC,EAAE,CAAC;oBACzB,aAAa,GAAG,IAAI,CAAC;oBACrB,yCAAyC;oBACzC,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,aAAa,IAAI,WAAW,CAAC;IACtC,CAAC;IAED,wEAAwE;IAChE,aAAa,CAAC,MAAe;QACnC,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAEvE,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACzC,WAAW,GAAG,IAAI,CAAC;YACnB,gFAAgF;QAClF,CAAC;aAAM,CAAC;YACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACvC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxB,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1B,WAAW,GAAG,IAAI,CAAC;oBACnB,0CAA0C;oBAC1C,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,4FAA4F;IACpF,eAAe,CAAC,QAAkB;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAI,IAAI,CAAC,IAAI,IAAI,aAAa,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvB,YAAY,GAAG,IAAI,CAAC;gBACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;gBAE1C,MAAM,gBAAgB,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,MAAM,cAAc,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,IAAI,CAAC,kBAAkB,GAAG;oBACxB,gBAAgB,CAAC,CAAC,CAAC;oBACnB,gBAAgB,CAAC,CAAC,CAAC;oBACnB,cAAc,CAAC,CAAC,CAAC;oBACjB,cAAc,CAAC,CAAC,CAAC;iBAClB,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,YAAY,KAAK,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YACzD,+DAA+D;YAC/D,YAAY,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;YAC5C,IAAI,CAAC,kBAAkB,GAAG,eAAe,CAAC,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;QAC/C,8FAA8F;QAC9F,sEAAsE;QACtE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC;YAC1C,YAAY,GAAG,YAAY,IAAI,OAAO,KAAK,OAAO,CAAC;YACnD,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;YACrE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;YAC9B,YAAY,GAAG,YAAY,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1F,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,cAAc,GAAG,YAAY,CAAC;gBACjC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,OAAO;gBACb,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,oBAAoB;QAClB,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE;gBACpE,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,UAAU;gBACxB,WAAW,EAAE,KAAK;aACnB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,MAAe;QAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM;QACJ,MAAM,EAAC,GAAG,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC;QAC/B,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAClC,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YACzC,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;CACF;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAAC,UAAsB,EAAE,MAAe;IACpE,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,gFAAgF;AAChF,SAAS,OAAO,CAAC,KAAY;IAC3B,OAAO,KAAK,EAAE,CAAC;QACb,sCAAsC;QACtC,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QAC3B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK,GAAG,KAAK,CAAC,MAAe,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,SAAS,CAAC,EAAyB,EAAE,EAAyB;IACrE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;QACb,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

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

@@ -1,4 +1,4 @@
-import { TerrainModuleSettings } from "./shader-module.js";
+import { TerrainModuleProps } from "./shader-module.js";
 import type { Effect, EffectContext, PreRenderOptions, Layer } from '@deck.gl/core';
 /** Class to manage terrain effect */
 export declare class TerrainEffect implements Effect {
@@ -19,7 +19,9 @@ export declare class TerrainEffect implements Effect {
     private terrainCovers;
     setup({ device, deck }: EffectContext): void;
     preRender(opts: PreRenderOptions): void;
-    getModuleParameters(layer: Layer): Omit<TerrainModuleSettings, 'picking'>;
+    getShaderModuleProps(layer: Layer, otherShaderModuleProps: Record<string, any>): {
+        terrain: TerrainModuleProps;
+    };
     cleanup({ deck }: EffectContext): void;
     private _updateHeightMap;
     private _updateTerrainCovers;

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":"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;IAmBnC,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;IAoBpC,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":"AAOA,OAAO,EAAgB,kBAAkB,EAAC,2BAAwB;AAMlE,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,oBAAoB,CAClB,KAAK,EAAE,KAAK,EACZ,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1C;QAAC,OAAO,EAAE,kBAAkB,CAAA;KAAC;IAiBhC,OAAO,CAAC,EAAC,IAAI,EAAC,EAAE,aAAa,GAAG,IAAI;IAmBpC,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,mBAAmB;IA4C3B,OAAO,CAAC,mBAAmB;CAY5B"}

package/dist/terrain/terrain-effect.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { log } from '@deck.gl/core';
 import { terrainModule } from "./shader-module.js";
 import { TerrainCover } from "./terrain-cover.js";
@@ -31,7 +34,6 @@ export class TerrainEffect {
         else {
             log.warn('Terrain offset mode is not supported by this browser')();
         }
-        // @ts-expect-error stricter luma gl types
         deck._addDefaultShaderModule(terrainModule);
     }
     preRender(opts) {
@@ -61,15 +63,19 @@ export class TerrainEffect {
         const drapeLayers = layers.filter(l => l.state.terrainDrawMode === 'drape');
         this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
     }
-    getModuleParameters(layer) {
+    getShaderModuleProps(layer, otherShaderModuleProps) {
         const { terrainDrawMode } = layer.state;
         return {
-            heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
-            heightMapBounds: this.heightMap?.bounds,
-            dummyHeightMap: this.dummyHeightMap,
-            terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
-            useTerrainHeightMap: terrainDrawMode === 'offset',
-            terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
+            terrain: {
+                project: otherShaderModuleProps.project,
+                isPicking: this.isPicking,
+                heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
+                heightMapBounds: this.heightMap?.bounds,
+                dummyHeightMap: this.dummyHeightMap,
+                terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
+                useTerrainHeightMap: terrainDrawMode === 'offset',
+                terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
+            }
         };
     }
     cleanup({ deck }) {
@@ -85,7 +91,6 @@ export class TerrainEffect {
             terrainCover.delete();
         }
         this.terrainCovers.clear();
-        // @ts-expect-error stricter luma gl types
         deck._removeDefaultShaderModule(terrainModule);
     }
     _updateHeightMap(terrainLayers, viewport, opts) {
@@ -100,11 +105,15 @@ export class TerrainEffect {
         this.terrainPass.renderHeightMap(this.heightMap, {
             ...opts,
             layers: terrainLayers,
-            moduleParameters: {
-                heightMapBounds: this.heightMap.bounds,
-                dummyHeightMap: this.dummyHeightMap,
-                devicePixelRatio: 1,
-                drawToTerrainHeightMap: true
+            shaderModuleProps: {
+                terrain: {
+                    heightMapBounds: this.heightMap.bounds,
+                    dummyHeightMap: this.dummyHeightMap,
+                    drawToTerrainHeightMap: true
+                },
+                project: {
+                    devicePixelRatio: 1
+                }
             }
         });
     }
@@ -144,10 +153,14 @@ export class TerrainEffect {
                 renderPass.renderTerrainCover(terrainCover, {
                     ...opts,
                     layers: drapeLayers,
-                    moduleParameters: {
-                        dummyHeightMap: this.dummyHeightMap,
-                        terrainSkipRender: false,
-                        devicePixelRatio: 1
+                    shaderModuleProps: {
+                        terrain: {
+                            dummyHeightMap: this.dummyHeightMap,
+                            terrainSkipRender: false
+                        },
+                        project: {
+                            devicePixelRatio: 1
+                        }
                     }
                 });
                 if (!this.isPicking) {
@@ -174,3 +187,4 @@ export class TerrainEffect {
         }
     }
 }
+//# sourceMappingURL=terrain-effect.js.map

package/dist/terrain/terrain-effect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terrain-effect.js","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"terrain-extension.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAI/D,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAMzC,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtC,CAAC;AASF,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,CAAC,YAAY;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAsB;IAE1C,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC,GAAG,GAAG;IAMnD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC;IAIlD,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC,EAClC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAyBxD,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI;CAMrC"}
+{"version":3,"file":"terrain-extension.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAI/D,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAMzC,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtC,CAAC;AASF,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,cAAc;IAC1D,MAAM,CAAC,YAAY;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAsB;IAE1C,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC,GAAG,GAAG;IAMnD,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC;IAIlD,WAAW,CACT,IAAI,EAAE,KAAK,CAAC,qBAAqB,CAAC,EAClC,MAAM,EAAE,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAyBxD,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI;CAMrC"}

package/dist/terrain/terrain-extension.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { LayerExtension } from '@deck.gl/core';
 import { TerrainEffect } from "./terrain-effect.js";
 import { terrainModule } from "./shader-module.js";
@@ -43,3 +46,4 @@ class TerrainExtension extends LayerExtension {
 TerrainExtension.defaultProps = defaultProps;
 TerrainExtension.extensionName = 'TerrainExtension';
 export default TerrainExtension;
+//# sourceMappingURL=terrain-extension.js.map

package/dist/terrain/terrain-extension.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terrain-extension.js","sourceRoot":"","sources":["../../src/terrain/terrain-extension.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,cAAc,EAAmB,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,aAAa,EAAC,2BAAwB;AAI9C,MAAM,YAAY,GAAG;IACnB,eAAe,EAAE,SAAS;CAC3B,CAAC;AAiBF,wDAAwD;AACxD,MAAqB,gBAAiB,SAAQ,cAAc;IAI1D,UAAU;QACR,OAAO;YACL,OAAO,EAAE,CAAC,aAAa,CAAC;SACzB,CAAC;IACJ,CAAC;IAED,eAAe;QACb,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,WAAW,CAET,MAAsD;QAEtD,MAAM,EAAC,KAAK,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC;QAEjC,IACE,IAAI,CAAC,KAAK,CAAC,eAAe;YAC1B,KAAK,CAAC,eAAe,KAAK,QAAQ,CAAC,eAAe;YAClD,+CAA+C;YAC/C,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,EACpC,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,EAAC,eAAe,EAAC,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,iEAAiE;YACjE,+CAA+C;YAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAmB,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU,CAAC;YAC1D,MAAM,SAAS,GAAG,UAAU,IAAI,mBAAmB,IAAI,UAAU,CAAC;YAClE,eAAe,GAAG,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAC,eAAe,EAAC,CAAC,CAAC;IACnC,CAAC;IAED,aAAa;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,KAA8B,CAAC;QAClD,IAAI,KAAK,CAAC,eAAe,KAAK,OAAO,EAAE,CAAC;YACtC,KAAK,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACvC,CAAC;IACH,CAAC;;AA7CM,6BAAY,GAAG,YAAY,CAAC;AAC5B,8BAAa,GAAG,kBAAkB,CAAC;eAFvB,gBAAgB"}

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

@@ -1,3 +1,4 @@
+import { Parameters } from '@luma.gl/core';
 import { Layer, Viewport, _LayersPass as LayersPass, LayersPassRenderOptions } from '@deck.gl/core';
 import type { HeightMapBuilder } from "./height-map-builder.js";
 import type { TerrainCover } from "./terrain-cover.js";
@@ -7,47 +8,11 @@ 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): {
-        cullMode?: import("@luma.gl/core").CullMode | undefined;
-        frontFace?: import("@luma.gl/core").FrontFace | undefined;
-        depthBias?: number | undefined;
-        depthBiasSlopeScale?: number | undefined;
-        depthBiasClamp?: number | undefined;
-        unclippedDepth?: boolean | undefined;
-        provokingVertex?: "first" | "last" | undefined;
-        polygonMode?: "fill" | "line" | undefined;
-        polygonOffsetLine?: boolean | undefined;
-        clipDistance0?: boolean | undefined;
-        clipDistance1?: boolean | undefined;
-        clipDistance2?: boolean | undefined;
-        clipDistance3?: boolean | undefined;
-        clipDistance4?: boolean | undefined;
-        clipDistance5?: boolean | undefined;
-        clipDistance6?: boolean | undefined;
-        clipDistance7?: boolean | undefined;
-        topology?: import("@luma.gl/core").PrimitiveTopology | undefined;
-        stripIndexFormat?: import("@luma.gl/core").IndexFormat | undefined;
-        depthWriteEnabled?: boolean | undefined;
-        depthCompare?: import("@luma.gl/core").CompareFunction | undefined;
-        depthFormat?: import("@luma.gl/core").DepthStencilTextureFormat | undefined;
-        stencilReadMask?: number | undefined;
-        stencilWriteMask?: number | undefined;
-        stencilCompare?: import("@luma.gl/core").CompareFunction | undefined;
-        stencilPassOperation?: import("@luma.gl/core").StencilOperation | undefined;
-        stencilFailOperation?: import("@luma.gl/core").StencilOperation | undefined;
-        stencilDepthFailOperation?: import("@luma.gl/core").StencilOperation | undefined;
-        blendColorOperation?: import("@luma.gl/core").BlendOperation | undefined;
-        blendColorSrcFactor?: import("@luma.gl/core").BlendFactor | undefined;
-        blendColorDstFactor?: import("@luma.gl/core").BlendFactor | undefined;
-        blendAlphaOperation?: import("@luma.gl/core").BlendOperation | undefined;
-        blendAlphaSrcFactor?: import("@luma.gl/core").BlendFactor | undefined;
-        blendAlphaDstFactor?: import("@luma.gl/core").BlendFactor | undefined;
-        colorMask?: number | undefined;
-        sampleCount?: number | undefined;
-        sampleMask?: number | undefined;
-        sampleAlphaToCoverageEnabled?: boolean | undefined;
-        blend: boolean;
-        depthTest: boolean;
+    protected getLayerParameters(layer: Layer<{}>, layerIndex: number, viewport: Viewport): Parameters;
+    getShaderModuleProps(layer: Layer, effects: any, otherShaderModuleProps: Record<string, any>): {
+        terrain: {
+            project: 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;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"}
+{"version":3,"file":"terrain-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,UAAU,EAA2B,MAAM,eAAe,CAAC;AACnE,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,CAC1B,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,GACjB,UAAU;IASb,oBAAoB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;;CAO7F"}