@webviz/subsurface-viewer 1.15.5 → 1.15.7
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.
- package/dist/layers/map/map.fs.glsl.d.ts +1 -1
- package/dist/layers/map/map.fs.glsl.js +12 -7
- package/dist/layers/map/map.fs.glsl.js.map +1 -1
- package/dist/layers/map/map.vs.glsl.d.ts +1 -1
- package/dist/layers/map/map.vs.glsl.js +2 -1
- package/dist/layers/map/map.vs.glsl.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +3 -1
- package/dist/layers/map/privateMapLayer.js +41 -2
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME map-fragment-shader\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\nin vec3 worldPos;\nin float property;\nflat in int vertexIndex;\n\n// Uniforms\nuniform sampler2D colormap;\n\nout vec4 fragColor;\n\
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME map-fragment-shader\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\nin vec3 worldPos;\nin float property;\nflat in int vertexIndex;\n\n// Uniforms\nuniform sampler2D colormap;\n\nout vec4 fragColor;\n\nvoid main(void) { \n geometry.uv = vTexCoord;\n\n vec3 normal = normals_commonspace;\n\n if(!map.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 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, map.valueRangeMin, map.valueRangeMax);\n\n float x = (propertyValue - map.colormapRangeMin) / (map.colormapRangeMax - map.colormapRangeMin);\n if (x < 0.0 || x > 1.0) {\n // Out of range. Use clampcolor.\n if (map.isClampColor) {\n color = vec4(map.colormapClampColor.rgb, 1.0);\n }\n else if (map.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 = map.contourReferencePoint != -1.0 && map.contourInterval != -1.0;\n if (is_contours) {\n float val = map.isContoursDepth ? (abs(worldPos.z) - map.contourReferencePoint) / map.contourInterval\n : (propertyValue - map.contourReferencePoint) / map.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 from 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 = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n\n fragColor = vec4(lightColor, vColor.a);\n DECKGL_FILTER_COLOR(fragColor, geometry);\n\n // Below code is modified version of \"picking_filterPickingColor\" function.\n // Original function is in deckgl's shader modules/picking.glsl.ts\n // \"GetPickingInfo\" retrieves this color as \"pickingColor\" on the JS side.\n // Encodes vertexIndex and is used to retrieve picked info from input data.\n if ( bool(picking.isActive) && !bool(picking.isAttribute) ) {\n if (picking_vRGBcolor_Avalid.a == 0.0) {\n discard;\n }\n vec4 encodedIndexColor = encodeIndexToRGB(vertexIndex);\n fragColor = vec4(encodedIndexColor.rgb, picking_vRGBcolor_Avalid.a);\n }\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -15,7 +15,6 @@ uniform sampler2D colormap;
|
|
|
15
15
|
|
|
16
16
|
out vec4 fragColor;
|
|
17
17
|
|
|
18
|
-
|
|
19
18
|
void main(void) {
|
|
20
19
|
geometry.uv = vTexCoord;
|
|
21
20
|
|
|
@@ -25,12 +24,6 @@ void main(void) {
|
|
|
25
24
|
normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
|
|
26
25
|
}
|
|
27
26
|
|
|
28
|
-
//Picking pass.
|
|
29
|
-
if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {
|
|
30
|
-
fragColor = encodeIndexToRGB(vertexIndex);
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
|
|
34
27
|
vec4 color = vec4(1.0, 1.0, 1.0, 1.0);
|
|
35
28
|
float propertyValue = property;
|
|
36
29
|
|
|
@@ -78,6 +71,18 @@ void main(void) {
|
|
|
78
71
|
|
|
79
72
|
fragColor = vec4(lightColor, vColor.a);
|
|
80
73
|
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
74
|
+
|
|
75
|
+
// Below code is modified version of "picking_filterPickingColor" function.
|
|
76
|
+
// Original function is in deckgl's shader modules/picking.glsl.ts
|
|
77
|
+
// "GetPickingInfo" retrieves this color as "pickingColor" on the JS side.
|
|
78
|
+
// Encodes vertexIndex and is used to retrieve picked info from input data.
|
|
79
|
+
if ( bool(picking.isActive) && !bool(picking.isAttribute) ) {
|
|
80
|
+
if (picking_vRGBcolor_Avalid.a == 0.0) {
|
|
81
|
+
discard;
|
|
82
|
+
}
|
|
83
|
+
vec4 encodedIndexColor = encodeIndexToRGB(vertexIndex);
|
|
84
|
+
fragColor = vec4(encodedIndexColor.rgb, picking_vRGBcolor_Avalid.a);
|
|
85
|
+
}
|
|
81
86
|
}
|
|
82
87
|
`;
|
|
83
88
|
//# sourceMappingURL=map.fs.glsl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/map.fs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"map.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/map.fs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsFd,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME map-vertex-shader\n\n// Primitive attributes\nin vec3 positions;\nin float properties;\nin vec3 normals;\nin vec3 colors;\n\n// Outputs to fragment shader\nout vec2 vTexCoord;\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout vec4 vColor;\nout vec3 worldPos;\nout float property;\nflat out int vertexIndex;\n\nvoid main(void) {\n geometry.pickingColor =
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME map-vertex-shader\n\n// Primitive attributes\nin vec3 positions;\nin float properties;\nin vec3 normals;\nin vec3 colors;\nin vec3 pickingColors;\n\n// Outputs to fragment shader\nout vec2 vTexCoord;\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout vec4 vColor;\nout vec3 worldPos;\nout float property;\nflat out int vertexIndex;\n\nvoid main(void) {\n geometry.pickingColor = pickingColors;\n vertexIndex = gl_VertexID;\n\n vec3 position = positions;\n position[2] *= map.ZIncreasingDownwards ? -1.0 : 1.0;\n\n cameraPosition = project.cameraPosition;\n\n worldPos = position;\n geometry.worldPosition = position;\n\n normals_commonspace = normals;\n\n property = properties;\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 vColor = vec4(colors.rgb, layer.opacity);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -7,6 +7,7 @@ in vec3 positions;
|
|
|
7
7
|
in float properties;
|
|
8
8
|
in vec3 normals;
|
|
9
9
|
in vec3 colors;
|
|
10
|
+
in vec3 pickingColors;
|
|
10
11
|
|
|
11
12
|
// Outputs to fragment shader
|
|
12
13
|
out vec2 vTexCoord;
|
|
@@ -19,7 +20,7 @@ out float property;
|
|
|
19
20
|
flat out int vertexIndex;
|
|
20
21
|
|
|
21
22
|
void main(void) {
|
|
22
|
-
geometry.pickingColor =
|
|
23
|
+
geometry.pickingColor = pickingColors;
|
|
23
24
|
vertexIndex = gl_VertexID;
|
|
24
25
|
|
|
25
26
|
vec3 position = positions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/map.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"map.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/map.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6Cd,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Color, PickingInfo, UpdateParameters, LayerContext } from "@deck.gl/core";
|
|
1
|
+
import type { Color, PickingInfo, UpdateParameters, LayerContext, Attribute } from "@deck.gl/core";
|
|
2
2
|
import { Layer } from "@deck.gl/core";
|
|
3
3
|
import type { Device, UniformValue } from "@luma.gl/core";
|
|
4
4
|
import { Model } from "@luma.gl/engine";
|
|
@@ -29,6 +29,7 @@ export default class PrivateMapLayer extends Layer<PrivateMapLayerProps> {
|
|
|
29
29
|
setShaderModuleProps(args: Partial<{
|
|
30
30
|
[x: string]: Partial<Record<string, unknown> | undefined>;
|
|
31
31
|
}>): void;
|
|
32
|
+
calculatePickingColors(attribute: Attribute): void;
|
|
32
33
|
initializeState(context: DeckGLLayerContext): void;
|
|
33
34
|
shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
|
|
34
35
|
updateState({ context }: UpdateParameters<this>): void;
|
|
@@ -39,6 +40,7 @@ export default class PrivateMapLayer extends Layer<PrivateMapLayerProps> {
|
|
|
39
40
|
context: LayerContext;
|
|
40
41
|
}): void;
|
|
41
42
|
decodePickingColor(): number;
|
|
43
|
+
_disablePickingIndex(): void;
|
|
42
44
|
getPickingInfo({ info }: {
|
|
43
45
|
info: PickingInfo;
|
|
44
46
|
}): LayerPickInfo;
|
|
@@ -4,6 +4,7 @@ import { Model, Geometry } from "@luma.gl/engine";
|
|
|
4
4
|
import { phongMaterial } from "../shader_modules/phong-lighting/phong-material";
|
|
5
5
|
import { precisionForTests } from "../shader_modules/test-precision/precisionForTests";
|
|
6
6
|
import { decodeIndexFromRGB, utilities } from "../shader_modules";
|
|
7
|
+
import { encodeIndexToRGB } from "../shader_modules/utilities";
|
|
7
8
|
import { createPropertyData } from "../utils/layerTools";
|
|
8
9
|
import { getImageData, } from "../utils/colormapTools";
|
|
9
10
|
import fs from "./map.fs.glsl";
|
|
@@ -11,7 +12,6 @@ import vs from "./map.vs.glsl";
|
|
|
11
12
|
import fsLineShader from "./line.fs.glsl";
|
|
12
13
|
import vsLineShader from "./line.vs.glsl";
|
|
13
14
|
const defaultProps = {
|
|
14
|
-
data: ["dummy"],
|
|
15
15
|
contours: [-1, -1],
|
|
16
16
|
isContoursDepth: true,
|
|
17
17
|
gridLines: false,
|
|
@@ -32,6 +32,18 @@ export default class PrivateMapLayer extends Layer {
|
|
|
32
32
|
setShaderModuleProps(args) {
|
|
33
33
|
super.setShaderModuleProps(Object.assign(Object.assign({}, args), { lighting: Object.assign(Object.assign({}, args["lighting"]), { enabled: this.props.enableLighting }) }));
|
|
34
34
|
}
|
|
35
|
+
calculatePickingColors(attribute) {
|
|
36
|
+
const n = this.props.positions.length / 3;
|
|
37
|
+
const arr = new Uint8Array(n * 3);
|
|
38
|
+
for (let i = 0; i < arr.length / 3; i++) {
|
|
39
|
+
const pickingColor = encodeIndexToRGB(i);
|
|
40
|
+
arr[i * 3 + 0] = pickingColor[0];
|
|
41
|
+
arr[i * 3 + 1] = pickingColor[1];
|
|
42
|
+
arr[i * 3 + 2] = pickingColor[2];
|
|
43
|
+
}
|
|
44
|
+
attribute.value = arr;
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
35
47
|
initializeState(context) {
|
|
36
48
|
const gl = context.device;
|
|
37
49
|
const [mesh_model, mesh_lines_model] = this._getModels(gl);
|
|
@@ -39,6 +51,14 @@ export default class PrivateMapLayer extends Layer {
|
|
|
39
51
|
models: [mesh_model, mesh_lines_model],
|
|
40
52
|
isLoaded: false,
|
|
41
53
|
});
|
|
54
|
+
this.getAttributeManager().remove(["instancePickingColors"]);
|
|
55
|
+
this.getAttributeManager().add({
|
|
56
|
+
pickingColors: {
|
|
57
|
+
size: 3,
|
|
58
|
+
type: "uint8",
|
|
59
|
+
update: this.calculatePickingColors,
|
|
60
|
+
},
|
|
61
|
+
});
|
|
42
62
|
}
|
|
43
63
|
shouldUpdateState({ props, oldProps, context, changeFlags, }) {
|
|
44
64
|
return (super.shouldUpdateState({
|
|
@@ -170,9 +190,28 @@ export default class PrivateMapLayer extends Layer {
|
|
|
170
190
|
this.setState(Object.assign(Object.assign({}, this.state), { isLoaded: true }));
|
|
171
191
|
}
|
|
172
192
|
}
|
|
173
|
-
|
|
193
|
+
// Maps all colors to index 0 as this layer does not use multiple indexes.
|
|
194
|
+
decodePickingColor( /*color: Uint8Array*/) {
|
|
174
195
|
return 0;
|
|
175
196
|
}
|
|
197
|
+
// Disable picking by setting all picking colors to null color.
|
|
198
|
+
// Used in multipicking to prevent recurring picks of the same layer.
|
|
199
|
+
_disablePickingIndex( /*objectIndex: number*/) {
|
|
200
|
+
const { pickingColors, instancePickingColors } = this.getAttributeManager().attributes;
|
|
201
|
+
const colors = pickingColors || instancePickingColors;
|
|
202
|
+
if (!colors) {
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
const pickingColor = this.nullPickingColor();
|
|
206
|
+
const n = this.props.positions.length / 3;
|
|
207
|
+
const arr = new Uint8Array(n * 3);
|
|
208
|
+
for (let i = 0; i < arr.length / 3; i++) {
|
|
209
|
+
arr[i * 3 + 0] = pickingColor[0];
|
|
210
|
+
arr[i * 3 + 1] = pickingColor[1];
|
|
211
|
+
arr[i * 3 + 2] = pickingColor[2];
|
|
212
|
+
}
|
|
213
|
+
colors.buffer.write(arr, 0);
|
|
214
|
+
}
|
|
176
215
|
getPickingInfo({ info }) {
|
|
177
216
|
var _a;
|
|
178
217
|
if (!info.color) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateMapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/privateMapLayer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"privateMapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/privateMapLayer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webviz/subsurface-viewer",
|
|
3
|
-
"version": "1.15.
|
|
3
|
+
"version": "1.15.7",
|
|
4
4
|
"description": "3D visualization component for subsurface reservoir data",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"subsurface",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"@equinor/eds-icons": "^0.21.0",
|
|
47
47
|
"@turf/simplify": "^7.1.0",
|
|
48
48
|
"@vivaxy/png": "^1.3.0",
|
|
49
|
-
"@webviz/wsc-common": "1.3.
|
|
49
|
+
"@webviz/wsc-common": "1.3.18",
|
|
50
50
|
"ajv": "^8.16.0",
|
|
51
51
|
"convert-units": "^2.3.4",
|
|
52
52
|
"d3": "^7.8.2",
|