@webviz/subsurface-viewer 1.11.0 → 1.11.2

package/dist/views/intersectionView.d.ts

@@ -1,7 +1,6 @@
-import type { OrthographicViewState } from "@deck.gl/core";
+import type { OrthographicViewState, Viewport, _ConstructorOf } from "@deck.gl/core";
 import { View } from "@deck.gl/core";
 import type { CommonViewProps } from "@deck.gl/core/dist/views/view";
-import IntersectionViewport from "../viewports/intersectionViewport";
 export type IntersectionViewState = OrthographicViewState;
 type IntersectionViewProps = CommonViewProps<IntersectionViewState> & {
     /** Distance of near clipping plane. Default `0.1`. */
@@ -14,7 +13,8 @@ type IntersectionViewProps = CommonViewProps<IntersectionViewState> & {
 export default class IntersectionView extends View<IntersectionViewState, IntersectionViewProps> {
     static displayName: string;
     constructor(props: IntersectionViewProps);
-    get ViewportType(): typeof IntersectionViewport;
+    getViewportType(_viewState: OrthographicViewState): _ConstructorOf<Viewport>;
+    get ViewportType(): _ConstructorOf<Viewport>;
     get ControllerType(): never;
 }
 export {};

package/dist/views/intersectionView.js

@@ -6,6 +6,11 @@ class IntersectionView extends View {
                 target: [275, 0, -500],
             } }));
     }
+    getViewportType(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _viewState) {
+        return IntersectionViewport;
+    }
     get ViewportType() {
         return IntersectionViewport;
     }

package/dist/views/intersectionView.js.map

@@ -1 +1 @@
-{"version":3,"file":"intersectionView.js","sourceRoot":"","sources":["../../src/views/intersectionView.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,oBAAoB,MAAM,mCAAmC,CAAC;AAcrE,MAAqB,gBAAiB,SAAQ,IAG7C;IAEG,YAAY,KAA4B;QACpC,KAAK,iCACE,KAAK,KACR,UAAU,EAAE,KAAK,EACjB,SAAS,EAAE;gBACP,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;aACzB,IACH,CAAC;IACP,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED,IAAI,cAAc;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;;AAjBM,4BAAW,GAAG,kBAAkB,CAAC;eAJvB,gBAAgB"}
+{"version":3,"file":"intersectionView.js","sourceRoot":"","sources":["../../src/views/intersectionView.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,oBAAoB,MAAM,mCAAmC,CAAC;AAcrE,MAAqB,gBAAiB,SAAQ,IAG7C;IAEG,YAAY,KAA4B;QACpC,KAAK,iCACE,KAAK,KACR,UAAU,EAAE,KAAK,EACjB,SAAS,EAAE;gBACP,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;aACzB,IACH,CAAC;IACP,CAAC;IAED,eAAe;IACX,6DAA6D;IAC7D,UAAiC;QAEjC,OAAO,oBAAoB,CAAC;IAChC,CAAC;IACD,IAAI,YAAY;QACZ,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED,IAAI,cAAc;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;;AAvBM,4BAAW,GAAG,kBAAkB,CAAC;eAJvB,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webviz/subsurface-viewer",
-    "version": "1.11.0",
+    "version": "1.11.2",
     "description": "3D visualization component for subsurface reservoir data",
     "keywords": [
         "subsurface",
@@ -33,15 +33,15 @@
     "author": "Equinor <opensource@equinor.com>",
     "license": "MPL-2.0",
     "dependencies": {
-        "@deck.gl-community/editable-layers": "9.0.3",
-        "@deck.gl/aggregation-layers": "9.0.40",
-        "@deck.gl/core": "9.0.40",
-        "@deck.gl/extensions": "9.0.40",
-        "@deck.gl/geo-layers": "9.0.40",
-        "@deck.gl/json": "9.0.40",
-        "@deck.gl/layers": "9.0.40",
-        "@deck.gl/mesh-layers": "9.0.40",
-        "@deck.gl/react": "9.0.40",
+        "@deck.gl-community/editable-layers": "^9.1.0-beta.4",
+        "@deck.gl/aggregation-layers": "^9.1.11",
+        "@deck.gl/core": "^9.1.11",
+        "@deck.gl/extensions": "^9.1.11",
+        "@deck.gl/geo-layers": "^9.1.11",
+        "@deck.gl/json": "^9.1.11",
+        "@deck.gl/layers": "^9.1.11",
+        "@deck.gl/mesh-layers": "^9.1.11",
+        "@deck.gl/react": "^9.1.11",
         "@emerson-eps/color-tables": "^0.4.92",
         "@equinor/eds-core-react": "^0.36.0",
         "@equinor/eds-icons": "^0.21.0",
@@ -55,7 +55,7 @@
         "d3-format": "^3.1.0",
         "gl-matrix": "^3.4.3",
         "lodash": "^4.17.21",
-        "math.gl": "^4.0.1",
+        "math.gl": "^4.1.0",
         "mathjs": "^13.2.0",
         "merge-refs": "^1.2.2",
         "static-kdtree": "^1.0.2",

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

@@ -1,2 +0,0 @@
-declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-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\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\nuniform bool smoothShading;\n\nvoid main(void) { \n   geometry.uv = vTexCoord;\n\n   vec3 normal = normals_commonspace;\n\n   if (!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, valueRangeMin, valueRangeMax);\n\n   float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n   if (x < 0.0 || x > 1.0) {\n      // Out of range. Use clampcolor.\n      if (isClampColor) {\n         color = vec4(colorMapClampColor.rgb, 1.0);\n\n      }\n      else if (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 = contourReferencePoint != -1.0 && contourInterval != -1.0;\n   if (is_contours) {\n      float val = isContoursDepth ? (abs(worldPos.z) - contourReferencePoint) / contourInterval\n                                  : (propertyValue - contourReferencePoint) / 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 fronm 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 = getPhongLightColor(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/map/fragment.fs.glsl.js.map

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

package/dist/layers/shader_modules/lighting.fs.glsl.d.ts

@@ -1 +0,0 @@
-export declare const fs = "\n// Note: modification of luma.gl's functions to get two sided phong lighting.\n// Ref original file modules/shadertools/src/modules/phong-lighting/phong-lighting.glsl.ts in luma source.\n\nvec3 getPhongLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n    \n  vec3 halfway_direction = normalize(light_direction + view_direction);   \n  float lambertian = abs(dot(light_direction, normal_worldspace));\n\n  float specular_angle = abs(dot(normal_worldspace, halfway_direction));\n\n  float specular = pow(specular_angle, lighting_uShininess);       \n  return (lambertian * lighting_uDiffuse * surfaceColor + specular * lighting_uSpecularColor) * color;    \n}\n\nvec3 getPhongLightColor(vec3 surfaceColor,vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n\n vec3 lightColor = surfaceColor;\n\n if (lighting_uEnabled) {\n   vec3 view_direction = normalize(cameraPosition - position_worldspace);\n   lightColor = lighting_uAmbient * surfaceColor * lighting_uAmbientLight.color;\n\n   for (int i = 0; i < MAX_LIGHTS; i++) {\n     if (i >= lighting_uPointLightCount) {\n       break;\n     }\n     PointLight pointLight = lighting_uPointLight[i];\n     vec3 light_position_worldspace = pointLight.position;\n     vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n     lightColor += getPhongLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);\n   }\n\n   for (int i = 0; i < MAX_LIGHTS; i++) {\n     if (i >= lighting_uDirectionalLightCount) {\n       break;\n     }\n     DirectionalLight directionalLight = lighting_uDirectionalLight[i];\n     lightColor += getPhongLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n   }\n }\n return lightColor;\n}\n";

package/dist/layers/shader_modules/lighting.fs.glsl.js

@@ -1,45 +0,0 @@
-export const fs = `
-// Note: modification of luma.gl's functions to get two sided phong lighting.
-// Ref original file modules/shadertools/src/modules/phong-lighting/phong-lighting.glsl.ts in luma source.
-
-vec3 getPhongLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {
-    
-  vec3 halfway_direction = normalize(light_direction + view_direction);   
-  float lambertian = abs(dot(light_direction, normal_worldspace));
-
-  float specular_angle = abs(dot(normal_worldspace, halfway_direction));
-
-  float specular = pow(specular_angle, lighting_uShininess);       
-  return (lambertian * lighting_uDiffuse * surfaceColor + specular * lighting_uSpecularColor) * color;    
-}
-
-vec3 getPhongLightColor(vec3 surfaceColor,vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-
- vec3 lightColor = surfaceColor;
-
- if (lighting_uEnabled) {
-   vec3 view_direction = normalize(cameraPosition - position_worldspace);
-   lightColor = lighting_uAmbient * surfaceColor * lighting_uAmbientLight.color;
-
-   for (int i = 0; i < MAX_LIGHTS; i++) {
-     if (i >= lighting_uPointLightCount) {
-       break;
-     }
-     PointLight pointLight = lighting_uPointLight[i];
-     vec3 light_position_worldspace = pointLight.position;
-     vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-     lightColor += getPhongLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-   }
-
-   for (int i = 0; i < MAX_LIGHTS; i++) {
-     if (i >= lighting_uDirectionalLightCount) {
-       break;
-     }
-     DirectionalLight directionalLight = lighting_uDirectionalLight[i];
-     lightColor += getPhongLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-   }
- }
- return lightColor;
-}
-`;
-//# sourceMappingURL=lighting.fs.glsl.js.map

package/dist/layers/shader_modules/lighting.fs.glsl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lighting.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/lighting.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CjB,CAAC"}

package/dist/layers/shader_modules/localPhongLighting.d.ts

@@ -1,23 +0,0 @@
-export declare const localPhongLighting: {
-    name: string;
-    fs: string;
-    dependencies: {
-        name: string;
-        dependencies: {
-            name: string;
-            vs: string;
-            fs: string;
-            getUniforms: (opts?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/lights/lights").LightsOptions | undefined) => Record<string, any>;
-            defines: {
-                MAX_LIGHTS: number;
-            };
-        }[];
-        fs: string;
-        defines: {
-            LIGHTING_FRAGMENT: number;
-        };
-        getUniforms: (opts?: {
-            material?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/phong-lighting/phong-lighting").PhongLightingProps | undefined;
-        } | undefined) => Record<string, any>;
-    }[];
-};

package/dist/layers/shader_modules/localPhongLighting.js

@@ -1,8 +0,0 @@
-import { fs } from "./lighting.fs.glsl";
-import { phongLighting } from "@luma.gl/shadertools";
-export const localPhongLighting = {
-    name: "localPhongLighting",
-    fs,
-    dependencies: [phongLighting],
-};
-//# sourceMappingURL=localPhongLighting.js.map

package/dist/layers/shader_modules/localPhongLighting.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"localPhongLighting.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/localPhongLighting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,IAAI,EAAE,oBAAoB;IAC1B,EAAE;IACF,YAAY,EAAE,CAAC,aAAa,CAAC;CAChC,CAAC"}