Merge branch 'master' into nx_release

hkfb · Sep 6, 2024 · ba12891 · ba12891
2 parents 9454be0 + b45ef84
commit ba12891
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/typescript/packages/subsurface-viewer/CHANGELOG.md b/typescript/packages/subsurface-viewer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [0.30.2](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.30.2) (2024-09-06)
+
+
+### Bug Fixes
+
+* **grid3:** Grid3dLayer coloring by constant color fixed ([#2227](https://github.com/equinor/webviz-subsurface-components/issues/2227)) ([0a7d89f](https://github.com/equinor/webviz-subsurface-components/commit/0a7d89fc8d2edf8b9d46dda7f39c7ec62d574f2d))
+
 ## [0.30.1](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.30.1) (2024-09-05)
 
 

diff --git a/typescript/packages/subsurface-viewer/package.json b/typescript/packages/subsurface-viewer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@webviz/subsurface-viewer",
-    "version": "0.30.1",
+    "version": "0.30.2",
     "description": "3D visualization component for subsurface reservoir data",
     "keywords": [
         "subsurface",

diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/fragment.fs.glsl.ts
@@ -98,7 +98,8 @@ void main(void) {
    }
 
    if (coloringMode == 0 && isnan(property)) {
-      fragColor = vec4(undefinedPropertyColor.rgb, 1.0); 
+      vec3 lightColor = getPhongLightColor(undefinedPropertyColor.rgb, cameraPosition, position_commonspace.xyz, normal);
+      fragColor = vec4(lightColor, 1.0);      
       return;
    }