@webviz/subsurface-viewer 1.18.2 → 1.18.4

package/dist/components/settings/NumericInput.js

@@ -1,6 +1,6 @@
 import React from "react";
 import { Label, Input } from "@equinor/eds-core-react";
-const NumericInput = React.memo(({ label, value, min, max, step, onChange }) => {
+const NumericInput = React.memo(({ label, value, min = 0, max, step = 1, onChange }) => {
     return (React.createElement("div", { style: {
             display: "flex",
             justifyContent: "space-between",
@@ -16,10 +16,6 @@ const NumericInput = React.memo(({ label, value, min, max, step, onChange }) =>
                 width: "3rem",
             } })));
 });
-NumericInput.defaultProps = {
-    min: 0,
-    step: 1,
-};
 NumericInput.displayName = "NumericInput";
 export default NumericInput;
 //# sourceMappingURL=NumericInput.js.map

package/dist/components/settings/NumericInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"NumericInput.js","sourceRoot":"","sources":["../../../src/components/settings/NumericInput.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAsBvD,MAAM,YAAY,GAAoB,KAAK,CAAC,IAAI,CAC5C,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAS,EAAE,EAAE;IAClD,OAAO,CACH,6BACI,KAAK,EAAE;YACH,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,eAAe;SAClC;QAED,oBAAC,KAAK,IACF,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,GAAG,KAAK,cAAc,EAC1B,KAAK,EAAE;gBACH,UAAU,EAAE,CAAC;gBACb,aAAa,EAAE,CAAC;gBAChB,QAAQ,EAAE,EAAE;aACf,GACH;QACF,oBAAC,KAAK,IACF,EAAE,EAAE,GAAG,KAAK,QAAQ,EACpB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE;gBACH,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,OAAO;gBAClB,KAAK,EAAE,MAAM;aAChB,GACH,CACA,CACT,CAAC;AACN,CAAC,CACJ,CAAC;AAEF,YAAY,CAAC,YAAY,GAAG;IACxB,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;CACV,CAAC;AAEF,YAAY,CAAC,WAAW,GAAG,cAAc,CAAC;AAC1C,eAAe,YAAY,CAAC"}
+{"version":3,"file":"NumericInput.js","sourceRoot":"","sources":["../../../src/components/settings/NumericInput.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAsBvD,MAAM,YAAY,GAAoB,KAAK,CAAC,IAAI,CAC5C,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAS,EAAE,EAAE;IAC1D,OAAO,CACH,6BACI,KAAK,EAAE;YACH,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,eAAe;SAClC;QAED,oBAAC,KAAK,IACF,KAAK,EAAE,KAAK,EACZ,EAAE,EAAE,GAAG,KAAK,cAAc,EAC1B,KAAK,EAAE;gBACH,UAAU,EAAE,CAAC;gBACb,aAAa,EAAE,CAAC;gBAChB,QAAQ,EAAE,EAAE;aACf,GACH;QACF,oBAAC,KAAK,IACF,EAAE,EAAE,GAAG,KAAK,QAAQ,EACpB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,EACV,KAAK,EAAE;gBACH,QAAQ,EAAE,EAAE;gBACZ,SAAS,EAAE,OAAO;gBAClB,KAAK,EAAE,MAAM;aAChB,GACH,CACA,CACT,CAAC;AACN,CAAC,CACJ,CAAC;AAEF,YAAY,CAAC,WAAW,GAAG,cAAc,CAAC;AAC1C,eAAe,YAAY,CAAC"}

package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js

@@ -350,7 +350,7 @@ export class GpglValueMappedSurfaceLayer extends Layer {
             this.state["valueRange"] ??
             defaultColormapSetup.valueRange;
         const clampRange = this.props.colormapSetup?.clampRange === null
-            ? null
+            ? [0, 1]
             : (this.props.colormapSetup?.clampRange ?? colormapRange);
         // render all the triangle surfaces
         triangleModels?.forEach((model) => {

package/dist/layers/gpglLayers/gpglValueMappedSurfaceLayer.js.map

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

package/dist/layers/shader_modules/phong-lighting/phong-material.d.ts

@@ -1,6 +1,7 @@
 import type { NumberArray3 } from "@math.gl/types";
 import type { ShaderModule } from "@luma.gl/shadertools";
 export type PhongMaterialProps = {
+    unlit?: boolean;
     ambient?: number;
     diffuse?: number;
     /** Specularity exponent */

package/dist/layers/shader_modules/phong-lighting/phong-material.js

@@ -1,36 +1,39 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { lighting } from "@luma.gl/shadertools";
+import { floatColors, lighting } from "@luma.gl/shadertools";
+//import {PHONG_WGSL} from './phong-shaders-wgsl';
 import { PHONG_VS, PHONG_FS } from "./phong-shaders-glsl";
+const DEFAULT_SPECULAR_COLOR = [38.25, 38.25, 38.25];
 /** In Phong shading, the normal vector is linearly interpolated across the surface of the polygon from the polygon's vertex normals. */
 export const phongMaterial = {
     name: "phongMaterial",
-    dependencies: [lighting],
+    firstBindingSlot: 0,
+    bindingLayout: [{ name: "phongMaterial", group: 3 }],
+    dependencies: [lighting, floatColors],
     // Note these are switched between phong and gouraud
+    //source: PHONG_WGSL,
     vs: PHONG_VS,
     fs: PHONG_FS,
     defines: {
         LIGHTING_FRAGMENT: true,
     },
     uniformTypes: {
+        unlit: "i32",
         ambient: "f32",
         diffuse: "f32",
         shininess: "f32",
         specularColor: "vec3<f32>",
     },
     defaultUniforms: {
+        unlit: false,
         ambient: 0.35,
         diffuse: 0.6,
         shininess: 32,
-        specularColor: [0.15, 0.15, 0.15],
+        specularColor: DEFAULT_SPECULAR_COLOR,
     },
     getUniforms(props) {
-        const uniforms = { ...props };
-        if (uniforms.specularColor) {
-            uniforms.specularColor = uniforms.specularColor.map((x) => x / 255);
-        }
-        return { ...phongMaterial.defaultUniforms, ...uniforms };
+        return { ...phongMaterial.defaultUniforms, ...props };
     },
 };
 //# sourceMappingURL=phong-material.js.map

package/dist/layers/shader_modules/phong-lighting/phong-material.js.map

@@ -1 +1 @@
-{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AASpC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAU1D,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC3D,IAAI,EAAE,eAAe;IACrB,YAAY,EAAE,CAAC,QAAQ,CAAC;IACxB,oDAAoD;IACpD,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACL,iBAAiB,EAAE,IAAI;KAC1B;IACD,YAAY,EAAE;QACV,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;KACpC;IACD,WAAW,CAAC,KAA0B;QAClC,MAAM,QAAQ,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACzB,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CACD,CAAC;QACtB,CAAC;QACD,OAAO,EAAE,GAAG,aAAa,CAAC,eAAe,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7D,CAAC;CACJ,CAAC"}
+{"version":3,"file":"phong-material.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AASpC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC7D,kDAAkD;AAClD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAW1D,MAAM,sBAAsB,GAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AAEnE,wIAAwI;AACxI,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC3D,IAAI,EAAE,eAAe;IACrB,gBAAgB,EAAE,CAAC;IACnB,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACpD,YAAY,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC;IACrC,oDAAoD;IACpD,qBAAqB;IACrB,EAAE,EAAE,QAAQ;IACZ,EAAE,EAAE,QAAQ;IACZ,OAAO,EAAE;QACL,iBAAiB,EAAE,IAAI;KAC1B;IACD,YAAY,EAAE;QACV,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,WAAW;KAC7B;IACD,eAAe,EAAE;QACb,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,GAAG;QACZ,SAAS,EAAE,EAAE;QACb,aAAa,EAAE,sBAAsB;KACxC;IACD,WAAW,CAAC,KAA0B;QAClC,OAAO,EAAE,GAAG,aAAa,CAAC,eAAe,EAAE,GAAG,KAAK,EAAE,CAAC;IAC1D,CAAC;CACJ,CAAC"}

package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.d.ts

@@ -1,2 +1,2 @@
-export declare const PHONG_VS = "uniform phongMaterialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n";
-export declare const PHONG_FS = "#define MAX_LIGHTS 3\n\nuniform phongMaterialUniforms {\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n\n// Note modified for two sided lighting.\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n  vec3 halfway_direction = normalize(light_direction + view_direction); \n\n  float lambertian = abs(dot(light_direction, normal_worldspace));\n  float specular_angle = abs(dot(normal_worldspace, halfway_direction));\n\n  float specular = pow(specular_angle, material.shininess);       \n  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;\n}\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = surfaceColor;\n\n  if (lighting.enabled == 0) {\n    return lightColor;\n  }\n\n  vec3 view_direction = normalize(cameraPosition - position_worldspace);\n  lightColor = material.ambient * surfaceColor * lighting.ambientColor;\n\n  for (int i = 0; i < lighting.pointLightCount; i++) {\n    PointLight pointLight = lighting_getPointLight(i);\n    vec3 light_position_worldspace = pointLight.position;\n    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n    float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));\n    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);\n  }\n\n  int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);\n  for (int i = lighting.pointLightCount; i < totalLights; i++) {\n    DirectionalLight directionalLight = lighting_getDirectionalLight(i);\n    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n  }\n  \n  return lightColor;\n}\n";
+export declare const PHONG_VS = "layout(std140) uniform phongMaterialUniforms {\n  uniform bool unlit;\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n";
+export declare const PHONG_FS = "layout(std140) uniform phongMaterialUniforms {\n  uniform bool unlit;\n  uniform float ambient;\n  uniform float diffuse;\n  uniform float shininess;\n  uniform vec3  specularColor;\n} material;\n\n// Note modified for two sided lighting.\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n  vec3 halfway_direction = normalize(light_direction + view_direction);\n\n  // initial code\n  // float lambertian = dot(light_direction, normal_worldspace);\n  // float specular = 0.0;\n  // if (lambertian > 0.0) {\n  //   float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);\n  //   specular = pow(specular_angle, material.shininess);\n  // }\n  // lambertian = max(lambertian, 0.0);\n  \n  // new code for two sided lighting\n  float lambertian = abs(dot(light_direction, normal_worldspace));\n  float specular_angle = abs(dot(normal_worldspace, halfway_direction));\n  float specular = pow(specular_angle, material.shininess);\n\n  return (lambertian * material.diffuse * surfaceColor + specular * floatColors_normalize(material.specularColor)) * color;\n}\n\nvec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n  vec3 lightColor = surfaceColor;\n\n  if (material.unlit) {\n    return surfaceColor;\n  }\n\n  if (lighting.enabled == 0) {\n    return lightColor;\n  }\n\n  vec3 view_direction = normalize(cameraPosition - position_worldspace);\n  lightColor = material.ambient * surfaceColor * lighting.ambientColor;\n\n  for (int i = 0; i < lighting.pointLightCount; i++) {\n    PointLight pointLight = lighting_getPointLight(i);\n    vec3 light_position_worldspace = pointLight.position;\n    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n    float light_attenuation = getPointLightAttenuation(pointLight, distance(light_position_worldspace, position_worldspace));\n    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);\n  }\n\n  for (int i = 0; i < lighting.spotLightCount; i++) {\n    SpotLight spotLight = lighting_getSpotLight(i);\n    vec3 light_position_worldspace = spotLight.position;\n    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n    float light_attenuation = getSpotLightAttenuation(spotLight, position_worldspace);\n    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, spotLight.color / light_attenuation);\n  }\n\n  for (int i = 0; i < lighting.directionalLightCount; i++) {\n    DirectionalLight directionalLight = lighting_getDirectionalLight(i);\n    lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n  }\n  \n  return lightColor;\n}\n";

package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.js

@@ -1,8 +1,13 @@
 // luma.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
+// Webviz note: Copied this module from luma.gl.
+// https://github.com/visgl/luma.gl branch 9.3-release
+// Modified imports and commented PHONG_WGSL in file "phong-material.ts".
+// Modified function "lighting_getLightColor" in file "phong-shaders-glsl.ts" to get two sided phong lighting.
 export const PHONG_VS = /* glsl */ `\
-uniform phongMaterialUniforms {
+layout(std140) uniform phongMaterialUniforms {
+  uniform bool unlit;
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -10,9 +15,8 @@ uniform phongMaterialUniforms {
 } material;
 `;
 export const PHONG_FS = /* glsl */ `\
-#define MAX_LIGHTS 3
-
-uniform phongMaterialUniforms {
+layout(std140) uniform phongMaterialUniforms {
+  uniform bool unlit;
   uniform float ambient;
   uniform float diffuse;
   uniform float shininess;
@@ -21,18 +25,32 @@ uniform phongMaterialUniforms {
 
 // Note modified for two sided lighting.
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {
-  vec3 halfway_direction = normalize(light_direction + view_direction); 
+  vec3 halfway_direction = normalize(light_direction + view_direction);
 
+  // initial code
+  // float lambertian = dot(light_direction, normal_worldspace);
+  // float specular = 0.0;
+  // if (lambertian > 0.0) {
+  //   float specular_angle = max(dot(normal_worldspace, halfway_direction), 0.0);
+  //   specular = pow(specular_angle, material.shininess);
+  // }
+  // lambertian = max(lambertian, 0.0);
+  
+  // new code for two sided lighting
   float lambertian = abs(dot(light_direction, normal_worldspace));
   float specular_angle = abs(dot(normal_worldspace, halfway_direction));
+  float specular = pow(specular_angle, material.shininess);
 
-  float specular = pow(specular_angle, material.shininess);       
-  return (lambertian * material.diffuse * surfaceColor + specular * material.specularColor) * color;
+  return (lambertian * material.diffuse * surfaceColor + specular * floatColors_normalize(material.specularColor)) * color;
 }
 
 vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
   vec3 lightColor = surfaceColor;
 
+  if (material.unlit) {
+    return surfaceColor;
+  }
+
   if (lighting.enabled == 0) {
     return lightColor;
   }
@@ -48,8 +66,15 @@ vec3 lighting_getLightColor(vec3 surfaceColor, vec3 cameraPosition, vec3 positio
     lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color / light_attenuation);
   }
 
-  int totalLights = min(MAX_LIGHTS, lighting.pointLightCount + lighting.directionalLightCount);
-  for (int i = lighting.pointLightCount; i < totalLights; i++) {
+  for (int i = 0; i < lighting.spotLightCount; i++) {
+    SpotLight spotLight = lighting_getSpotLight(i);
+    vec3 light_position_worldspace = spotLight.position;
+    vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
+    float light_attenuation = getSpotLightAttenuation(spotLight, position_worldspace);
+    lightColor += lighting_getLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, spotLight.color / light_attenuation);
+  }
+
+  for (int i = 0; i < lighting.directionalLightCount; i++) {
     DirectionalLight directionalLight = lighting_getDirectionalLight(i);
     lightColor += lighting_getLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
   }

package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.js.map

@@ -1 +1 @@
-{"version":3,"file":"phong-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-shaders-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;CAOlC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+ClC,CAAC"}
+{"version":3,"file":"phong-shaders-glsl.js","sourceRoot":"","sources":["../../../../src/layers/shader_modules/phong-lighting/phong-shaders-glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,gDAAgD;AAChD,sDAAsD;AACtD,yEAAyE;AACzE,8GAA8G;AAE9G,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;;CAQlC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmElC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webviz/subsurface-viewer",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "publishConfig": {
     "access": "public"
   },