npm - @webviz/subsurface-viewer - Versions diffs - 0.28.0 → 0.28.2 - Mend

@webviz/subsurface-viewer 0.28.0 → 0.28.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (144) hide show

package/dist/layers/grid3d/fragment.fs.glsl.js CHANGED Viewed

@@ -11,6 +11,8 @@ in float property_interpolated;
 flat in vec3 normal;
 flat in int vertexIndex;
+out vec4 fragColor;
 uniform sampler2D colormap;
 uniform float valueRangeMin;
@@ -18,7 +20,7 @@ uniform float valueRangeMax;
 uniform float colorMapRangeMin;
 uniform float colorMapRangeMax;
-uniform bool  isColoringDiscrete;
+uniform bool isColoringDiscrete;
 uniform float colorMapSize;
 uniform lowp int coloringMode;
@@ -43,11 +45,11 @@ vec4 getContinuousPropertyColor (float propertyValue) {
       else {
          // Use min/max color to clamp.
          x = clamp (x, 0.0, 1.0);
-         color = texture2D(colormap, vec2(x, 0.5));
+         color = texture(colormap, vec2(x, 0.5));
       }
    }
    else {
-      color = texture2D(colormap, vec2(x, 0.5));
+      color = texture(colormap, vec2(x, 0.5));
    }
    return color;
 }
@@ -71,12 +73,12 @@ vec4 getDiscretePropertyColor (float propertyValue) {
          // Use min/max color to clamp.
          float p = clamp (propertyValue, colorMapRangeMin, colorMapRangeMax);
          float x = p / colorMapSize;
-         color = texture2D(colormap, vec2(x, 0.5));
+         color = texture(colormap, vec2(x, 0.5));
       }
    }
    else {
       float x = propertyValue / colorMapSize;
-      color = texture2D(colormap, vec2(x + tolerance, 0.5));
+      color = texture(colormap, vec2(x + tolerance, 0.5));
    }
    return color;
 }
@@ -90,8 +92,8 @@ vec4 getPropertyColor (float propertyValue) {
 void main(void) {
-   if (picking_uActive && !picking_uAttribute) {
-      gl_FragColor = encodeVertexIndexToRGB(vertexIndex);
+   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {
+      fragColor = encodeVertexIndexToRGB(vertexIndex);
       return;
    }
@@ -103,8 +105,8 @@ void main(void) {
    // 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);
-   gl_FragColor = vec4(lightColor, 1.0);
-   DECKGL_FILTER_COLOR(gl_FragColor, geometry);
+   fragColor = vec4(lightColor, 1.0);
+   DECKGL_FILTER_COLOR(fragColor, geometry);
 }
 `;
 export default fsShader;

package/dist/layers/grid3d/fragment.fs.glsl.js.map CHANGED Viewed

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

package/dist/layers/grid3d/fragment_lines.glsl.d.ts CHANGED Viewed

@@ -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  \n  // Picking pass.\n  if (picking_uActive) {\n    discard;\n    return;\n  }\n\n  fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n}\n";
+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}\n";
 export default fragmentShader;

package/dist/layers/grid3d/fragment_lines.glsl.js CHANGED Viewed

@@ -7,13 +7,6 @@ precision highp float;
 out vec4 fragColor;
 void main(void) {
-  // Picking pass.
-  if (picking_uActive) {
-    discard;
-    return;
-  }
   fragColor = vec4(0.0, 0.0, 0.0, 1.0);
 }
 `;

package/dist/layers/grid3d/fragment_lines.glsl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fragment_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG~~;;;;;;;;;;;;;;;;;;CAkBtB~~,CAAC;AAEF,eAAe,cAAc,CAAC"}
1	+ {"version":3,"file":"fragment_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment_lines.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG;;;;;;;;;;;CAWtB,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/layers/grid3d/grid3dLayer.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import type React from "react";
-import type { Color } from "@deck.gl/core/typed";
-import { CompositeLayer } from "@deck.gl/core/typed";
+import type { Color } from "@deck.gl/core";
+import { CompositeLayer } from "@deck.gl/core";
 import type { Material } from "./typeDefs";
 import PrivateLayer from "./privateGrid3dLayer";
-import type { ExtendedLayerProps, colorMapFunctionType } from "../utils/layerTools";
 import type { ReportBoundingBoxAction } from "../../components/Map";
+import type { ExtendedLayerProps, colorMapFunctionType } from "../utils/layerTools";
 export type WebWorkerParams = {
     points: Float32Array;
     polys: Uint32Array;

package/dist/layers/grid3d/grid3dLayer.js CHANGED Viewed

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { isEqual } from "lodash";
-import { CompositeLayer } from "@deck.gl/core/typed";
-import { load, JSONLoader } from "@loaders.gl/core";
+import { CompositeLayer } from "@deck.gl/core";
+import { JSONLoader, load } from "@loaders.gl/core";
 import workerpool from "workerpool";
 import PrivateLayer from "./privateGrid3dLayer";
 import { makeFullMesh } from "./webworker";

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

	@@ -1 +1 @@
1	- {"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":";;;;;;;;;~~AACA~~,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;~~AAGjC~~,OAAO,EAAE,cAAc,EAAE,MAAM,~~qBAAqB~~,CAAC;~~AACrD~~,OAAO,EAAE,~~IAAI~~,EAAE,~~UAAU~~,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAShD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,kBAAkB;AAClB,MAAM,gBAAgB,GAAG,UAAU,CAC/B,MAAM,EACN,mBAAmB,EACnB,qCAAqC,CACxC,CAAC;AAEF,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,eACrB;IACC,UAAU,EAAE,EAAE;IACd,UAAU,EAAE,KAAK;CACpB,EACE,gBAAgB,EACrB,CAAC;AAEH,SAAS,iBAAiB;IACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,SAAS,EAAE,CAAC;IACrB,CAAC;AACL,CAAC;AAQD,SAAS,OAAO,CAAC,MAAoB;IACjC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IAErB,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,QAAQ,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,CAAC;IACD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAID,SAAe,QAAQ,CACnB,IAAqC,EACrC,IAAgC;;;QAEhC,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,0CAAE,WAAW,EAAE,CAAC;YACvD,2CAA2C;YAC3C,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;gBACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAChD,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;YAChC,CAAC;YACD,uEAAuE;YACvE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACxC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACzE,CAAC;CAAA;AAED,SAAe,kBAAkB,CAC7B,cAA8D;;QAE9D,MAAM,oBAAoB,GAAG,cAAc,YAAY,WAAW,CAAC;QACnE,OAAO,oBAAoB;YACvB,CAAC,CAAC,MAAM,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC;YAC7C,CAAC,CAAC,MAAM,QAAQ,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACvD,CAAC;CAAA;AAED,SAAe,SAAS,CACpB,UAA4C,EAC5C,SAA0C,EAC1C,cAA8D,EAC9D,cAAuB;;QAEvB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACxD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAErD,MAAM,UAAU,GAAG,cAAc;YAC7B,CAAC,CAAC,MAAM,kBAAkB,CAAC,cAAc,CAAC;YAC1C,CAAC,CAAC,IAAI,YAAY,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IACpD,CAAC;CAAA;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,mBAKX;AALD,WAAY,mBAAmB;IAC3B,qEAAQ,CAAA;IACR,uDAAC,CAAA;IACD,uDAAC,CAAA;IACD,uDAAC,CAAA;AACL,CAAC,EALW,mBAAmB,KAAnB,mBAAmB,QAK9B;AAgGD,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,SAAS;IACf,EAAE,EAAE,eAAe;IACnB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IACd,YAAY,EAAE,mBAAmB,CAAC,QAAQ;IAC1C,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IAC9B,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAgC;IACrE,IAAI,QAAQ;;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,MAAM,QAAQ,GACV,KAAK,CAAC,QAAQ;YACd,SAAS,CAAC,MAAM,GAAG,CAAC;YACpB,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,UAAU,~~GAAG~~,~~MAAA~~,MAAA,IAAI,CAAC,KAAK,0CAAG,mBAAmB,~~CAAC~~,mCAAI,KAAK,CAAC;~~QAC9D~~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~~CAAC~~,CAAC;~~QAChC~~,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3D,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC9B,KAAK,mBAAmB,CAAC,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,KAAK,mBAAmB,CAAC,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,KAAK,mBAAmB,CAAC,CAAC;gBACtB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C;gBACI,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,~~CAAC~~,CAAC;~~QAChD~~,CAAC;IACL,CAAC;CACJ;AAED,WAAW,CAAC,SAAS,GAAG,aAAa,CAAC;AACtC,WAAW,CAAC,YAAY,GAAG,YAA2C,CAAC"}
1	+ {"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,6 @@
-import type { PickingInfo, UpdateParameters, Color } from "@deck.gl/core/typed";
-import { Layer } from "@deck.gl/core/typed";
+import type { Color, PickingInfo, UpdateParameters, LayerContext } from "@deck.gl/core";
+import { Layer } from "@deck.gl/core";
+import type { UniformValue } from "@luma.gl/core";
 import { Model } from "@luma.gl/engine";
 import type { DeckGLLayerContext } from "../../components/Map";
 import type { ExtendedLayerProps, LayerPickInfo, colorMapFunctionType } from "../utils/layerTools";
@@ -24,8 +25,12 @@ export default class PrivateLayer extends Layer<PrivateLayerProps> {
     initializeState(context: DeckGLLayerContext): void;
     shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
     updateState({ context }: UpdateParameters<this>): void;
-    _getModels(gl: any): Model[];
-    draw(args: any): void;
+    _getModels(context: DeckGLLayerContext): Model[];
+    draw(args: {
+        moduleParameters?: unknown;
+        uniforms: UniformValue;
+        context: LayerContext;
+    }): void;
     decodePickingColor(): number;
     encodePickingColor(): number[];
     getPickingInfo({ info }: {
@@ -35,4 +40,5 @@ export default class PrivateLayer extends Layer<PrivateLayerProps> {
     private getDefaultImageData;
     private getImageData;
     private getPropertyUniforms;
+    private getTexture;
 }

package/dist/layers/grid3d/privateGrid3dLayer.js CHANGED Viewed

@@ -1,25 +1,23 @@
-import { COORDINATE_SYSTEM, Layer, picking, project, } from "@deck.gl/core/typed";
-import { Model, Geometry } from "@luma.gl/engine";
+import { COORDINATE_SYSTEM, Layer, picking, project } from "@deck.gl/core";
+import { Geometry, Model } from "@luma.gl/engine";
+import { localPhongLighting, utilities } from "../shader_modules";
 import { createPropertyData, getImageData } from "../utils/layerTools";
-import { Texture2D } from "@luma.gl/webgl";
-import GL from "@luma.gl/constants";
-import vsShader from "./vertex.glsl";
 import fsShader from "./fragment.fs.glsl";
-import vsLineShader from "./vertex_lines.glsl";
 import fsLineShader from "./fragment_lines.glsl";
-import { localPhongLighting, utilities } from "../shader_modules";
 import { TGrid3DColoringMode, } from "./grid3dLayer";
+import vsShader from "./vertex.glsl";
+import vsLineShader from "./vertex_lines.glsl";
 const DEFAULT_TEXTURE_PARAMETERS = {
-    [GL.TEXTURE_MIN_FILTER]: GL.LINEAR,
-    [GL.TEXTURE_MAG_FILTER]: GL.LINEAR,
-    [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
-    [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE,
+    addressModeU: "clamp-to-edge",
+    addressModeV: "clamp-to-edge",
+    minFilter: "linear",
+    magFilter: "linear",
 };
 const DISCRETE_TEXTURE_PARAMETERS = {
-    [GL.TEXTURE_MIN_FILTER]: GL.NEAREST,
-    [GL.TEXTURE_MAG_FILTER]: GL.NEAREST,
-    [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
-    [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE,
+    minFilter: "nearest",
+    magFilter: "nearest",
+    addressModeU: "clamp-to-edge",
+    addressModeV: "clamp-to-edge",
 };
 const defaultProps = {
     colorMapName: "",
@@ -37,8 +35,7 @@ export default class PrivateLayer extends Layer {
         return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
     }
     initializeState(context) {
-        const { gl } = context;
-        const [model_mesh, mesh_lines_model] = this._getModels(gl);
+        const [model_mesh, mesh_lines_model] = this._getModels(context);
         this.setState({
             models: [model_mesh, mesh_lines_model],
             isLoaded: false,
@@ -56,14 +53,16 @@ export default class PrivateLayer extends Layer {
         this.initializeState(context);
     }
     //eslint-disable-next-line
-    _getModels(gl) {
-        // MESH MODEL
-        const mesh_model = new Model(gl, {
+    _getModels(context) {
+        var _a;
+        const propertyUniforms = this.getPropertyUniforms();
+        const colormap = this.getTexture(context);
+        const mesh_model = new Model(context.device, {
             id: `${this.props.id}-mesh`,
             vs: vsShader,
             fs: fsShader,
             geometry: new Geometry({
-                drawMode: this.props.mesh.drawMode,
+                topology: (_a = this.props.mesh.drawMode) !== null && _a !== void 0 ? _a : "triangle-list",
                 attributes: {
                     positions: this.props.mesh.attributes.positions,
                     properties: this.props.mesh.attributes.properties,
@@ -71,27 +70,33 @@ export default class PrivateLayer extends Layer {
                 },
                 vertexCount: this.props.mesh.vertexCount,
             }),
+            bufferLayout: this.getAttributeManager().getBufferLayouts(),
+            uniforms: Object.assign(Object.assign({}, propertyUniforms), { coloringMode: this.props.coloringMode, ZIncreasingDownwards: this.props.ZIncreasingDownwards }),
+            bindings: {
+                colormap,
+            },
             modules: [project, picking, localPhongLighting, utilities],
-            isInstanced: false, // This only works when set to false.
+            isInstanced: false,
         });
-        // MESH LINES
-        const mesh_lines_model = new Model(gl, {
+        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: [project, picking],
             isInstanced: false,
         });
         return [mesh_model, mesh_lines_model];
     }
-    // Signature from the base class, eslint doesn't like the any type.
-    // eslint-disable-next-line
     draw(args) {
         if (!this.state["models"]) {
             return;
         }
-        const { uniforms, context } = args;
+        const { context } = args;
         const { gl } = context;
         const [model_mesh, mesh_lines_model] = this.state["models"];
         gl.enable(gl.POLYGON_OFFSET_FILL);
@@ -99,16 +104,10 @@ export default class PrivateLayer extends Layer {
         if (!this.props.depthTest) {
             gl.disable(gl.DEPTH_TEST);
         }
-        const propertyUniforms = this.getPropertyUniforms(context);
-        model_mesh
-            .setUniforms(Object.assign(Object.assign(Object.assign({}, uniforms), propertyUniforms), { coloringMode: this.props.coloringMode, ZIncreasingDownwards: this.props.ZIncreasingDownwards }))
-            .draw();
+        model_mesh.draw(context.renderPass);
         gl.disable(gl.POLYGON_OFFSET_FILL);
-        // Draw lines.
         if (this.props.gridLines) {
-            mesh_lines_model
-                .setUniforms(Object.assign(Object.assign({}, uniforms), { ZIncreasingDownwards: this.props.ZIncreasingDownwards }))
-                .draw();
+            mesh_lines_model.draw(context.renderPass);
         }
         if (!this.props.depthTest) {
             gl.enable(gl.DEPTH_TEST);
@@ -202,8 +201,7 @@ export default class PrivateLayer extends Layer {
             isColoringDiscrete: false,
         };
     }
-    // eslint-disable-next-line
-    getPropertyUniforms(context) {
+    getPropertyUniforms() {
         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;
@@ -218,30 +216,49 @@ export default class PrivateLayer extends Layer {
             ? this.props.colorMapClampColor
             : [0, 0, 0];
         // Normalize to [0,1] range.
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
         colorMapClampColor = colorMapClampColor.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
         const isColorMapClampColorTransparent = this.props.colorMapClampColor === false;
         const imageData = this.getImageData();
-        const colormap = new Texture2D(context.gl, {
-            width: imageData.count,
-            height: 1,
-            format: GL.RGB,
-            data: imageData.data,
-            parameters: imageData.parameters,
-        });
-        return {
-            colormap,
-            valueRangeMin,
+        return Object.assign(Object.assign({ valueRangeMin,
             valueRangeMax,
             colorMapRangeMin,
-            colorMapRangeMax,
-            colorMapClampColor,
-            isColorMapClampColorTransparent,
-            isClampColor,
-            isColoringDiscrete: imageData.isColoringDiscrete,
-            colorMapSize: imageData.count,
-        };
+            colorMapRangeMax }, (colorMapClampColor ? { colorMapClampColor } : {})), { isColorMapClampColorTransparent,
+            isClampColor, isColoringDiscrete: imageData.isColoringDiscrete, colorMapSize: imageData.count });
+    }
+    getTexture(context) {
+        if (this.props.colorMapFunction instanceof Uint8Array) {
+            const imageData = this.getImageData();
+            const count = this.props.colorMapFunction.length / 3;
+            if (count === 0) {
+                const colormap = context.device.createTexture({
+                    width: imageData.count,
+                    height: 1,
+                    format: "rgb8unorm-webgl",
+                    data: new Uint8Array([0, 0, 0, 0, 0, 0]),
+                    sampler: DISCRETE_TEXTURE_PARAMETERS,
+                });
+                return colormap;
+            }
+            const sampler = this.props.coloringMode === TGrid3DColoringMode.Property
+                ? DISCRETE_TEXTURE_PARAMETERS
+                : DEFAULT_TEXTURE_PARAMETERS;
+            const colormap = context.device.createTexture({
+                width: imageData.count,
+                height: 1,
+                format: "rgb8unorm-webgl",
+                data: imageData.data,
+                sampler,
+            });
+            return colormap;
+        }
+        const data = getImageData(this.props.colorMapName, this.context.userData.colorTables, this.props.colorMapFunction);
+        const colormap = context.device.createTexture({
+            width: 256,
+            height: 1,
+            format: "rgb8unorm-webgl",
+            data: data,
+        });
+        return colormap;
     }
 }
 PrivateLayer.layerName = "PrivateLayer";

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

	@@ -1 +1 @@
1	- {"version":3,"file":"privateGrid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateGrid3dLayer.ts"],"names":[],"mappings":"~~AACA~~,OAAO,~~EACH~~,iBAAiB,~~EACjB~~,KAAK,~~EACL~~,OAAO,~~EACP~~,OAAO,~~GACV~~,MAAM,~~qBAAqB~~,CAAC;~~AAE7B~~,OAAO,EAAE,~~KAAK~~,EAAE,~~QAAQ~~,EAAE,MAAM,iBAAiB,CAAC;~~AAQlD~~,OAAO,EAAE,kBAAkB,EAAE,~~YAAY~~,EAAE,MAAM,~~qBAAqB~~,CAAC;~~AACvE~~,OAAO,EAAE,~~SAAS~~,EAAE,~~MAAM~~,~~gBAAgB,CAAC;AAC3C,OAAO,~~EAAE,MAAM,~~oBAAoB~~,CAAC;~~AACpC~~,OAAO,QAAQ,MAAM,~~eAAe,CAAC;AACrC,OAAO,QAAQ,MAAM,~~oBAAoB,CAAC;AAC1C,OAAO,YAAY,MAAM,~~qBAAqB~~,CAAC;~~AAC/C~~,OAAO,~~YAAY~~,MAAM,~~uBAAuB~~,CAAC;~~AACjD~~,OAAO,~~EAAE~~,~~kBAAkB,EAAE,SAAS,EAAE,~~MAAM,~~mBAAmB~~,CAAC;~~AAClE~~,OAAO,~~EACH~~,~~mBAAmB,GAEtB,~~MAAM,~~eAAe~~,CAAC;~~AAIvB~~,MAAM,0BAA0B,~~GAAG~~;~~IAC/B~~,~~CAAC~~,EAAE,~~CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,MAAM~~;~~IAClC~~,~~CAAC~~,EAAE,~~CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,MAAM~~;~~IAClC~~,~~CAAC~~,EAAE,~~CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,aAAa~~;~~IACrC~~,~~CAAC~~,EAAE,~~CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,aAAa~~;~~CACxC~~,CAAC;AAEF,MAAM,2BAA2B,~~GAAG~~;~~IAChC~~,~~CAAC~~,EAAE,~~CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,OAAO~~;~~IACnC~~,~~CAAC~~,EAAE,~~CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,OAAO~~;~~IACnC~~,~~CAAC~~,EAAE,~~CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,aAAa~~;~~IACrC~~,~~CAAC~~,EAAE,~~CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,aAAa~~;~~CACxC~~,CAAC;AAiBF,MAAM,YAAY,GAAG;IACjB,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACnC,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;IAC7C,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IAC9B,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;~~AAwBF~~,iEAAiE;AACjE,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAwB;IAC9D,IAAI,QAAQ;;QACR,OAAO,~~MAAA~~,IAAI,CAAC,KAAK,CAAC,UAAU,~~CAAC~~,mCAAI,KAAK,CAAC;~~IAC3C~~,CAAC;IAED,eAAe,CAAC,OAA2B;QACvC,MAAM,~~EAAE,EAAE,EAAE,GAAG,OAAO,~~CAAC~~;QACvB~~,~~MAAM,CAAC,~~UAAU,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,~~EAAE~~,CAAC,CAAC;~~QAC3D~~,IAAI,CAAC,QAAQ,CAAC;YACV,MAAM,EAAE,CAAC,UAAU,EAAE,gBAAgB,CAAC;YACtC,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;IACP,CAAC;IAED,iBAAiB,CAAC,EACd,KAAK,EACL,QAAQ,EACR,OAAO,EACP,WAAW,GACU;QACrB,OAAO,CACH,KAAK,CAAC,iBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ;YACR,OAAO;YACP,WAAW;SACd,CAAC,IAAI,WAAW,CAAC,kBAAkB,CACvC,CAAC;IACN,CAAC;IAED,WAAW,CAAC,EAAE,OAAO,EAA0B;QAC3C,IAAI,CAAC,eAAe,CAAC,OAA6B,CAAC,CAAC;IACxD,CAAC;~~IACD~~,0BAA0B;IAC1B,UAAU,CAAC,~~EAAO~~;~~QACd~~,~~aAAa~~;~~QACb~~,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,~~EAAE~~,EAAE;~~YAC7B~~,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO;YAC3B,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;YACZ,QAAQ,EAAE,IAAI,QAAQ,CAAC;gBACnB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ;~~gBAClC~~,UAAU,EAAE;oBACR,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS;oBAC/C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU;oBACjD,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO;iBAC9C;gBACD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW;aAC3C,CAAC;YACF,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,SAAS,CAAC;YAC1D,WAAW,EAAE,KAAK~~,EAAE,qCAAqC~~;~~SAC5D~~,CAAC,CAAC;QAEH,~~aAAa;QACb,~~MAAM,gBAAgB,GAAG,IAAI,KAAK,CAAC,~~EAAE~~,EAAE;~~YACnC~~,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ;YAC5B,EAAE,EAAE,YAAY;YAChB,EAAE,EAAE,YAAY;YAChB,QAAQ,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YAC5C,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC;YAC3B,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAC1C,CAAC;IAED,~~mEAAmE;IACnE,2BAA2B;IAC3B,~~IAAI,CAAC,~~IAAS~~;~~QACV~~,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,MAAM,EAAE,~~QAAQ,EAAE,~~OAAO,EAAE,GAAG,IAAI,CAAC;~~QACnC~~,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC;QAEvB,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,~~CAAC~~,CAAC;~~QAE5D~~,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAClC,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QAED,~~MAAM~~,~~gBAAgB~~,~~GAAG,~~IAAI,CAAC,~~mBAAmB,CAAC,~~OAAO,CAAC,~~CAAC;QAE3D,~~UAAU~~;aACL~~,~~WAAW,+CACL,QAAQ,GACR,gBAAgB,KACnB,YAAY,EAAE,IAAI,~~CAAC,~~KAAK,~~CAAC~~,YAAY,EACrC,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,IACvD~~;~~aACD~~,~~IAAI,~~EAAE,CAAC~~;QACZ~~,~~EAAE,CAAC,~~OAAO,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAEnC,~~cAAc;QACd,~~IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACvB,gBAAgB~~;iBACX~~,~~WAAW~~,~~iCACL,QAAQ,KACX,oBAAoB,EAAE,~~IAAI,CAAC,~~KAAK~~,CAAC,~~oBAAoB~~,~~IACvD;iBACD~~,~~IAAI,EAAE,~~CAAC;~~QAChB~~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~~IAED~~,~~2BAA2B;IACnB,~~mBAAmB~~,CAAC,OAAY~~;;~~QACpC~~,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,0CAAG,CAAC,CAAC,mCAAI,GAAG,CAAC;QAChE,MAAM,aAAa,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,kBAAkB,0CAAG,CAAC,CAAC,mCAAI,GAAG,CAAC;QAEhE,gFAAgF;QAChF,gEAAgE;QAChE,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,0CAAG,CAAC,CAAC,mCAAI,aAAa,CAAC;QACxE,MAAM,gBAAgB,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,0CAAG,CAAC,CAAC,mCAAI,aAAa,CAAC;QAExE,MAAM,YAAY,GACd,IAAI,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS;YAC3C,IAAI,CAAC,KAAK,CAAC,kBAAkB,KAAK,IAAI;YACtC,IAAI,CAAC,KAAK,CAAC,kBAAkB,KAAK,KAAK,CAAC;QAC5C,IAAI,kBAAkB,GAAG,YAAY;YACjC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB;YAC/B,CAAC,~~CAAC~~,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,~~CAAC~~,CAAC;~~QAEhB~~,4BAA4B;QAC5B,~~6DAA6D;QAC7D,aAAa;QACb,~~kBAAkB,GAAI,kBAA4B,CAAC,GAAG,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,CAAC,CAAC,GAAG,GAAG,~~CACxB~~,CAAC;~~QAEF~~,MAAM,+BAA+B,GAChC,IAAI,CAAC,KAAK,CAAC,kBAA8B,KAAK,KAAK,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEtC,~~MAAM~~,~~QAAQ~~,~~GAAG~~,~~IAAI~~,~~SAAS~~,CAAC,~~OAAO~~,CAAC,EAAE,EAAE;~~YACvC~~,~~KAAK~~,EAAE,SAAS,CAAC,KAAK;~~YACtB~~,~~MAAM~~,EAAE,CAAC;~~YACT~~,MAAM,~~EAAE~~,EAAE,CAAC,GAAG;~~YACd~~,IAAI,EAAE,SAAS,CAAC,~~IAAI~~;~~YACpB~~,UAAU,EAAE,~~SAAS~~,CAAC,~~UAAU~~;~~SACnC~~,CAAC,CAAC;~~QAEH~~,OAAO;~~YACH~~,QAAQ;~~YACR~~,~~aAAa~~;~~YACb~~,aAAa;~~YACb~~,~~gBAAgB~~;~~YAChB~~,~~gBAAgB~~;~~YAChB~~,~~kBAAkB~~;~~YAClB,+BAA+B~~;~~YAC/B~~,YAAY;~~YACZ~~,~~kBAAkB~~,EAAE,~~SAAS~~,CAAC,~~kBAAkB~~;~~YAChD~~,~~YAAY~~,EAAE,~~SAAS~~,CAAC,~~KAAK~~;~~SAChC~~,CAAC;~~IACN~~,CAAC;CACJ;AAED,YAAY,CAAC,SAAS,GAAG,cAAc,CAAC;AACxC,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC"}
1	+ {"version":3,"file":"privateGrid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateGrid3dLayer.ts"],"names":[],"mappings":"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"}

package/dist/layers/grid3d/typeDefs.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
+import type { GeometryProps } from "@luma.gl/engine";
 export type MeshType = {
-    drawMode?: number;
+    drawMode: GeometryProps["topology"];
     attributes: {
         positions: {
             value: Float32Array;
@@ -21,7 +22,8 @@ export type MeshType = {
     vertexCount: number;
 };
 export type MeshTypeLines = {
-    drawMode: number;
+    drawMode: GeometryProps["topology"];
+    topology: GeometryProps["topology"];
     attributes: {
         positions: {
             value: Float32Array;

package/dist/layers/grid3d/vertex.glsl.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-vertex-shader\nprecision highp float;\n\nattribute vec3 positions;\nattribute float properties;\nattribute vec3 normals;\n\nuniform lowp int coloringMode;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\nflat out float property;\nout float property_interpolated;\n\nflat out vec3 normal;\nflat out int vertexIndex;\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   switch(coloringMode) {\n      case 0: property = properties; break;\n      case 1: property_interpolated = position.x; break;\n      case 2: property_interpolated = position.y; break;\n      case 3: property_interpolated = position.z; break;\n      default: property = properties; 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-vertex-shader\nprecision highp float;\n\nin vec3 positions;\nin float properties;\nin vec3 normals;\n\nuniform lowp int coloringMode;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\nflat out float property;\nout float property_interpolated;\n\nflat out vec3 normal;\nflat out int vertexIndex;\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   switch(coloringMode) {\n      case 0: property = properties; break;\n      case 1: property_interpolated = position.x; break;\n      case 2: property_interpolated = position.y; break;\n      case 3: property_interpolated = position.z; break;\n      default: property = properties; 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/vertex.glsl.js CHANGED Viewed

@@ -3,9 +3,9 @@ const vsShader = `\
 #define SHADER_NAME grid3d-vertex-shader
 precision highp float;
-attribute vec3 positions;
-attribute float properties;
-attribute vec3 normals;
+in vec3 positions;
+in float properties;
+in vec3 normals;
 uniform lowp int coloringMode;

package/dist/layers/grid3d/webworker.js CHANGED Viewed

@@ -660,7 +660,7 @@ export function makeFullMesh(e) {
      */
     const createEmptyMeshes = () => {
         const mesh = {
-            drawMode: 4, // corresponds to GL.TRIANGLES,
+            drawMode: "triangle-list",
             attributes: {
                 positions: { value: new Float32Array(), size: 3 },
                 properties: { value: new Float32Array(), size: 1 },
@@ -669,7 +669,8 @@ export function makeFullMesh(e) {
             vertexCount: 0,
         };
         const mesh_lines = {
-            drawMode: 1, // corresponds to GL.LINES,
+            drawMode: "line-list",
+            topology: "line-list",
             attributes: {
                 positions: { value: new Float32Array(), size: 3 },
                 indices: { value: new Uint32Array(), size: 1 },
@@ -758,7 +759,7 @@ export function makeFullMesh(e) {
         console.log("Number of polygons: ", pn);
         console.log("Number of triangles: ", meshArrays.counts.triangles);
         const mesh = {
-            drawMode: 4, // corresponds to GL.TRIANGLES,
+            drawMode: "triangle-list",
             attributes: {
                 positions: { value: meshArrays.arrays.trianglePoints, size: 3 },
                 properties: { value: meshArrays.arrays.properties, size: 1 },
@@ -767,7 +768,8 @@ export function makeFullMesh(e) {
             vertexCount: trianglesVertexCount,
         };
         const mesh_lines = {
-            drawMode: 1, // corresponds to GL.LINES,
+            drawMode: "line-list",
+            topology: "line-list",
             attributes: {
                 positions: { value: params.points, size: 3 },
                 indices: { value: meshArrays.arrays.lineIndices, size: 1 },