@webviz/subsurface-viewer 1.11.0 → 1.11.1

package/dist/layers/grid3d/privateGrid3dLayer.d.ts

@@ -21,25 +21,46 @@ export interface PrivateLayerProps extends ExtendedLayerProps {
     discretePropertyValueNames?: IDiscretePropertyValueName[];
     depthTest: boolean;
     ZIncreasingDownwards: boolean;
+    enableLighting: boolean;
 }
 export default class PrivateLayer extends Layer<PrivateLayerProps> {
     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;
-    _getModels(context: DeckGLLayerContext): Model[];
+    shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<Layer<PrivateLayerProps>>): boolean;
+    updateState({ context }: UpdateParameters<Layer<PrivateLayerProps>>): void;
+    _getModels(context: DeckGLLayerContext): (Model | {
+        readonly name: "grid";
+        readonly vs: "uniform gridUniforms {\n    bool ZIncreasingDownwards;\n    float valueRangeMin;\n    float valueRangeMax;\n    float colorMapRangeMin;\n    float colorMapRangeMax;\n    vec4 colorMapClampColor;\n    bool isClampColor;\n    float coloringMode;\n    vec3 undefinedPropertyColor;\n    bool isColoringDiscrete;\n    float colorMapSize;\n} grid;\n";
+        readonly fs: "uniform gridUniforms {\n    bool ZIncreasingDownwards;\n    float valueRangeMin;\n    float valueRangeMax;\n    float colorMapRangeMin;\n    float colorMapRangeMax;\n    vec4 colorMapClampColor;\n    bool isClampColor;\n    float coloringMode;\n    vec3 undefinedPropertyColor;\n    bool isColoringDiscrete;\n    float colorMapSize;\n} grid;\n";
+        readonly uniformTypes: {
+            readonly ZIncreasingDownwards: "u32";
+            readonly valueRangeMin: "f32";
+            readonly valueRangeMax: "f32";
+            readonly colorMapRangeMin: "f32";
+            readonly colorMapRangeMax: "f32";
+            readonly colorMapClampColor: "vec4<f32>";
+            readonly isClampColor: "u32";
+            readonly coloringMode: "f32";
+            readonly undefinedPropertyColor: "vec3<f32>";
+            readonly isColoringDiscrete: "u32";
+            readonly colorMapSize: "f32";
+        };
+    })[];
     draw(args: {
         moduleParameters?: unknown;
         uniforms: UniformValue;
         context: LayerContext;
     }): void;
     decodePickingColor(): number;
-    encodePickingColor(): number[];
+    encodePickingColor(): [number, number, number];
     getPickingInfo({ info }: {
         info: PickingInfo;
     }): LayerPickInfo;
     private getPropertyText;
     private getColoringHints;
-    private getPropertyUniforms;
+    private getUniforms;
     private getColormapTexture;
 }

package/dist/layers/grid3d/privateGrid3dLayer.js

@@ -1,6 +1,8 @@
 import { COORDINATE_SYSTEM, Layer, picking, project32 } from "@deck.gl/core";
 import { Geometry, Model } from "@luma.gl/engine";
-import { localPhongLighting, utilities } from "../shader_modules";
+import { utilities } from "../shader_modules";
+import { lighting } from "@luma.gl/shadertools";
+import { phongMaterial } from "../shader_modules/phong-lighting/phong-material";
 import { createPropertyData, getImageData } from "../utils/layerTools";
 import linearFragmentShader from "./nodeProperty.fs.glsl";
 import linearVertexShader from "./nodeProperty.vs.glsl";
@@ -30,6 +32,7 @@ const defaultProps = {
     propertyValueRange: [0.0, 1.0],
     depthTest: true,
     ZIncreasingDownwards: true,
+    enableLighting: true,
 };
 // This is a private layer used only by the composite Grid3DLayer
 export default class PrivateLayer extends Layer {
@@ -37,6 +40,9 @@ export default class PrivateLayer extends Layer {
         var _a;
         return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
     }
+    setShaderModuleProps(args) {
+        super.setShaderModuleProps(Object.assign(Object.assign({}, args), { lighting: Object.assign(Object.assign({}, args["lighting"]), { enabled: this.props.enableLighting }) }));
+    }
     initializeState(context) {
         const [model_mesh, mesh_lines_model] = this._getModels(context);
         this.setState({
@@ -59,7 +65,7 @@ export default class PrivateLayer extends Layer {
     _getModels(context) {
         var _a;
         const geometricShading = isGeometricProperty(this.props.coloringMode);
-        const propertyUniforms = this.getPropertyUniforms();
+        const uniforms = this.getUniforms();
         const colormap = this.getColormapTexture(context);
         const mesh_model = new Model(context.device, {
             id: `${this.props.id}-mesh`,
@@ -75,26 +81,35 @@ export default class PrivateLayer extends Layer {
                 vertexCount: this.props.mesh.vertexCount,
             }),
             bufferLayout: this.getAttributeManager().getBufferLayouts(),
-            uniforms: Object.assign({}, propertyUniforms),
             bindings: {
                 colormap,
             },
-            modules: [project32, picking, localPhongLighting, utilities],
+            modules: [
+                project32,
+                picking,
+                lighting,
+                phongMaterial,
+                utilities,
+                gridUniforms,
+            ],
             isInstanced: false,
         });
+        mesh_model.shaderInputs.setProps({
+            grid: Object.assign({}, uniforms),
+        });
         const mesh_lines_model = new Model(context.device, {
             id: `${this.props.id}-lines`,
             vs: vsLineShader,
             fs: fsLineShader,
             geometry: new Geometry(this.props.meshLines),
             bufferLayout: this.getAttributeManager().getBufferLayouts(),
-            uniforms: {
-                ZIncreasingDownwards: this.props.ZIncreasingDownwards,
-            },
-            modules: [project32, picking],
+            modules: [project32, picking, gridUniforms],
             isInstanced: false,
         });
-        return [mesh_model, mesh_lines_model];
+        mesh_lines_model.shaderInputs.setProps({
+            grid: Object.assign({}, uniforms),
+        });
+        return [mesh_model, mesh_lines_model, gridUniforms];
     }
     draw(args) {
         if (!this.state["models"]) {
@@ -194,7 +209,7 @@ export default class PrivateLayer extends Layer {
             colormapSize: 256,
         };
     }
-    getPropertyUniforms() {
+    getUniforms() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const valueRangeMin = (_b = (_a = this.props.propertyValueRange) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 0.0;
         const valueRangeMax = (_d = (_c = this.props.propertyValueRange) === null || _c === void 0 ? void 0 : _c[1]) !== null && _d !== void 0 ? _d : 1.0;
@@ -221,18 +236,6 @@ export default class PrivateLayer extends Layer {
         }
         const undefinedPropertyColorUniform = this.props.undefinedPropertyColor.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
         const coloringHints = this.getColoringHints();
-        if (isGeometricProperty(this.props.coloringMode)) {
-            return {
-                ZIncreasingDownwards: this.props.ZIncreasingDownwards,
-                valueRangeMin,
-                valueRangeMax,
-                colorMapRangeMin,
-                colorMapRangeMax,
-                colorMapClampColor: Array.from(colorMapClampColorUniform),
-                isClampColor,
-                coloringMode: this.props.coloringMode,
-            };
-        }
         return {
             ZIncreasingDownwards: this.props.ZIncreasingDownwards,
             valueRangeMin,
@@ -241,6 +244,7 @@ export default class PrivateLayer extends Layer {
             colorMapRangeMax,
             colorMapClampColor: Array.from(colorMapClampColorUniform),
             isClampColor,
+            coloringMode: this.props.coloringMode,
             undefinedPropertyColor: undefinedPropertyColorUniform,
             isColoringDiscrete: coloringHints.discreteData,
             colorMapSize: coloringHints.colormapSize,
@@ -273,4 +277,38 @@ export default class PrivateLayer extends Layer {
 }
 PrivateLayer.layerName = "PrivateLayer";
 PrivateLayer.defaultProps = defaultProps;
+// local shader module for the uniforms
+const gridUniformsBlock = /*glsl*/ `\
+uniform gridUniforms {
+    bool ZIncreasingDownwards;
+    float valueRangeMin;
+    float valueRangeMax;
+    float colorMapRangeMin;
+    float colorMapRangeMax;
+    vec4 colorMapClampColor;
+    bool isClampColor;
+    float coloringMode;
+    vec3 undefinedPropertyColor;
+    bool isColoringDiscrete;
+    float colorMapSize;
+} grid;
+`;
+const gridUniforms = {
+    name: "grid",
+    vs: gridUniformsBlock,
+    fs: gridUniformsBlock,
+    uniformTypes: {
+        ZIncreasingDownwards: "u32",
+        valueRangeMin: "f32",
+        valueRangeMax: "f32",
+        colorMapRangeMin: "f32",
+        colorMapRangeMax: "f32",
+        colorMapClampColor: "vec4<f32>",
+        isClampColor: "u32",
+        coloringMode: "f32",
+        undefinedPropertyColor: "vec3<f32>",
+        isColoringDiscrete: "u32",
+        colorMapSize: "f32",
+    },
+};
 //# sourceMappingURL=privateGrid3dLayer.js.map

package/dist/layers/grid3d/privateGrid3dLayer.js.map

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

package/dist/layers/grid3d/vertex_lines.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME vertex-lines-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4 position_commonspace;\n\nuniform bool ZIncreasingDownwards;\n\nvoid main(void) {\n   vec3 position = positions;\n   position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;\n\n   vec3 position_commonspace = project_position(position);\n   gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME grid3d-lines-vertex-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4 position_commonspace;\n\nvoid main(void) {\n   vec3 position = positions;\n   position[2] *= grid.ZIncreasingDownwards ? -1.0 : 1.0;\n\n   vec3 position_commonspace = project_position(position);\n   gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));\n}\n";
 export default _default;

package/dist/layers/grid3d/vertex_lines.glsl.js

@@ -1,6 +1,6 @@
 export default `\
 #version 300 es
-#define SHADER_NAME vertex-lines-shader
+#define SHADER_NAME grid3d-lines-vertex-shader
 
 precision highp float;
 
@@ -8,11 +8,9 @@ in vec3 positions;
 
 out vec4 position_commonspace;
 
-uniform bool ZIncreasingDownwards;
-
 void main(void) {
    vec3 position = positions;
-   position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
+   position[2] *= grid.ZIncreasingDownwards ? -1.0 : 1.0;
 
    vec3 position_commonspace = project_position(position);
    gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));

package/dist/layers/grid3d/vertex_lines.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;CAmBd,CAAC"}
+{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;CAiBd,CAAC"}

package/dist/layers/hillshading2d/hillshading2d.fs.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const fsHillshading = "#version 300 es\n#define SHADER_NAME hillshading2d-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\n\nout vec4 fragColor;\n\nuniform sampler2D bitmapTexture; // Property map\nuniform vec2 bitmapResolution;\n\nuniform float valueRangeSize;\n\nuniform vec3 lightDirection;\nuniform float ambientLightIntensity;\nuniform float diffuseLightIntensity;\nuniform float opacity;\n\n// Compute the normal value for every pixel, based on the current value and two values aroud it.\nvec3 normal(float val) {\n  vec2 dr = 1.0 / bitmapResolution;\n  float p0 = valueRangeSize * val;\n\n  float px = valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(1.0, 0.0) / bitmapResolution).rgb);\n  float py = valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(0.0, 1.0) / bitmapResolution).rgb);\n  vec3 dx = vec3(1.0, 0.0, px - p0);\n  vec3 dy = vec3(0.0, 1.0, py - p0);\n\n  return normalize(cross(dx, dy));\n}\n\n// Compute how much a pixel is in the shadow based on its normal and where the light comes from.\nfloat shadow(vec3 normal) {\n  float diffuse = diffuseLightIntensity * dot(normal, normalize(lightDirection));\n  return clamp(ambientLightIntensity + diffuse, 0.0, 1.0);\n}\n\nvoid main(void) {\n  vec4 bitmapColor = texture(bitmapTexture, vTexCoord);\n\n  // If it's a picking pass, we just return the raw property map value.\n  if (picking.isActive > 0.5) {\n    fragColor = bitmapColor;\n    return;\n  }\n\n  // Decode the RGB value into a float. See decoder.fs.glsl for more details.\n  float val = decode_rgb2float(bitmapColor.rgb);\n  // Compute the shadow value, how dark a pixel will be, 1 is in complete shadow, 0 is in complete light.\n  float shadow = shadow(normal(val));\n\n  // The final pixel is black, with the opacity based on the shadow value,\n  // opacity 0 if pixel is completely in the light, opacity 1 if pixel is completely in the shadow.\n  // The property map opacity (some portions of the property map can be transparent) and\n  // the user provided image-wide opacity value are also taken into account.\n  fragColor = vec4(vec3(0.0), (1.0-shadow) * bitmapColor.a * opacity);\n\n  geometry.uv = vTexCoord;\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const fsHillshading = "#version 300 es\n#define SHADER_NAME hillshading2d-fragment-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\n\nout vec4 fragColor;\n\nuniform sampler2D bitmapTexture; // Property map\n\n\n// Compute the normal value for every pixel, based on the current value and two values aroud it.\nvec3 normal(float val) {\n  vec2 dr = 1.0 / map.bitmapResolution;\n  float p0 = map.valueRangeSize * val;\n\n  float px = map.valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(1.0, 0.0) / map.bitmapResolution).rgb);\n  float py = map.valueRangeSize * decode_rgb2float(texture(bitmapTexture, vTexCoord + vec2(0.0, 1.0) / map.bitmapResolution).rgb);\n  vec3 dx = vec3(1.0, 0.0, px - p0);\n  vec3 dy = vec3(0.0, 1.0, py - p0);\n\n  return normalize(cross(dx, dy));\n}\n\n// Compute how much a pixel is in the shadow based on its normal and where the light comes from.\nfloat shadow(vec3 normal) {\n  float diffuse = map.diffuseLightIntensity * dot(normal, normalize(map.lightDirection));\n  return clamp(map.ambientLightIntensity + diffuse, 0.0, 1.0);\n}\n\nvoid main(void) {\n  vec4 bitmapColor = texture(bitmapTexture, vTexCoord);\n\n  // If it's a picking pass, we just return the raw property map value.\n  if (picking.isActive > 0.5) {\n    fragColor = bitmapColor;\n    return;\n  }\n\n  // Decode the RGB value into a float. See decoder.fs.glsl for more details.\n  float val = decode_rgb2float(bitmapColor.rgb);\n  // Compute the shadow value, how dark a pixel will be, 1 is in complete shadow, 0 is in complete light.\n  float shadow = shadow(normal(val));\n\n  // The final pixel is black, with the opacity based on the shadow value,\n  // opacity 0 if pixel is completely in the light, opacity 1 if pixel is completely in the shadow.\n  // The property map opacity (some portions of the property map can be transparent) and\n  // the user provided image-wide opacity value are also taken into account.\n  fragColor = vec4(vec3(0.0), (1.0-shadow) * bitmapColor.a * layer.opacity);\n\n  geometry.uv = vTexCoord;\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default fsHillshading;

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;