@webviz/subsurface-viewer 1.11.0 → 1.11.1

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

@@ -1,2 +1,2 @@
-declare const fsColormap = "#version 300 es\n#define SHADER_NAME colormap-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\n\nout vec4 fragColor;\n\nuniform sampler2D bitmapTexture; // Property map\nuniform sampler2D colormap;\n\nuniform float opacity;\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  // The resulting val will be in [0, 1] interval, so we can use it directly as a texture coord\n  // to sample from the colormap.\n  // 0 => Leftmost color in the colormap, 1 => rightmost color, linearly interpolated in between.\n  vec4 color = texture(colormap, vec2(val, 0.5));\n\n  // The final pixel opacity is the combination of the user provided image-wide opacity,\n  // the colormap opacity at the sampled pixel and the property map opacity of the sampled pixel.\n  fragColor = vec4(color.rgb, color.a * bitmapColor.a * opacity);\n\n  // Support for existing functionality that comes from the BitmapLayer, such as desaturate, tintColor etc.\n  // See https://deck.gl/docs/api-reference/layers/bitmap-layer#render-options for more details.\n  geometry.uv = vTexCoord;\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n\n}\n";
+declare const fsColormap = "#version 300 es\n#define SHADER_NAME colormap-fragment-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\n\nout vec4 fragColor;\n\nuniform sampler2D bitmapTexture; // Property map\nuniform sampler2D colormap;\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  // The resulting val will be in [0, 1] interval, so we can use it directly as a texture coord\n  // to sample from the colormap.\n  // 0 => Leftmost color in the colormap, 1 => rightmost color, linearly interpolated in between.\n  vec4 color = texture(colormap, vec2(val, 0.5));\n\n  // The final pixel opacity is the combination of the user provided image-wide opacity,\n  // the colormap opacity at the sampled pixel and the property map opacity of the sampled pixel.\n  fragColor = vec4(color.rgb, color.a * bitmapColor.a * layer.opacity);\n\n  // Support for existing functionality that comes from the BitmapLayer, such as desaturate, tintColor etc.\n  // See https://deck.gl/docs/api-reference/layers/bitmap-layer#render-options for more details.\n  geometry.uv = vTexCoord;\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default fsColormap;

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

@@ -1,5 +1,5 @@
 const fsColormap = `#version 300 es
-#define SHADER_NAME colormap-shader
+#define SHADER_NAME colormap-fragment-shader
 
 precision highp float;
 
@@ -10,8 +10,6 @@ out vec4 fragColor;
 uniform sampler2D bitmapTexture; // Property map
 uniform sampler2D colormap;
 
-uniform float opacity;
-
 void main(void) {
   vec4 bitmapColor = texture(bitmapTexture, vTexCoord);
 
@@ -30,13 +28,12 @@ void main(void) {
 
   // The final pixel opacity is the combination of the user provided image-wide opacity,
   // the colormap opacity at the sampled pixel and the property map opacity of the sampled pixel.
-  fragColor = vec4(color.rgb, color.a * bitmapColor.a * opacity);
+  fragColor = vec4(color.rgb, color.a * bitmapColor.a * layer.opacity);
 
   // Support for existing functionality that comes from the BitmapLayer, such as desaturate, tintColor etc.
   // See https://deck.gl/docs/api-reference/layers/bitmap-layer#render-options for more details.
   geometry.uv = vTexCoord;
   DECKGL_FILTER_COLOR(fragColor, geometry);
-
 }
 `;
 export default fsColormap;

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

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

package/dist/layers/colormap/colormapLayer.d.ts

@@ -3,10 +3,11 @@ import type { BitmapLayerPickingInfo, BitmapLayerProps } from "@deck.gl/layers";
 import { BitmapLayer } from "@deck.gl/layers";
 import type { PickingInfo } from "@deck.gl/core";
 import type { LayerPickInfo, TypeAndNameLayerProps } from "../../layers/utils/layerTools";
-import type { ValueDecoder } from "../utils/propertyMapTools";
+import { type ValueDecoder } from "../utils/propertyMapTools";
 import type { ColorMapFunctionType } from "../utils/layerTools";
 import type { ReportBoundingBoxAction } from "../../components/Map";
 import type { ContinuousLegendDataType } from "../../components/ColorLegend";
+import type { Model } from "@luma.gl/engine";
 export interface ColormapLayerProps extends BitmapLayerProps, TypeAndNameLayerProps {
     colorMapName: string;
     colorMapFunction?: ColorMapFunctionType;
@@ -18,7 +19,7 @@ export interface ColormapLayerProps extends BitmapLayerProps, TypeAndNameLayerPr
 }
 export default class ColormapLayer extends BitmapLayer<ColormapLayerProps> {
     initializeState(): void;
-    draw({ moduleParameters, uniforms }: any): void;
+    setShaderModuleProps(...props: Parameters<Model["shaderInputs"]["setProps"]>): void;
     getShaders(): any;
     getPickingInfo({ info, }: {
         info: PickingInfo;

package/dist/layers/colormap/colormapLayer.js

@@ -1,9 +1,9 @@
 import { BitmapLayer } from "@deck.gl/layers";
-import { decoder } from "../shader_modules";
 import { decodeRGB } from "../utils/propertyMapTools";
 import { getModelMatrix } from "../utils/layerTools";
 import fsColormap from "./colormap.fs.glsl";
 import { getRgbData } from "@emerson-eps/color-tables";
+import { project32 } from "@deck.gl/core";
 function getImageData(colorMapName, colorTables, colorMapFunction) {
     const isColorMapFunctionDefined = typeof colorMapFunction !== "undefined";
     const data = new Uint8Array(256 * 3);
@@ -49,10 +49,8 @@ export default class ColormapLayer 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, _g;
+    setShaderModuleProps(...props) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!this.isLoaded) {
             if (typeof this.props.reportBoundingBox !== "undefined") {
                 const xMin = this.props.bounds[0];
@@ -66,41 +64,51 @@ export default class ColormapLayer extends BitmapLayer {
                 });
             }
         }
-        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;
+        // 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);
+        }
+        // Properties for local shader module.
+        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;
         // If specified color map will extend from colorMapRangeMin to colorMapRangeMax.
         // Otherwise it will extend from valueRangeMin to valueRangeMax.
-        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 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 colormap = this.context.device.createTexture({
             width: 256,
             height: 1,
             format: "rgb8unorm-webgl",
             data: getImageData(this.props.colorMapName, this.context.userData.colorTables, this.props.colorMapFunction),
         });
-        (_g = this.state.model) === null || _g === void 0 ? void 0 : _g.setBindings({ colormap });
-        super.draw({
-            uniforms: Object.assign(Object.assign({}, uniforms), { 
-                // Send the colormap texture to the shader.
+        (_j = this.state.model) === null || _j === void 0 ? void 0 : _j.setBindings({ colormap });
+        super.setShaderModuleProps({
+            map: {
                 valueRangeMin,
                 valueRangeMax,
                 colorMapRangeMin,
-                colorMapRangeMax }),
-            moduleParameters: mergedModuleParams,
+                colorMapRangeMax,
+                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 colormapping.
-        parentShaders.fs = fsColormap;
-        // 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: fsColormap,
+            modules: [...parentShaders.modules, project32, map2DUniforms],
+        });
     }
     getPickingInfo({ info, }) {
         if (!info.color) {
@@ -134,4 +142,52 @@ export default class ColormapLayer extends BitmapLayer {
 }
 ColormapLayer.layerName = "ColormapLayer";
 ColormapLayer.defaultProps = defaultProps;
+// local shader module for the uniforms
+const map2DUniformsBlock = /*glsl*/ `\
+uniform mapUniforms {
+    float valueRangeMin;
+    float valueRangeMax;
+    float colorMapRangeMin;
+    float colorMapRangeMax;
+
+    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",
+        rgbScaler: "vec3<f32>",
+        floatScaler: "f32",
+        offset: "f32",
+        step: "f32",
+    },
+};
 //# sourceMappingURL=colormapLayer.js.map

package/dist/layers/colormap/colormapLayer.js.map

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

package/dist/layers/grid3d/cellProperty.fs.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-cell-fragment-shader\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\n\nflat in vec3 normal;\nflat in int vertexIndex;\nflat in float property;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform bool isColoringDiscrete;\nuniform float colorMapSize;\n\nuniform vec4 colorMapClampColor;\nuniform bool isClampColor;\nuniform vec3 undefinedPropertyColor;\n\n\n// Calculate color from propertyValue using discrete colormap.\nvec4 getDiscretePropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   // On some machines (like in docker container), float comparison and texture lookup may fail due to precision.\n   // Use this tolerance for comparison and to shift the lookup position.\n   float tolerance = (1.0 / colorMapSize) * 0.5;\n\n   if (propertyValue < colorMapRangeMin - tolerance || propertyValue > colorMapRangeMax + tolerance) {\n      // Out of range. Use clampcolor.\n      if (isClampColor) {\n         color = colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         float p = clamp (propertyValue, colorMapRangeMin, colorMapRangeMax);\n         float x = p / colorMapSize;\n         color = texture(colormap, vec2(x + tolerance, 0.5));\n      }\n   }\n   else {\n      float x = propertyValue / colorMapSize;\n      color = texture(colormap, vec2(x + tolerance, 0.5));\n   }\n      \n   return color;\n}\n\nvec4 getContinuousPropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   float normalizedValue = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n   if (normalizedValue < 0.0 || normalizedValue > 1.0) {\n      // Out of range. Use clampcolor.\n      if (isClampColor) {\n         color = colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         normalizedValue = clamp (normalizedValue, 0.0, 1.0);         \n         color = texture(colormap, vec2(normalizedValue, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(normalizedValue, 0.5));\n   }\n   return color;\n}\n\nvoid main(void) {\n\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);      \n      return;\n   }\n\n   if (isnan(property)) {\n      vec3 lightColor = getPhongLightColor(undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);\n      fragColor = vec4(lightColor, 1.0);\n      DECKGL_FILTER_COLOR(fragColor, geometry);\n      return;\n   } \n\n   // This may happen due to GPU interpolation precision causing color artifacts.\n   float propertyValue = clamp(property, valueRangeMin, valueRangeMax);\n\n   vec4 color = isColoringDiscrete ? getDiscretePropertyColor(round(propertyValue)) : getContinuousPropertyColor(propertyValue);\n\n   // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n   vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n   fragColor = vec4(lightColor, 1.0);\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-cell-fragment-shader\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\n\nflat in vec3 normal;\nflat in int vertexIndex;\nflat in float property;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\n// Calculate color from propertyValue using discrete colormap.\nvec4 getDiscretePropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   // On some machines (like in docker container), float comparison and texture lookup may fail due to precision.\n   // Use this tolerance for comparison and to shift the lookup position.\n   float tolerance = (1.0 / grid.colorMapSize) * 0.5;\n\n   if (propertyValue < grid.colorMapRangeMin - tolerance || propertyValue > grid.colorMapRangeMax + tolerance) {\n      // Out of range. Use clampcolor.\n      if (grid.isClampColor) {\n         color = grid.colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         float p = clamp (propertyValue, grid.colorMapRangeMin, grid.colorMapRangeMax);\n         float x = p / grid.colorMapSize;\n         color = texture(colormap, vec2(x + tolerance, 0.5));\n      }\n   }\n   else {\n      float x = propertyValue / grid.colorMapSize;\n      color = texture(colormap, vec2(x + tolerance, 0.5));\n   }\n      \n   return color;\n}\n\nvec4 getContinuousPropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   float normalizedValue = (propertyValue - grid.colorMapRangeMin) / (grid.colorMapRangeMax - grid.colorMapRangeMin);\n   if (normalizedValue < 0.0 || normalizedValue > 1.0) {\n      // Out of range. Use clampcolor.\n      if (grid.isClampColor) {\n         color = grid.colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         normalizedValue = clamp (normalizedValue, 0.0, 1.0);         \n         color = texture(colormap, vec2(normalizedValue, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(normalizedValue, 0.5));\n   }\n   return color;\n}\n\nvoid main(void) {\n\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);      \n      return;\n   }\n\n   if (isnan(property)) {\n      vec3 lightColor = lighting_getLightColor(grid.undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);\n      fragColor = vec4(lightColor, 1.0);\n      DECKGL_FILTER_COLOR(fragColor, geometry);\n      return;\n   } \n\n   // This may happen due to GPU interpolation precision causing color artifacts.\n   float propertyValue = clamp(property, grid.valueRangeMin, grid.valueRangeMax);\n\n   vec4 color = grid.isColoringDiscrete ? getDiscretePropertyColor(round(propertyValue)) : getContinuousPropertyColor(propertyValue);\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   fragColor = vec4(lightColor, 1.0);\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default fsShader;

package/dist/layers/grid3d/cellProperty.fs.glsl.js

@@ -13,43 +13,30 @@ out vec4 fragColor;
 
 uniform sampler2D colormap;
 
-uniform float valueRangeMin;
-uniform float valueRangeMax;
-uniform float colorMapRangeMin;
-uniform float colorMapRangeMax;
-
-uniform bool isColoringDiscrete;
-uniform float colorMapSize;
-
-uniform vec4 colorMapClampColor;
-uniform bool isClampColor;
-uniform vec3 undefinedPropertyColor;
-
-
 // Calculate color from propertyValue using discrete colormap.
 vec4 getDiscretePropertyColor (float propertyValue) {
    vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
    // On some machines (like in docker container), float comparison and texture lookup may fail due to precision.
    // Use this tolerance for comparison and to shift the lookup position.
-   float tolerance = (1.0 / colorMapSize) * 0.5;
+   float tolerance = (1.0 / grid.colorMapSize) * 0.5;
 
-   if (propertyValue < colorMapRangeMin - tolerance || propertyValue > colorMapRangeMax + tolerance) {
+   if (propertyValue < grid.colorMapRangeMin - tolerance || propertyValue > grid.colorMapRangeMax + tolerance) {
       // Out of range. Use clampcolor.
-      if (isClampColor) {
-         color = colorMapClampColor;
+      if (grid.isClampColor) {
+         color = grid.colorMapClampColor;
          if( color[3] == 0.0 ) {
             discard;
          }
       }
       else {
          // Use min/max color to clamp.
-         float p = clamp (propertyValue, colorMapRangeMin, colorMapRangeMax);
-         float x = p / colorMapSize;
+         float p = clamp (propertyValue, grid.colorMapRangeMin, grid.colorMapRangeMax);
+         float x = p / grid.colorMapSize;
          color = texture(colormap, vec2(x + tolerance, 0.5));
       }
    }
    else {
-      float x = propertyValue / colorMapSize;
+      float x = propertyValue / grid.colorMapSize;
       color = texture(colormap, vec2(x + tolerance, 0.5));
    }
       
@@ -58,11 +45,11 @@ vec4 getDiscretePropertyColor (float propertyValue) {
 
 vec4 getContinuousPropertyColor (float propertyValue) {
    vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
-   float normalizedValue = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);
+   float normalizedValue = (propertyValue - grid.colorMapRangeMin) / (grid.colorMapRangeMax - grid.colorMapRangeMin);
    if (normalizedValue < 0.0 || normalizedValue > 1.0) {
       // Out of range. Use clampcolor.
-      if (isClampColor) {
-         color = colorMapClampColor;
+      if (grid.isClampColor) {
+         color = grid.colorMapClampColor;
          if( color[3] == 0.0 ) {
             discard;
          }
@@ -87,19 +74,19 @@ void main(void) {
    }
 
    if (isnan(property)) {
-      vec3 lightColor = getPhongLightColor(undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);
+      vec3 lightColor = lighting_getLightColor(grid.undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);
       fragColor = vec4(lightColor, 1.0);
       DECKGL_FILTER_COLOR(fragColor, geometry);
       return;
    } 
 
    // This may happen due to GPU interpolation precision causing color artifacts.
-   float propertyValue = clamp(property, valueRangeMin, valueRangeMax);
+   float propertyValue = clamp(property, grid.valueRangeMin, grid.valueRangeMax);
 
-   vec4 color = isColoringDiscrete ? getDiscretePropertyColor(round(propertyValue)) : getContinuousPropertyColor(propertyValue);
+   vec4 color = grid.isColoringDiscrete ? getDiscretePropertyColor(round(propertyValue)) : getContinuousPropertyColor(propertyValue);
 
    // 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);
 }

package/dist/layers/grid3d/cellProperty.fs.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"cellProperty.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/cellProperty.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyGhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"cellProperty.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/cellProperty.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4FhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/layers/grid3d/cellProperty.vs.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-cell-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\nin float properties;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\n\nflat out vec3 normal;\nflat out int vertexIndex;\nflat out float property;\n\nuniform bool ZIncreasingDownwards;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) { \n   \n   vertexIndex = gl_VertexID;\n   cameraPosition = project_uCameraPosition;   \n   geometry.pickingColor = pickingColor;\n\n   normal = normals;\n   vec3 position = positions;\n\n   float zSign = ZIncreasingDownwards ? -1.0 : 1.0;\n\n   position.z *= zSign;\n   normal.z   *= zSign;\n\n   property = properties;\n\n   position_commonspace = vec4(project_position(position), 0.0);\n   gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n   vec4 color = vec4(0.0);\n   DECKGL_FILTER_COLOR(color, geometry);\n}\n";
+declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-cell-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\nin float properties;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\n\nflat out vec3 normal;\nflat out int vertexIndex;\nflat out float property;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) { \n   \n   vertexIndex = gl_VertexID;\n   cameraPosition = project.cameraPosition;   \n   geometry.pickingColor = pickingColor;\n\n   normal = normals;\n   vec3 position = positions;\n\n   float zSign = grid.ZIncreasingDownwards ? -1.0 : 1.0;\n\n   position.z *= zSign;\n   normal.z   *= zSign;\n\n   property = properties;\n\n   position_commonspace = vec4(project_position(position), 0.0);\n   gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n   vec4 color = vec4(0.0);\n   DECKGL_FILTER_COLOR(color, geometry);\n}\n";
 export default vsShader;

package/dist/layers/grid3d/cellProperty.vs.glsl.js

@@ -14,20 +14,18 @@ flat out vec3 normal;
 flat out int vertexIndex;
 flat out float property;
 
-uniform bool ZIncreasingDownwards;
-
 const vec3 pickingColor = vec3(1.0, 1.0, 0.0);
 
 void main(void) { 
    
    vertexIndex = gl_VertexID;
-   cameraPosition = project_uCameraPosition;   
+   cameraPosition = project.cameraPosition;   
    geometry.pickingColor = pickingColor;
 
    normal = normals;
    vec3 position = positions;
 
-   float zSign = ZIncreasingDownwards ? -1.0 : 1.0;
+   float zSign = grid.ZIncreasingDownwards ? -1.0 : 1.0;
 
    position.z *= zSign;
    normal.z   *= zSign;

package/dist/layers/grid3d/cellProperty.vs.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"cellProperty.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/cellProperty.vs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4ChB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"cellProperty.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/cellProperty.vs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0ChB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/layers/grid3d/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 grid3d-cell-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/grid3d/fragment_lines.glsl.js

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

package/dist/layers/grid3d/grid3dLayer.js

@@ -211,6 +211,7 @@ export default class Grid3DLayer extends CompositeLayer {
         }
         const undefinedColor = this.getUndefinedPropertyColor();
         const undefinedValue = this.getUndefinedPropertyValue();
+        const enableLighting = !(this.props.material === false);
         const layer = new PrivateLayer(this.getSubLayerProps({
             mesh: this.state["mesh"],
             meshLines: this.state["mesh_lines"],
@@ -228,6 +229,7 @@ export default class Grid3DLayer extends CompositeLayer {
             material: this.props.material,
             depthTest: this.props.depthTest,
             ZIncreasingDownwards: this.props.ZIncreasingDownwards,
+            enableLighting,
         }));
         return [layer];
     }

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

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

package/dist/layers/grid3d/nodeProperty.fs.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-node-fragment-shader\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nin float property;\n\nflat in vec3 normal;\nflat in int vertexIndex;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec4 colorMapClampColor;\nuniform bool isClampColor;\n\nvec4 getPropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   float normalizedValue = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n   if (normalizedValue < 0.0 || normalizedValue > 1.0) {\n      // Out of range. Use clampcolor.\n      if (isClampColor) {\n         color = colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         normalizedValue = clamp (normalizedValue, 0.0, 1.0);         \n         color = texture(colormap, vec2(normalizedValue, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(normalizedValue, 0.5));\n   }\n   return color;\n}\n\n\nvoid main(void) {\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);      \n      return;\n   }\n       \n   // This may happen due to GPU interpolation precision causing color artifacts.\n   float propertyValue = clamp(property, valueRangeMin, valueRangeMax);\n\n   vec4 color = getPropertyColor(propertyValue);\n\n   // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n   vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n   fragColor = vec4(lightColor, 1.0);\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-node-fragment-shader\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nin float property;\n\nflat in vec3 normal;\nflat in int vertexIndex;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\nvec4 getPropertyColor (float propertyValue) {\n   vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n   float normalizedValue = (propertyValue - grid.colorMapRangeMin) / (grid.colorMapRangeMax - grid.colorMapRangeMin);\n   if (normalizedValue < 0.0 || normalizedValue > 1.0) {\n      // Out of range. Use clampcolor.\n      if (grid.isClampColor) {\n         color = grid.colorMapClampColor;\n         if( color[3] == 0.0 ) {\n            discard;\n         }\n      }\n      else {\n         // Use min/max color to clamp.\n         normalizedValue = clamp (normalizedValue, 0.0, 1.0);         \n         color = texture(colormap, vec2(normalizedValue, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(normalizedValue, 0.5));\n   }\n   return color;\n}\n\n\nvoid main(void) {\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);      \n      return;\n   }\n       \n   // This may happen due to GPU interpolation precision causing color artifacts.\n   float propertyValue = clamp(property, grid.valueRangeMin, grid.valueRangeMax);\n\n   vec4 color = getPropertyColor(propertyValue);\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   fragColor = vec4(lightColor, 1.0);\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default fsShader;

package/dist/layers/grid3d/nodeProperty.fs.glsl.js

@@ -13,21 +13,13 @@ out vec4 fragColor;
 
 uniform sampler2D colormap;
 
-uniform float valueRangeMin;
-uniform float valueRangeMax;
-uniform float colorMapRangeMin;
-uniform float colorMapRangeMax;
-
-uniform vec4 colorMapClampColor;
-uniform bool isClampColor;
-
 vec4 getPropertyColor (float propertyValue) {
    vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
-   float normalizedValue = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);
+   float normalizedValue = (propertyValue - grid.colorMapRangeMin) / (grid.colorMapRangeMax - grid.colorMapRangeMin);
    if (normalizedValue < 0.0 || normalizedValue > 1.0) {
       // Out of range. Use clampcolor.
-      if (isClampColor) {
-         color = colorMapClampColor;
+      if (grid.isClampColor) {
+         color = grid.colorMapClampColor;
          if( color[3] == 0.0 ) {
             discard;
          }
@@ -52,12 +44,12 @@ void main(void) {
    }
        
    // This may happen due to GPU interpolation precision causing color artifacts.
-   float propertyValue = clamp(property, valueRangeMin, valueRangeMax);
+   float propertyValue = clamp(property, grid.valueRangeMin, grid.valueRangeMax);
 
    vec4 color = getPropertyColor(propertyValue);
 
    // 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);
 }

package/dist/layers/grid3d/nodeProperty.fs.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeProperty.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/nodeProperty.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+DhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"nodeProperty.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/nodeProperty.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuDhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/layers/grid3d/nodeProperty.vs.glsl.d.ts

@@ -1,2 +1,2 @@
-declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-node-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\nout float property;\n\nflat out vec3 normal;\nflat out int vertexIndex;\n\nuniform lowp int coloringMode;\nuniform bool ZIncreasingDownwards;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) { \n   \n   vertexIndex = gl_VertexID;\n   cameraPosition = project_uCameraPosition;   \n   geometry.pickingColor = pickingColor;\n\n   normal = normals;\n   vec3 position = positions;\n\n   float zSign = ZIncreasingDownwards ? -1.0 : 1.0;\n\n   position.z *= zSign;\n   normal.z   *= zSign;\n\n   switch(coloringMode) {\n      case 2:\n         property = position.x;\n         break;\n      case 3:\n         property = position.y;\n         break;\n      case 4:\n         property = position.z;\n         break;\n      // case 0 or default should never be used\n      default:\n         property = position.z;\n         break;\n   }\n\n   position_commonspace = vec4(project_position(position), 0.0);\n   gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n   vec4 color = vec4(0.0);\n   DECKGL_FILTER_COLOR(color, geometry);\n}\n";
+declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-node-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\nout float property;\n\nflat out vec3 normal;\nflat out int vertexIndex;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) { \n   vertexIndex = gl_VertexID;\n   cameraPosition = project.cameraPosition;   \n   geometry.pickingColor = pickingColor;\n\n   normal = normals;\n   vec3 position = positions;\n\n   float zSign = grid.ZIncreasingDownwards ? -1.0 : 1.0;\n\n   position.z *= zSign;\n   normal.z   *= zSign;\n\n   switch(int(grid.coloringMode)) {\n      case 2:\n         property = position.x;\n         break;\n      case 3:\n         property = position.y;\n         break;\n      case 4:\n         property = position.z;\n         break;\n      // case 0 or default should never be used\n      default:\n         property = position.z;\n         break;\n   }\n\n   position_commonspace = vec4(project_position(position), 0.0);\n   gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n   vec4 color = vec4(0.0);\n   DECKGL_FILTER_COLOR(color, geometry);\n}\n";
 export default vsShader;

package/dist/layers/grid3d/nodeProperty.vs.glsl.js

@@ -13,26 +13,22 @@ out float property;
 flat out vec3 normal;
 flat out int vertexIndex;
 
-uniform lowp int coloringMode;
-uniform bool ZIncreasingDownwards;
-
 const vec3 pickingColor = vec3(1.0, 1.0, 0.0);
 
 void main(void) { 
-   
    vertexIndex = gl_VertexID;
-   cameraPosition = project_uCameraPosition;   
+   cameraPosition = project.cameraPosition;   
    geometry.pickingColor = pickingColor;
 
    normal = normals;
    vec3 position = positions;
 
-   float zSign = ZIncreasingDownwards ? -1.0 : 1.0;
+   float zSign = grid.ZIncreasingDownwards ? -1.0 : 1.0;
 
    position.z *= zSign;
    normal.z   *= zSign;
 
-   switch(coloringMode) {
+   switch(int(grid.coloringMode)) {
       case 2:
          property = position.x;
          break;

package/dist/layers/grid3d/nodeProperty.vs.glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodeProperty.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/nodeProperty.vs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"nodeProperty.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/nodeProperty.vs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}