@webviz/subsurface-viewer 1.11.8 → 1.11.9
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/axes/box.fs.glsl.d.ts +1 -1
- package/dist/layers/axes/box.fs.glsl.js +3 -3
- package/dist/layers/axes/box.vs.glsl.d.ts +1 -1
- package/dist/layers/axes/box.vs.glsl.js +4 -0
- package/dist/layers/axes/box.vs.glsl.js.map +1 -1
- package/dist/layers/axes/boxLayer.js +4 -8
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.js +13 -24
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.d.ts +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.js +1 -1
- package/dist/layers/grid3d/cellProperty.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/cellProperty.fs.glsl.js +5 -4
- package/dist/layers/grid3d/cellProperty.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/cellProperty.vs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/cellProperty.vs.glsl.js +3 -2
- package/dist/layers/grid3d/cellProperty.vs.glsl.js.map +1 -1
- package/dist/layers/grid3d/line.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/line.fs.glsl.js +3 -1
- package/dist/layers/grid3d/line.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/line.vs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/line.vs.glsl.js +4 -0
- package/dist/layers/grid3d/line.vs.glsl.js.map +1 -1
- package/dist/layers/grid3d/nodeProperty.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/nodeProperty.fs.glsl.js +3 -2
- package/dist/layers/grid3d/nodeProperty.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/nodeProperty.vs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/nodeProperty.vs.glsl.js +3 -2
- package/dist/layers/grid3d/nodeProperty.vs.glsl.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +1 -18
- package/dist/layers/grid3d/privateGrid3dLayer.js +18 -25
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/map/line.fs.glsl.d.ts +1 -1
- package/dist/layers/map/line.fs.glsl.js +2 -1
- package/dist/layers/map/line.fs.glsl.js.map +1 -1
- package/dist/layers/map/line.vs.glsl.d.ts +1 -1
- package/dist/layers/map/line.vs.glsl.js +4 -0
- package/dist/layers/map/line.vs.glsl.js.map +1 -1
- package/dist/layers/map/map.fs.glsl.d.ts +1 -1
- package/dist/layers/map/map.fs.glsl.js +6 -8
- 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 -4
- package/dist/layers/map/map.vs.glsl.js.map +1 -1
- package/dist/layers/map/privateMapLayer.js +4 -8
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.js +4 -8
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/northarrow/northarrow.fs.glsl.d.ts +1 -1
- package/dist/layers/northarrow/northarrow.fs.glsl.js +1 -1
- package/dist/layers/piechart/pieChartLayer.js +4 -7
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/piechart/piechart.fs.glsl.d.ts +1 -1
- package/dist/layers/piechart/piechart.fs.glsl.js +1 -1
- package/dist/layers/points/point.vs.glsl.d.ts +1 -1
- package/dist/layers/points/point.vs.glsl.js +2 -2
- package/dist/layers/polylines/polyline.vs.glsl.d.ts +1 -1
- package/dist/layers/polylines/polyline.vs.glsl.js +1 -1
- package/dist/layers/triangle/line.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/line.fs.glsl.js +4 -1
- package/dist/layers/triangle/line.fs.glsl.js.map +1 -1
- package/dist/layers/triangle/line.vs.glsl.d.ts +1 -1
- package/dist/layers/triangle/line.vs.glsl.js +4 -1
- package/dist/layers/triangle/line.vs.glsl.js.map +1 -1
- package/dist/layers/triangle/privateTriangleLayer.js +4 -12
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangle.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/triangle.fs.glsl.js +5 -5
- package/dist/layers/triangle/triangle.vs.glsl.d.ts +1 -1
- package/dist/layers/triangle/triangle.vs.glsl.js +3 -5
- package/dist/layers/triangle/triangle.vs.glsl.js.map +1 -1
- package/dist/layers/well_markers/marker.fs.glsl.d.ts +1 -1
- package/dist/layers/well_markers/marker.fs.glsl.js +2 -2
- package/dist/layers/well_markers/marker.vs.glsl.d.ts +1 -1
- package/dist/layers/well_markers/marker.vs.glsl.js +3 -5
- package/dist/layers/well_markers/marker.vs.glsl.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/line.fs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"line.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/line.fs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;;CAqBd,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-lines-vertex-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-lines-vertex-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4 vColor;\n\nvoid main(void) {\n vec3 position = positions;\n position[2] *= triangleMesh.ZIncreasingDownwards ? -1.0 : 1.0;\n\n vec3 position_commonspace = project_position(position);\n gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));\n\n vColor = vec4(0.0, 0.0, 0.0, layer.opacity);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -6,7 +6,7 @@ precision highp float;
|
|
|
6
6
|
|
|
7
7
|
in vec3 positions;
|
|
8
8
|
|
|
9
|
-
out vec4
|
|
9
|
+
out vec4 vColor;
|
|
10
10
|
|
|
11
11
|
void main(void) {
|
|
12
12
|
vec3 position = positions;
|
|
@@ -14,6 +14,9 @@ void main(void) {
|
|
|
14
14
|
|
|
15
15
|
vec3 position_commonspace = project_position(position);
|
|
16
16
|
gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));
|
|
17
|
+
|
|
18
|
+
vColor = vec4(0.0, 0.0, 0.0, layer.opacity);
|
|
19
|
+
DECKGL_FILTER_COLOR(vColor, geometry);
|
|
17
20
|
}
|
|
18
21
|
`;
|
|
19
22
|
//# sourceMappingURL=line.vs.glsl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/line.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"line.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/line.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;CAoBd,CAAC"}
|
|
@@ -46,12 +46,9 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
46
46
|
this.initializeState(context);
|
|
47
47
|
}
|
|
48
48
|
_getModels(device) {
|
|
49
|
-
const triangleModel = new Model(device, {
|
|
50
|
-
id: `${this.props.id}-mesh`,
|
|
49
|
+
const triangleModel = new Model(device, Object.assign(Object.assign({ id: `${this.props.id}-mesh` }, super.getShaders({
|
|
51
50
|
vs: vsShader,
|
|
52
51
|
fs: fsShader,
|
|
53
|
-
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
54
|
-
geometry: new Geometry(this.props.geometryTriangles),
|
|
55
52
|
modules: [
|
|
56
53
|
project32,
|
|
57
54
|
picking,
|
|
@@ -59,17 +56,12 @@ export default class PrivateTriangleLayer extends Layer {
|
|
|
59
56
|
phongMaterial,
|
|
60
57
|
trianglesUniforms,
|
|
61
58
|
],
|
|
62
|
-
|
|
63
|
-
}
|
|
64
|
-
const lineModel = new Model(device, {
|
|
65
|
-
id: `${this.props.id}-lines`,
|
|
59
|
+
})), { bufferLayout: this.getAttributeManager().getBufferLayouts(), geometry: new Geometry(this.props.geometryTriangles), isInstanced: false }));
|
|
60
|
+
const lineModel = new Model(device, Object.assign(Object.assign({ id: `${this.props.id}-lines` }, super.getShaders({
|
|
66
61
|
vs: vsLineShader,
|
|
67
62
|
fs: fsLineShader,
|
|
68
|
-
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
69
|
-
geometry: new Geometry(this.props.geometryLines),
|
|
70
63
|
modules: [project32, picking, triangleMeshUniforms],
|
|
71
|
-
|
|
72
|
-
});
|
|
64
|
+
})), { bufferLayout: this.getAttributeManager().getBufferLayouts(), geometry: new Geometry(this.props.geometryLines), isInstanced: false }));
|
|
73
65
|
return [triangleModel, lineModel];
|
|
74
66
|
}
|
|
75
67
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKlD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAMhF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAkC1C,MAAM,YAAY,GAAG;IACjB,IAAI,EAAE,CAAC,OAAO,CAAC;IACf,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClB,eAAe,EAAE,IAAI;IACrB,SAAS,EAAE,KAAK;IAChB,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACtB,gBAAgB,EAAE,iBAAiB,CAAC,SAAS;IAC7C,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,IAAI;IACnB,oBAAoB,EAAE,IAAI;IAC1B,cAAc,EAAE,IAAI;CACvB,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,KAAgC;IAC9E,IAAI,QAAQ;;QACR,OAAO,MAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAa,mCAAI,KAAK,CAAC;IACxD,CAAC;IAED,oBAAoB,CAChB,IAEE;QAEF,KAAK,CAAC,oBAAoB,iCACnB,IAAI,KACP,QAAQ,kCACD,IAAI,CAAC,UAAU,CAAC,KACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,OAExC,CAAC;IACP,CAAC;IAED,eAAe,CAAC,OAA2B;QACvC,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAC1B,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,iBAAiB,CAAC,EACd,KAAK,EACL,QAAQ,EACR,OAAO,EACP,WAAW,GACU;QACrB,OAAO,CACH,KAAK,CAAC,iBAAiB,CAAC;YACpB,KAAK;YACL,QAAQ;YACR,OAAO;YACP,WAAW;SACd,CAAC,IAAI,WAAW,CAAC,kBAAkB,CACvC,CAAC;IACN,CAAC;IAED,WAAW,CAAC,EAAE,OAAO,EAA0B;QAC3C,IAAI,CAAC,eAAe,CAAC,OAA6B,CAAC,CAAC;IACxD,CAAC;IAED,UAAU,CAAC,MAAc;QACrB,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-fragment-shader\n\nprecision highp float;\n\nin
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-fragment-shader\n\nprecision highp float;\n\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec3 worldPos;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n vec3 normal = normals_commonspace;\n\n if (!triangles.smoothShading) {\n normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n }\n\n vec4 color = vColor;\n \n bool is_contours = triangles.contourReferencePoint != -1.0 && triangles.contourInterval != -1.0;\n if (is_contours) {\n // Contours are made of either depths or properties.\n float val = (abs(worldPos.z) - triangles.contourReferencePoint) / triangles.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); // smoothstep 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 fragColor = vec4(lightColor, vColor.a);\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -3,12 +3,11 @@ export default `#version 300 es
|
|
|
3
3
|
|
|
4
4
|
precision highp float;
|
|
5
5
|
|
|
6
|
-
in vec2 vTexCoord;
|
|
7
6
|
in vec3 cameraPosition;
|
|
8
7
|
in vec3 normals_commonspace;
|
|
9
8
|
in vec4 position_commonspace;
|
|
10
9
|
in vec3 worldPos;
|
|
11
|
-
in
|
|
10
|
+
in vec4 vColor;
|
|
12
11
|
|
|
13
12
|
out vec4 fragColor;
|
|
14
13
|
|
|
@@ -17,9 +16,10 @@ void main(void) {
|
|
|
17
16
|
|
|
18
17
|
if (!triangles.smoothShading) {
|
|
19
18
|
normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
|
|
20
|
-
}
|
|
19
|
+
}
|
|
21
20
|
|
|
22
|
-
vec4 color =
|
|
21
|
+
vec4 color = vColor;
|
|
22
|
+
|
|
23
23
|
bool is_contours = triangles.contourReferencePoint != -1.0 && triangles.contourInterval != -1.0;
|
|
24
24
|
if (is_contours) {
|
|
25
25
|
// Contours are made of either depths or properties.
|
|
@@ -36,7 +36,7 @@ void main(void) {
|
|
|
36
36
|
|
|
37
37
|
// Use two sided phong lighting. This has no effect if "material" property is not set.
|
|
38
38
|
vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
|
|
39
|
-
fragColor = vec4(lightColor,
|
|
39
|
+
fragColor = vec4(lightColor, vColor.a);
|
|
40
40
|
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
41
41
|
}
|
|
42
42
|
`;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-vertex-shader\n\nprecision highp float;\n\n// Primitive attributes\nin vec3 positions;\nin float properties;\nin vec3 normals;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME triangle-vertex-shader\n\nprecision highp float;\n\n// Primitive attributes\nin vec3 positions;\nin float properties;\nin vec3 normals;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout vec4 vColor;\nout vec3 worldPos;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) {\n geometry.pickingColor = pickingColor;\n\n cameraPosition = project.cameraPosition;\n\n vec3 position = positions;\n position[2] *= triangles.ZIncreasingDownwards ? -1.0 : 1.0;\n\n worldPos = position;\n\n normals_commonspace = normals;\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(triangles.uColor.rgb, triangles.uColor.a * layer.opacity);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -13,8 +13,8 @@ in vec3 normals;
|
|
|
13
13
|
out vec3 cameraPosition;
|
|
14
14
|
out vec3 normals_commonspace;
|
|
15
15
|
out vec4 position_commonspace;
|
|
16
|
+
out vec4 vColor;
|
|
16
17
|
out vec3 worldPos;
|
|
17
|
-
out float property;
|
|
18
18
|
|
|
19
19
|
const vec3 pickingColor = vec3(1.0, 1.0, 0.0);
|
|
20
20
|
|
|
@@ -30,15 +30,13 @@ void main(void) {
|
|
|
30
30
|
|
|
31
31
|
normals_commonspace = normals;
|
|
32
32
|
|
|
33
|
-
property = properties;
|
|
34
|
-
|
|
35
33
|
position_commonspace = vec4(project_position(position), 0.0);
|
|
36
34
|
gl_Position = project_common_position_to_clipspace(position_commonspace);
|
|
37
35
|
|
|
38
36
|
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
|
|
39
37
|
|
|
40
|
-
|
|
41
|
-
DECKGL_FILTER_COLOR(
|
|
38
|
+
vColor = vec4(triangles.uColor.rgb, triangles.uColor.a * layer.opacity);
|
|
39
|
+
DECKGL_FILTER_COLOR(vColor, geometry);
|
|
42
40
|
}
|
|
43
41
|
`;
|
|
44
42
|
//# sourceMappingURL=triangle.vs.glsl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triangle.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangle.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"triangle.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangle.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCd,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME well-markers-fragment-shader\n\nprecision highp float;\n\nin vec4
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME well-markers-fragment-shader\n\nprecision highp float;\n\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n fragColor = vec4(vColor.rgb * (1.0 / 255.0), vColor.a * (1.0 / 255.0));\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -3,12 +3,12 @@ export default `#version 300 es
|
|
|
3
3
|
|
|
4
4
|
precision highp float;
|
|
5
5
|
|
|
6
|
-
in vec4
|
|
6
|
+
in vec4 vColor;
|
|
7
7
|
|
|
8
8
|
out vec4 fragColor;
|
|
9
9
|
|
|
10
10
|
void main(void) {
|
|
11
|
-
fragColor = vec4(
|
|
11
|
+
fragColor = vec4(vColor.rgb * (1.0 / 255.0), vColor.a * (1.0 / 255.0));
|
|
12
12
|
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
13
13
|
}
|
|
14
14
|
`;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME well-markers-vertex-shader\nprecision highp float;\n\nin vec3 positions;\nin vec3 instancePositions;\nin float instanceSizes;\nin float instanceAzimuths;\nin float instanceInclinations;\nin vec4 instanceColors;\nin vec4 instanceOutlineColors;\nin vec3 instancePickingColors;\n\nout vec4
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME well-markers-vertex-shader\nprecision highp float;\n\nin vec3 positions;\nin vec3 instancePositions;\nin float instanceSizes;\nin float instanceAzimuths;\nin float instanceInclinations;\nin vec4 instanceColors;\nin vec4 instanceOutlineColors;\nin vec3 instancePickingColors;\n\nout vec4 vColor;\n\nvoid main(void) {\n vec3 position = instancePositions;\n position.z *= (wellMarkers.ZIncreasingDownwards? -1.0 : 1.0);\n\n geometry.worldPosition = position;\n geometry.pickingColor = instancePickingColors;\n\n vColor = wellMarkers.useOutlineColor ? instanceOutlineColors : instanceColors;\n\n float sizeInPixels = project_size_to_pixel(instanceSizes, wellMarkers.sizeUnits);\n float projectedSize = project_pixel_size(sizeInPixels);\n\n float sinA = sin (PI / 180.0 * instanceAzimuths);\n float cosA = cos (PI / 180.0 * instanceAzimuths);\n\n float sinI = sin (PI / 180.0 * instanceInclinations);\n float cosI = cos (PI / 180.0 * instanceInclinations);\n\n mat3 azimuthMatrix = mat3(vec3(cosA, sinA, 0.0), vec3(-sinA, cosA, 0.0), vec3(0.0, 0.0, 1.0));\n mat3 inclMatrix = mat3(vec3(1.0, 0.0, 0.0), vec3(0.0, cosI, sinI), vec3(0.0, -sinI, cosI));\n mat3 sizeMatrix = mat3(vec3(projectedSize, 0.0, 0.0), vec3(0.0, projectedSize, 0.0), vec3(0.0, 0.0, 1.0));\n vec3 rotatedPos = azimuthMatrix * inclMatrix * sizeMatrix *positions;\n\n vec4 position_commonspace = vec4(project_position(rotatedPos + position), 0.0);\n gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
2
|
export default _default;
|
|
@@ -11,7 +11,7 @@ in vec4 instanceColors;
|
|
|
11
11
|
in vec4 instanceOutlineColors;
|
|
12
12
|
in vec3 instancePickingColors;
|
|
13
13
|
|
|
14
|
-
out vec4
|
|
14
|
+
out vec4 vColor;
|
|
15
15
|
|
|
16
16
|
void main(void) {
|
|
17
17
|
vec3 position = instancePositions;
|
|
@@ -20,7 +20,7 @@ void main(void) {
|
|
|
20
20
|
geometry.worldPosition = position;
|
|
21
21
|
geometry.pickingColor = instancePickingColors;
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
vColor = wellMarkers.useOutlineColor ? instanceOutlineColors : instanceColors;
|
|
24
24
|
|
|
25
25
|
float sizeInPixels = project_size_to_pixel(instanceSizes, wellMarkers.sizeUnits);
|
|
26
26
|
float projectedSize = project_pixel_size(sizeInPixels);
|
|
@@ -39,10 +39,8 @@ void main(void) {
|
|
|
39
39
|
vec4 position_commonspace = vec4(project_position(rotatedPos + position), 0.0);
|
|
40
40
|
gl_Position = project_common_position_to_clipspace(position_commonspace);
|
|
41
41
|
|
|
42
|
-
vec4 dummyColor = vec4(0.0);
|
|
43
|
-
|
|
44
42
|
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
|
|
45
|
-
DECKGL_FILTER_COLOR(
|
|
43
|
+
DECKGL_FILTER_COLOR(vColor, geometry);
|
|
46
44
|
}
|
|
47
45
|
`;
|
|
48
46
|
//# sourceMappingURL=marker.vs.glsl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/well_markers/marker.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"marker.vs.glsl.js","sourceRoot":"","sources":["../../../src/layers/well_markers/marker.vs.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4Cd,CAAC"}
|