@webviz/subsurface-viewer 1.11.0 → 1.11.2

package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js

@@ -1,5 +1,5 @@
 const fsHillshading = `#version 300 es
-#define SHADER_NAME hillshading2d-shader
+#define SHADER_NAME hillshading2d-fragment-shader
 
 precision highp float;
 
@@ -8,22 +8,15 @@ in vec2 vTexCoord;
 out vec4 fragColor;
 
 uniform sampler2D bitmapTexture; // Property map
-uniform vec2 bitmapResolution;
 
-uniform float valueRangeSize;
-
-uniform vec3 lightDirection;
-uniform float ambientLightIntensity;
-uniform float diffuseLightIntensity;
-uniform float opacity;
 
 // Compute the normal value for every pixel, based on the current value and two values aroud it.
 vec3 normal(float val) {
-  vec2 dr = 1.0 / bitmapResolution;
-  float p0 = valueRangeSize * val;
+  vec2 dr = 1.0 / map.bitmapResolution;
+  float p0 = map.valueRangeSize * val;
 
-  float px = valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(1.0, 0.0) / bitmapResolution).rgb);
-  float py = valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(0.0, 1.0) / bitmapResolution).rgb);
+  float px = map.valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(1.0, 0.0) / map.bitmapResolution).rgb);
+  float py = map.valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(0.0, 1.0) / map.bitmapResolution).rgb);
   vec3 dx = vec3(1.0, 0.0, px - p0);
   vec3 dy = vec3(0.0, 1.0, py - p0);
 
@@ -32,8 +25,8 @@ vec3 normal(float val) {
 
 // Compute how much a pixel is in the shadow based on its normal and where the light comes from.
 float shadow(vec3 normal) {
-  float diffuse = diffuseLightIntensity * dot(normal, normalize(lightDirection));
-  return clamp(ambientLightIntensity + diffuse, 0.0, 1.0);
+  float diffuse = map.diffuseLightIntensity * dot(normal, normalize(map.lightDirection));
+  return clamp(map.ambientLightIntensity + diffuse, 0.0, 1.0);
 }
 
 void main(void) {
@@ -54,7 +47,7 @@ void main(void) {
   // opacity 0 if pixel is completely in the light, opacity 1 if pixel is completely in the shadow.
   // The property map opacity (some portions of the property map can be transparent) and
   // the user provided image-wide opacity value are also taken into account.
-  fragColor = vec4(vec3(0.0), (1.0-shadow) * bitmapColor.a * opacity);
+  fragColor = vec4(vec3(0.0), (1.0-shadow) * bitmapColor.a * layer.opacity);
 
   geometry.uv = vTexCoord;
   DECKGL_FILTER_COLOR(fragColor, geometry);

package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"hillshading2d.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/hillshading2d/hillshading2d.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DrB,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"hillshading2d.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/hillshading2d/hillshading2d.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDrB,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/layers/hillshading2d/hillshading2dLayer.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
-import type { PickingInfo } from "@deck.gl/core";
-import type { BitmapLayerPickingInfo, BitmapLayerProps } from "@deck.gl/layers";
+import { type PickingInfo } from "@deck.gl/core";
 import { BitmapLayer } from "@deck.gl/layers";
+import type { BitmapLayerPickingInfo, BitmapLayerProps } from "@deck.gl/layers";
+import type { Model } from "@luma.gl/engine";
 import type { ReportBoundingBoxAction } from "../../components/Map";
 import type { LayerPickInfo } from "../../layers/utils/layerTools";
 import type { ValueDecoder } from "../utils/propertyMapTools";
@@ -17,7 +18,7 @@ export interface Hillshading2DProps extends BitmapLayerProps {
 }
 export default class Hillshading2DLayer extends BitmapLayer<Hillshading2DProps> {
     initializeState(): void;
-    draw({ moduleParameters, uniforms }: any): void;
+    setShaderModuleProps(...props: Parameters<Model["shaderInputs"]["setProps"]>): void;
     getShaders(): any;
     getPickingInfo({ info, }: {
         info: PickingInfo;

package/dist/layers/hillshading2d/hillshading2dLayer.js

@@ -1,5 +1,5 @@
+import { project32 } from "@deck.gl/core";
 import { BitmapLayer } from "@deck.gl/layers";
-import { decoder } from "../shader_modules";
 import { getModelMatrix } from "../utils/layerTools";
 import { decodeRGB } from "../utils/propertyMapTools";
 import fsHillshading from "./hillshading2d.fs.glsl";
@@ -27,10 +27,8 @@ export default class Hillshading2DLayer extends BitmapLayer {
     initializeState() {
         super.initializeState();
     }
-    // Signature from the base class, eslint doesn't like the any type.
-    // eslint-disable-next-line
-    draw({ moduleParameters, uniforms }) {
-        var _a, _b, _c, _d, _e, _f;
+    setShaderModuleProps(...props) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!this.isLoaded) {
             if (typeof this.props.reportBoundingBox !== "undefined") {
                 const xMin = this.props.bounds[0];
@@ -44,38 +42,57 @@ export default class Hillshading2DLayer extends BitmapLayer {
                 });
             }
         }
-        if (this.props.image) {
-            const mergedModuleParams = Object.assign(Object.assign({}, moduleParameters), { valueDecoder: Object.assign(Object.assign({}, defaultProps.valueDecoder), moduleParameters.valueDecoder), modelMatrix: getModelMatrix(this.props.rotDeg, this.props.bounds[0], // Rotate around upper left corner of bounds
-                this.props.bounds[3]) });
-            super.setModuleParameters(mergedModuleParams);
-            const valueRangeMin = (_a = this.props.valueRange[0]) !== null && _a !== void 0 ? _a : 0.0;
-            const valueRangeMax = (_b = this.props.valueRange[1]) !== null && _b !== void 0 ? _b : 1.0;
-            const colorMapRangeMin = (_d = (_c = this.props.colorMapRange) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : valueRangeMin;
-            const colorMapRangeMax = (_f = (_e = this.props.colorMapRange) === null || _e === void 0 ? void 0 : _e[1]) !== null && _f !== void 0 ? _f : valueRangeMax;
-            const [minVal, maxVal] = this.props.valueRange;
-            super.draw({
-                uniforms: Object.assign(Object.assign({}, uniforms), { 
-                    // Send extra uniforms to the shader.
-                    bitmapResolution: [
-                        this.props.image.width,
-                        this.props.image.height,
-                    ], valueRangeSize: maxVal - minVal, lightDirection: this.props.lightDirection, ambientLightIntensity: this.props.ambientLightIntensity, diffuseLightIntensity: this.props.diffuseLightIntensity, valueRangeMin,
-                    valueRangeMax,
-                    colorMapRangeMin,
-                    colorMapRangeMax }),
-                moduleParameters: mergedModuleParams,
-            });
+        // Set property for modelMatrix.
+        const m = getModelMatrix(this.props.rotDeg, this.props.bounds[0], // Rotate around upper left corner of bounds
+        this.props.bounds[3]);
+        for (const model of this.getModels()) {
+            const isDefined = ((_b = (_a = props[0]) === null || _a === void 0 ? void 0 : _a.project) === null || _b === void 0 ? void 0 : _b.modelMatrix) !== undefined;
+            if (isDefined) {
+                props[0]["project"].modelMatrix =
+                    m;
+            }
+            model.shaderInputs.setProps(...props);
         }
+        const valueRangeMin = (_c = this.props.valueRange[0]) !== null && _c !== void 0 ? _c : 0.0;
+        const valueRangeMax = (_d = this.props.valueRange[1]) !== null && _d !== void 0 ? _d : 1.0;
+        const colorMapRangeMin = (_f = (_e = this.props.colorMapRange) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : valueRangeMin;
+        const colorMapRangeMax = (_h = (_g = this.props.colorMapRange) === null || _g === void 0 ? void 0 : _g[1]) !== null && _h !== void 0 ? _h : valueRangeMax;
+        const [minVal, maxVal] = this.props.valueRange;
+        const bitmapResolution = this.props.image
+            ? [
+                this.props.image.width,
+                this.props.image.height,
+            ]
+            : [1, 1];
+        const valueRangeSize = maxVal - minVal;
+        const lightDirection = this.props.lightDirection;
+        const ambientLightIntensity = this.props.ambientLightIntensity;
+        const diffuseLightIntensity = this.props.diffuseLightIntensity;
+        super.setShaderModuleProps({
+            map: {
+                valueRangeMin,
+                valueRangeMax,
+                colorMapRangeMin,
+                colorMapRangeMax,
+                bitmapResolution,
+                valueRangeSize,
+                lightDirection,
+                ambientLightIntensity,
+                diffuseLightIntensity,
+                rgbScaler: this.props.valueDecoder.rgbScaler,
+                floatScaler: this.props.valueDecoder.floatScaler,
+                offset: this.props.valueDecoder.offset,
+                step: this.props.valueDecoder.step,
+            },
+        });
     }
-    // Signature from the base class, eslint doesn't like the any type.
-    // eslint-disable-next-line
     getShaders() {
         const parentShaders = super.getShaders();
-        // Overwrite the BitmapLayer's default fragment shader with ours, that does hillshading.
-        parentShaders.fs = fsHillshading;
-        // Add the decoder shader module to our colormap shader, so we can use the decoder function from our shader.
-        parentShaders.modules.push(decoder);
-        return parentShaders;
+        // use object.assign to make sure we don't overwrite existing fields like `vs`, `modules`...
+        return Object.assign({}, parentShaders, {
+            fs: fsHillshading,
+            modules: [...parentShaders.modules, project32, map2DUniforms],
+        });
     }
     getPickingInfo({ info, }) {
         if (!info.color) {
@@ -93,4 +110,63 @@ export default class Hillshading2DLayer extends BitmapLayer {
 }
 Hillshading2DLayer.layerName = "Hillshading2DLayer";
 Hillshading2DLayer.defaultProps = defaultProps;
+// local shader module for the uniforms
+const map2DUniformsBlock = /*glsl*/ `\
+uniform mapUniforms {
+    float valueRangeMin;
+    float valueRangeMax;
+    float colorMapRangeMin;
+    float colorMapRangeMax;
+
+    vec2 bitmapResolution;
+    float valueRangeSize;
+    vec3 lightDirection;
+    float ambientLightIntensity;
+    float diffuseLightIntensity;
+
+    vec3 rgbScaler;    // r, g and b multipliers
+    float floatScaler; // value multiplier
+    float offset;      // translation of the r, g, b sum
+    float step;        // discretize the value in a number of
+} map;
+
+float decode_rgb2float(vec3 rgb) {
+  rgb *= map.rgbScaler * vec3(16711680.0, 65280.0, 255.0); //255*256*256, 255*256, 255
+  float value = (rgb.r + rgb.g + rgb.b + map.offset) * map.floatScaler;
+
+  // Value must be in [0, 1] and step in (0, 1]
+  if (map.step > 0.0) {
+    value = floor(value / map.step + 0.5) * map.step;
+  }
+
+  // If colorMapRangeMin/Max specified, color map will span this interval.
+  float x  = value * (map.valueRangeMax - map.valueRangeMin) + map.valueRangeMin;
+  x = (x - map.colorMapRangeMin) / (map.colorMapRangeMax - map.colorMapRangeMin);
+  x = max(0.0, x);
+  x = min(1.0, x);
+
+  return x;
+}
+`;
+// NOTE: this must exactly the same name as in the uniform block
+const map2DUniforms = {
+    name: "map",
+    vs: map2DUniformsBlock,
+    fs: map2DUniformsBlock,
+    uniformTypes: {
+        valueRangeMin: "f32",
+        valueRangeMax: "f32",
+        colorMapRangeMin: "f32",
+        colorMapRangeMax: "f32",
+        bitmapResolution: "vec2<f32>",
+        valueRangeSize: "f32",
+        lightDirection: "vec3<f32>",
+        ambientLightIntensity: "f32",
+        diffuseLightIntensity: "f32",
+        rgbScaler: "vec3<f32>",
+        floatScaler: "f32",
+        offset: "f32",
+        step: "f32",
+    },
+};
 //# sourceMappingURL=hillshading2dLayer.js.map

package/dist/layers/hillshading2d/hillshading2dLayer.js.map

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

package/dist/layers/map/fragment.glsl.d.ts

@@ -0,0 +1,2 @@
+declare const fsShader = "#version 300 es\n#define SHADER_NAME map-fragment-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nflat in int vertexIndex;\n\nin vec3 worldPos;\nin float property;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\n\nvoid main(void) { \n   geometry.uv = vTexCoord;\n\n   vec3 normal = normals_commonspace;\n\n   if(!map.smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {\n      normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n   }\n\n   //Picking pass.\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);\n      return;\n   }\n\n   vec4 color = vec4(1.0, 1.0, 1.0,  1.0);\n   float propertyValue = property;\n\n   // This may happen due to GPU interpolation precision causing color artifacts.\n   propertyValue = clamp(propertyValue, map.valueRangeMin, map.valueRangeMax);\n\n   float x = (propertyValue - map.colorMapRangeMin) / (map.colorMapRangeMax - map.colorMapRangeMin);\n   if (x < 0.0 || x > 1.0) {\n      // Out of range. Use clampcolor.\n      if (map.isClampColor) {\n         color = vec4(map.colorMapClampColor.rgb, 1.0);\n      }\n      else if (map.isColorMapClampColorTransparent) {\n         discard;\n         return;\n      }\n      else {\n         // Use min/max color to clamp.\n         x = max(0.0, x);\n         x = min(1.0, x);\n\n         color = texture(colormap, vec2(x, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(x, 0.5));\n   }\n\n   bool is_contours = map.contourReferencePoint != -1.0 && map.contourInterval != -1.0;\n   if (is_contours) {\n      float val = map.isContoursDepth ? (abs(worldPos.z) - map.contourReferencePoint) / map.contourInterval\n                                  : (propertyValue - map.contourReferencePoint) / map.contourInterval;\n\n      float f  = fract(val);\n      float df = fwidth(val);\n\n      // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance from contour line.\n      float c = smoothstep(0.0, df * 2.0, f);\n\n      color = color * vec4(c, c, c, 1.0);\n   }\n\n   // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n   vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n\n   fragColor = vec4(lightColor, 1.0);\n\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+export default fsShader;

package/dist/layers/map/{fragment.fs.glsl.js → fragment.glsl.js}

@@ -1,5 +1,5 @@
 const fsShader = `#version 300 es
-#define SHADER_NAME terrainmap-shader
+#define SHADER_NAME map-fragment-shader
 
 precision highp float;
 
@@ -18,26 +18,13 @@ out vec4 fragColor;
 
 uniform sampler2D colormap;
 
-uniform bool isContoursDepth;
-uniform float contourReferencePoint;
-uniform float contourInterval;
-
-uniform float valueRangeMin;
-uniform float valueRangeMax;
-uniform float colorMapRangeMin;
-uniform float colorMapRangeMax;
-
-uniform vec3 colorMapClampColor;
-uniform bool isClampColor;
-uniform bool isColorMapClampColorTransparent;
-uniform bool smoothShading;
 
 void main(void) { 
    geometry.uv = vTexCoord;
 
    vec3 normal = normals_commonspace;
 
-   if (!smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {
+   if(!map.smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {
       normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
    }
 
@@ -51,16 +38,15 @@ void main(void) {
    float propertyValue = property;
 
    // This may happen due to GPU interpolation precision causing color artifacts.
-   propertyValue = clamp(propertyValue, valueRangeMin, valueRangeMax);
+   propertyValue = clamp(propertyValue, map.valueRangeMin, map.valueRangeMax);
 
-   float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);
+   float x = (propertyValue - map.colorMapRangeMin) / (map.colorMapRangeMax - map.colorMapRangeMin);
    if (x < 0.0 || x > 1.0) {
       // Out of range. Use clampcolor.
-      if (isClampColor) {
-         color = vec4(colorMapClampColor.rgb, 1.0);
-
+      if (map.isClampColor) {
+         color = vec4(map.colorMapClampColor.rgb, 1.0);
       }
-      else if (isColorMapClampColorTransparent) {
+      else if (map.isColorMapClampColorTransparent) {
          discard;
          return;
       }
@@ -76,25 +62,27 @@ void main(void) {
       color = texture(colormap, vec2(x, 0.5));
    }
 
-   bool is_contours = contourReferencePoint != -1.0 && contourInterval != -1.0;
+   bool is_contours = map.contourReferencePoint != -1.0 && map.contourInterval != -1.0;
    if (is_contours) {
-      float val = isContoursDepth ? (abs(worldPos.z) - contourReferencePoint) / contourInterval
-                                  : (propertyValue - contourReferencePoint) / contourInterval;
+      float val = map.isContoursDepth ? (abs(worldPos.z) - map.contourReferencePoint) / map.contourInterval
+                                  : (propertyValue - map.contourReferencePoint) / map.contourInterval;
 
       float f  = fract(val);
       float df = fwidth(val);
 
-      // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance fronm contour line.
+      // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance from contour line.
       float c = smoothstep(0.0, df * 2.0, f);
 
       color = color * vec4(c, c, c, 1.0);
    }
 
    // Use two sided phong lighting. This has no effect if "material" property is not set.
-   vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+   vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+
    fragColor = vec4(lightColor, 1.0);
+
    DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;
 export default fsShader;
-//# sourceMappingURL=fragment.fs.glsl.js.map
+//# sourceMappingURL=fragment.glsl.js.map

package/dist/layers/map/fragment.glsl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fragment.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqFhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/layers/map/fragment_lines.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const fragmentShader = "#version 300 es\n#define SHADER_NAME graph-layer-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const fragmentShader = "#version 300 es\n#define SHADER_NAME map-lines-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default fragmentShader;

package/dist/layers/map/fragment_lines.glsl.js

@@ -1,6 +1,6 @@
 const fragmentShader = `\
 #version 300 es
-#define SHADER_NAME graph-layer-fragment-shader
+#define SHADER_NAME map-lines-fragment-shader
 
 precision highp float;
 

package/dist/layers/map/mapLayer.d.ts

@@ -3,7 +3,7 @@ import type { Color, CompositeLayerProps, Layer, UpdateParameters } from "@deck.
 import { CompositeLayer } from "@deck.gl/core";
 import type { ReportBoundingBoxAction } from "../../components/Map";
 import type { ExtendedLayerProps, ColorMapFunctionType } from "../utils/layerTools";
-import type { Material } from "./privateMapLayer";
+import type { Material } from "@deck.gl/core";
 import PrivateMapLayer from "./privateMapLayer";
 type Frame = {
     /** mesh origin

package/dist/layers/map/mapLayer.js

@@ -235,6 +235,7 @@ export default class MapLayer extends CompositeLayer {
         if (isModelMatrix) {
             rotatingModelMatrix.multiplyRight(this.props.modelMatrix);
         }
+        const enableLighting = !(this.props.material === false);
         const layer = new PrivateMapLayer(this.getSubLayerProps({
             positions: this.state["positions"],
             normals: this.state["normals"],
@@ -255,6 +256,7 @@ export default class MapLayer extends CompositeLayer {
             smoothShading: this.props.smoothShading,
             depthTest: this.props.depthTest,
             ZIncreasingDownwards: this.props.ZIncreasingDownwards,
+            enableLighting,
         }));
         return [layer];
     }

package/dist/layers/map/mapLayer.js.map

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

package/dist/layers/map/privateMapLayer.d.ts

@@ -1,15 +1,9 @@
-import type { Color, LayerContext, PickingInfo, UpdateParameters } from "@deck.gl/core";
-import { Layer } from "@deck.gl/core";
+import type { Color, PickingInfo, UpdateParameters, LayerContext } from "@deck.gl/core";
 import type { Device, UniformValue } from "@luma.gl/core";
-import { Model } from "@luma.gl/engine";
 import type { ExtendedLayerProps, LayerPickInfo, ColorMapFunctionType } from "../utils/layerTools";
 import type { DeckGLLayerContext } from "../../components/Map";
-export type Material = {
-    ambient: number;
-    diffuse: number;
-    shininess: number;
-    specularColor: [number, number, number];
-} | boolean;
+import { Layer } from "@deck.gl/core";
+import { Model } from "@luma.gl/engine";
 export interface PrivateMapLayerProps extends ExtendedLayerProps {
     positions: Float32Array;
     normals: Float32Array;
@@ -28,9 +22,13 @@ export interface PrivateMapLayerProps extends ExtendedLayerProps {
     smoothShading: boolean;
     depthTest: boolean;
     ZIncreasingDownwards: boolean;
+    enableLighting: boolean;
 }
 export default class PrivateMapLayer extends Layer<PrivateMapLayerProps> {
     get isLoaded(): boolean;
+    setShaderModuleProps(args: Partial<{
+        [x: string]: Partial<Record<string, unknown> | undefined>;
+    }>): void;
     initializeState(context: DeckGLLayerContext): void;
     shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
     updateState({ context }: UpdateParameters<this>): void;