Merge branch 'master' into fix-update-storybook

equinor · Oct 27, 2023 · b26190a · b26190a
2 parents 963c569 + 270d5d4
commit b26190a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/typescript/packages/subsurface-viewer/CHANGELOG.md b/typescript/packages/subsurface-viewer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [0.5.3](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.5.3) (2023-10-27)
+
+
+### Bug Fixes
+
+* force publishing a new package ([#1740](https://github.com/equinor/webviz-subsurface-components/issues/1740)) ([64938ee](https://github.com/equinor/webviz-subsurface-components/commit/64938ee977db4ec01c1ea09135827bc2af837018))
+
 ## [0.5.2](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.5.2) (2023-10-25)
 
 

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.5.2",
+    "version": "0.5.3",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

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
@@ -55,9 +55,9 @@ void main(void) {
       color = texture2D(colormap, vec2(x, 0.5));
    }
 
-   // Use normal lighting. This has no effect if "material" property is not set.
-   vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
-   gl_FragColor = vec4(lightColor, 1.0);   
+   // 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);
 }
 `;

diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/grid3dLayer.ts
@@ -1,7 +1,7 @@
 import type { Color } from "@deck.gl/core/typed";
 import { CompositeLayer } from "@deck.gl/core/typed";
-import type { Material } from "./privateLayer";
-import privateLayer from "./privateLayer";
+import type { Material } from "./privateGrid3dLayer";
+import privateLayer from "./privateGrid3dLayer";
 import type {
     ExtendedLayerProps,
     colorMapFunctionType,

diff --git a/...-viewer/src/layers/grid3d/privateLayer.ts → ...r/src/layers/grid3d/privateGrid3dLayer.ts b/...-viewer/src/layers/grid3d/privateLayer.ts → ...r/src/layers/grid3d/privateGrid3dLayer.ts
diff --git a/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts b/typescript/packages/subsurface-viewer/src/layers/grid3d/webworker.ts
@@ -1,4 +1,4 @@
-import type { MeshType, MeshTypeLines } from "./privateLayer";
+import type { MeshType, MeshTypeLines } from "./privateGrid3dLayer";
 import type { WebWorkerParams } from "./grid3dLayer";
 
 export function makeFullMesh(e: { data: WebWorkerParams }): void {

diff --git a/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts b/typescript/packages/subsurface-viewer/src/layers/map/fragment.fs.glsl.ts
@@ -93,10 +93,9 @@ void main(void) {
       color = color * vec4(c, c, c, 1.0);
    }
 
-   // Use normal lighting. This has no effect if "material" property is not set.
-   vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+   // 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);
 }
 `;

diff --git a/typescript/packages/subsurface-viewer/src/layers/triangle/fragment.fs.glsl.ts b/typescript/packages/subsurface-viewer/src/layers/triangle/fragment.fs.glsl.ts
@@ -40,7 +40,7 @@ void main(void) {
       color = color * vec4(c, c, c, 1.0);
    }
 
-   // Use normal lighting. This has no effect if "material" property is not set.
+   // 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);