@webviz/subsurface-viewer 1.11.0 → 1.11.2
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/components/Map.js +1 -1
- package/dist/components/Map.js.map +1 -1
- package/dist/extensions/side-projection-extension.d.ts +41 -6
- package/dist/extensions/side-projection-extension.js +33 -27
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/layers/axes/axes-fragment.glsl.d.ts +1 -1
- package/dist/layers/axes/axes-fragment.glsl.js +1 -1
- package/dist/layers/axes/grid-vertex.glsl.d.ts +1 -1
- package/dist/layers/axes/grid-vertex.glsl.js +1 -1
- package/dist/layers/axes2d/axes2DLayer.d.ts +7 -7
- package/dist/layers/axes2d/axes2DLayer.js +62 -14
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/axes2d/label-fragment.glsl.d.ts +1 -1
- package/dist/layers/axes2d/label-fragment.glsl.js +7 -10
- package/dist/layers/axes2d/label-fragment.glsl.js.map +1 -1
- package/dist/layers/axes2d/label-vertex.glsl.d.ts +1 -1
- package/dist/layers/axes2d/label-vertex.glsl.js +1 -1
- package/dist/layers/axes2d/line-fragment.glsl.d.ts +1 -1
- package/dist/layers/axes2d/line-fragment.glsl.js +2 -4
- package/dist/layers/axes2d/line-fragment.glsl.js.map +1 -1
- package/dist/layers/axes2d/line-vertex.glsl.d.ts +1 -1
- package/dist/layers/axes2d/line-vertex.glsl.js +2 -4
- package/dist/layers/axes2d/line-vertex.glsl.js.map +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.d.ts +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.js +2 -5
- package/dist/layers/colormap/colormap.fs.glsl.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.d.ts +3 -2
- package/dist/layers/colormap/colormapLayer.js +81 -25
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/grid3d/cellProperty.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/cellProperty.fs.glsl.js +14 -27
- 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 +2 -4
- package/dist/layers/grid3d/cellProperty.vs.glsl.js.map +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.js +1 -1
- package/dist/layers/grid3d/grid3dLayer.js +2 -0
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/nodeProperty.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/nodeProperty.fs.glsl.js +5 -13
- 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 -7
- package/dist/layers/grid3d/nodeProperty.vs.glsl.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +26 -5
- package/dist/layers/grid3d/privateGrid3dLayer.js +60 -22
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/vertex_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex_lines.glsl.js +2 -4
- package/dist/layers/grid3d/vertex_lines.glsl.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.d.ts +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js +8 -15
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.d.ts +4 -3
- package/dist/layers/hillshading2d/hillshading2dLayer.js +109 -33
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/map/fragment.glsl.d.ts +2 -0
- package/dist/layers/map/{fragment.fs.glsl.js → fragment.glsl.js} +15 -27
- package/dist/layers/map/fragment.glsl.js.map +1 -0
- package/dist/layers/map/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/map/fragment_lines.glsl.js +1 -1
- package/dist/layers/map/mapLayer.d.ts +1 -1
- package/dist/layers/map/mapLayer.js +2 -0
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +7 -9
- package/dist/layers/map/privateMapLayer.js +85 -17
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/vertex.glsl.d.ts +1 -1
- package/dist/layers/map/vertex.glsl.js +3 -5
- package/dist/layers/map/vertex.glsl.js.map +1 -1
- package/dist/layers/map/vertex_lines.glsl.d.ts +1 -1
- package/dist/layers/map/vertex_lines.glsl.js +3 -2
- package/dist/layers/map/vertex_lines.glsl.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.d.ts +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.js +3 -3
- package/dist/layers/northarrow/northArrow3DLayer.js.map +1 -1
- package/dist/layers/northarrow/northarrow-fragment.glsl.d.ts +1 -1
- package/dist/layers/northarrow/northarrow-fragment.glsl.js +1 -1
- package/dist/layers/northarrow/northarrow-vertex.glsl.d.ts +1 -1
- package/dist/layers/northarrow/northarrow-vertex.glsl.js +1 -1
- package/dist/layers/piechart/fragment.glsl.d.ts +1 -1
- package/dist/layers/piechart/fragment.glsl.js +1 -1
- package/dist/layers/piechart/vertex.glsl.d.ts +1 -1
- package/dist/layers/piechart/vertex.glsl.js +1 -1
- package/dist/layers/points/privatePointsLayer.d.ts +1 -9
- package/dist/layers/points/privatePointsLayer.js +32 -5
- package/dist/layers/points/privatePointsLayer.js.map +1 -1
- package/dist/layers/points/vertex.glsl.d.ts +1 -1
- package/dist/layers/points/vertex.glsl.js +13 -28
- package/dist/layers/points/vertex.glsl.js.map +1 -1
- package/dist/layers/polylines/path-layer-fragment.glsl.d.ts +1 -1
- package/dist/layers/polylines/path-layer-fragment.glsl.js +2 -4
- package/dist/layers/polylines/path-layer-fragment.glsl.js.map +1 -1
- package/dist/layers/polylines/path-layer-vertex.glsl.d.ts +1 -1
- package/dist/layers/polylines/path-layer-vertex.glsl.js +10 -22
- package/dist/layers/polylines/path-layer-vertex.glsl.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.d.ts +2 -44
- package/dist/layers/polylines/privatePolylinesLayer.js +34 -4
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/shader_modules/index.d.ts +1 -1
- package/dist/layers/shader_modules/index.js +1 -1
- package/dist/layers/shader_modules/index.js.map +1 -1
- package/dist/layers/shader_modules/phong-lighting/phong-material.d.ts +11 -0
- package/dist/layers/shader_modules/phong-lighting/phong-material.js +38 -0
- package/dist/layers/shader_modules/phong-lighting/phong-material.js.map +1 -0
- package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.d.ts +2 -0
- package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.js +59 -0
- package/dist/layers/shader_modules/phong-lighting/phong-shaders-glsl.js.map +1 -0
- package/dist/layers/triangle/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment.fs.glsl.js +7 -14
- package/dist/layers/triangle/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment_lines.glsl.js +1 -1
- package/dist/layers/triangle/privateTriangleLayer.d.ts +9 -14
- package/dist/layers/triangle/privateTriangleLayer.js +75 -26
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.d.ts +1 -1
- package/dist/layers/triangle/triangleLayer.js +2 -0
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/triangle/vertex.glsl.d.ts +1 -1
- package/dist/layers/triangle/vertex.glsl.js +3 -5
- package/dist/layers/triangle/vertex.glsl.js.map +1 -1
- package/dist/layers/triangle/vertex_lines.glsl.d.ts +1 -1
- package/dist/layers/triangle/vertex_lines.glsl.js +2 -4
- package/dist/layers/triangle/vertex_lines.glsl.js.map +1 -1
- package/dist/layers/utils/layerTools.d.ts +1 -1
- package/dist/layers/utils/layerTools.js +1 -1
- package/dist/layers/utils/layerTools.js.map +1 -1
- package/dist/layers/well_markers/vertex.glsl.d.ts +1 -1
- package/dist/layers/well_markers/vertex.glsl.js +3 -7
- package/dist/layers/well_markers/vertex.glsl.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.d.ts +3 -8
- package/dist/layers/well_markers/wellMarkersLayer.js +49 -16
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/views/intersectionView.d.ts +3 -3
- package/dist/views/intersectionView.js +5 -0
- package/dist/views/intersectionView.js.map +1 -1
- package/package.json +11 -11
- package/dist/layers/map/fragment.fs.glsl.d.ts +0 -2
- package/dist/layers/map/fragment.fs.glsl.js.map +0 -1
- package/dist/layers/shader_modules/lighting.fs.glsl.d.ts +0 -1
- package/dist/layers/shader_modules/lighting.fs.glsl.js +0 -45
- package/dist/layers/shader_modules/lighting.fs.glsl.js.map +0 -1
- package/dist/layers/shader_modules/localPhongLighting.d.ts +0 -23
- package/dist/layers/shader_modules/localPhongLighting.js +0 -8
- package/dist/layers/shader_modules/localPhongLighting.js.map +0 -1
@@ -1,7 +1,8 @@
|
|
1
1
|
import { COORDINATE_SYSTEM, Layer, picking, project32 } from "@deck.gl/core";
|
2
2
|
import { GL } from "@luma.gl/constants";
|
3
3
|
import { Geometry, Model } from "@luma.gl/engine";
|
4
|
-
import {
|
4
|
+
import { lighting } from "@luma.gl/shadertools";
|
5
|
+
import { phongMaterial } from "../shader_modules/phong-lighting/phong-material";
|
5
6
|
import { createPropertyData } from "../utils/layerTools";
|
6
7
|
import fsShader from "./fragment.fs.glsl";
|
7
8
|
import fsLineShader from "./fragment_lines.glsl";
|
@@ -15,7 +16,9 @@ const defaultProps = {
|
|
15
16
|
color: [100, 100, 255],
|
16
17
|
coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
|
17
18
|
depthTest: true,
|
19
|
+
smoothShading: true,
|
18
20
|
ZIncreasingDownwards: true,
|
21
|
+
enableLighting: true,
|
19
22
|
};
|
20
23
|
// This is a private layer used only by the composite TriangleLayer
|
21
24
|
export default class PrivateTriangleLayer extends Layer {
|
@@ -23,6 +26,9 @@ export default class PrivateTriangleLayer extends Layer {
|
|
23
26
|
var _a;
|
24
27
|
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
25
28
|
}
|
29
|
+
setShaderModuleProps(args) {
|
30
|
+
super.setShaderModuleProps(Object.assign(Object.assign({}, args), { lighting: Object.assign(Object.assign({}, args["lighting"]), { enabled: this.props.enableLighting }) }));
|
31
|
+
}
|
26
32
|
initializeState(context) {
|
27
33
|
const gl = context.device;
|
28
34
|
const [triangleModel, lineModel] = this._getModels(gl);
|
@@ -44,55 +50,60 @@ export default class PrivateTriangleLayer extends Layer {
|
|
44
50
|
id: `${this.props.id}-mesh`,
|
45
51
|
vs: vsShader,
|
46
52
|
fs: fsShader,
|
53
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
47
54
|
geometry: new Geometry(this.props.geometryTriangles),
|
48
|
-
modules: [
|
55
|
+
modules: [
|
56
|
+
project32,
|
57
|
+
picking,
|
58
|
+
lighting,
|
59
|
+
phongMaterial,
|
60
|
+
trianglesUniforms,
|
61
|
+
],
|
49
62
|
isInstanced: false, // This only works when set to false.
|
50
63
|
});
|
51
64
|
const lineModel = new Model(device, {
|
52
65
|
id: `${this.props.id}-lines`,
|
53
66
|
vs: vsLineShader,
|
54
67
|
fs: fsLineShader,
|
68
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
55
69
|
geometry: new Geometry(this.props.geometryLines),
|
56
|
-
modules: [project32, picking],
|
70
|
+
modules: [project32, picking, triangleMeshUniforms],
|
57
71
|
isInstanced: false,
|
58
72
|
});
|
59
73
|
return [triangleModel, lineModel];
|
60
74
|
}
|
75
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
61
76
|
draw(args) {
|
62
|
-
var _a, _b;
|
77
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
63
78
|
if (!this.state["models"]) {
|
64
79
|
return;
|
65
80
|
}
|
66
|
-
const {
|
67
|
-
const { gl } = context;
|
68
|
-
const contourReferencePoint = (_a = this.props.contours[0]) !== null && _a !== void 0 ? _a : -1.0;
|
69
|
-
const contourInterval = (_b = this.props.contours[1]) !== null && _b !== void 0 ? _b : -1.0;
|
81
|
+
const { gl } = args.context;
|
70
82
|
const [triangleModel, lineModel] = this.state["models"];
|
71
|
-
const smoothShading = this.props.smoothShading;
|
72
|
-
// Normalize to [0,1] range.
|
73
|
-
const uColor = this.props.color.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
|
74
|
-
uColor.push(1); // alpha channel.
|
75
83
|
if (!this.props.depthTest) {
|
76
84
|
gl.disable(GL.DEPTH_TEST);
|
77
85
|
}
|
78
86
|
gl.enable(GL.POLYGON_OFFSET_FILL);
|
79
87
|
gl.polygonOffset(1, 1);
|
80
|
-
triangleModel.
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
88
|
+
triangleModel.shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { triangles: {
|
89
|
+
isContoursDepth: defaultProps.isContoursDepth,
|
90
|
+
contourReferencePoint: (_b = (_a = this.props.contours) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : defaultProps.contours[0],
|
91
|
+
contourInterval: (_d = (_c = this.props.contours) === null || _c === void 0 ? void 0 : _c[1]) !== null && _d !== void 0 ? _d : defaultProps.contours[1],
|
92
|
+
// Normalize to [0,1] range.
|
93
|
+
uColor: [
|
94
|
+
...((_e = this.props.color) !== null && _e !== void 0 ? _e : defaultProps.color).map((x) => (x !== null && x !== void 0 ? x : 0) / 255),
|
95
|
+
1 /* alpha channel */,
|
96
|
+
],
|
97
|
+
smoothShading: (_f = this.props.smoothShading) !== null && _f !== void 0 ? _f : defaultProps.smoothShading,
|
98
|
+
ZIncreasingDownwards: (_g = this.props.ZIncreasingDownwards) !== null && _g !== void 0 ? _g : defaultProps.ZIncreasingDownwards,
|
99
|
+
} }));
|
100
|
+
triangleModel.draw(args.context.renderPass);
|
89
101
|
gl.disable(GL.POLYGON_OFFSET_FILL);
|
90
102
|
if (this.props.gridLines) {
|
91
|
-
lineModel.
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
lineModel.draw(context.renderPass);
|
103
|
+
lineModel.shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { triangleMesh: {
|
104
|
+
ZIncreasingDownwards: (_h = this.props.ZIncreasingDownwards) !== null && _h !== void 0 ? _h : defaultProps.ZIncreasingDownwards,
|
105
|
+
} }));
|
106
|
+
lineModel.draw(args.context.renderPass);
|
96
107
|
}
|
97
108
|
if (!this.props.depthTest) {
|
98
109
|
gl.enable(GL.DEPTH_TEST);
|
@@ -122,4 +133,42 @@ export default class PrivateTriangleLayer extends Layer {
|
|
122
133
|
}
|
123
134
|
PrivateTriangleLayer.layerName = "privateTriangleLayer";
|
124
135
|
PrivateTriangleLayer.defaultProps = defaultProps;
|
136
|
+
const triangleMeshUniformsBlock = `\
|
137
|
+
uniform triangleMeshUniforms {
|
138
|
+
uniform bool ZIncreasingDownwards;
|
139
|
+
} triangleMesh;
|
140
|
+
`;
|
141
|
+
// NOTE: this must exactly the same name than in the uniform block
|
142
|
+
const triangleMeshUniforms = {
|
143
|
+
name: "triangleMesh",
|
144
|
+
vs: triangleMeshUniformsBlock,
|
145
|
+
fs: undefined,
|
146
|
+
uniformTypes: {
|
147
|
+
ZIncreasingDownwards: "f32",
|
148
|
+
},
|
149
|
+
};
|
150
|
+
const triangleUniformsBlock = /*glsl*/ `\
|
151
|
+
uniform trianglesUniforms {
|
152
|
+
uniform bool isContoursDepth;
|
153
|
+
uniform float contourReferencePoint;
|
154
|
+
uniform float contourInterval;
|
155
|
+
uniform vec4 uColor;
|
156
|
+
uniform bool smoothShading;
|
157
|
+
uniform bool ZIncreasingDownwards;
|
158
|
+
} triangles;
|
159
|
+
`;
|
160
|
+
// NOTE: this must exactly the same name than in the uniform block
|
161
|
+
const trianglesUniforms = {
|
162
|
+
name: "triangles",
|
163
|
+
vs: triangleUniformsBlock,
|
164
|
+
fs: triangleUniformsBlock,
|
165
|
+
uniformTypes: {
|
166
|
+
isContoursDepth: "u32",
|
167
|
+
contourReferencePoint: "f32",
|
168
|
+
contourInterval: "f32",
|
169
|
+
uColor: "vec4<f32>",
|
170
|
+
smoothShading: "u32",
|
171
|
+
ZIncreasingDownwards: "u32",
|
172
|
+
},
|
173
|
+
};
|
125
174
|
//# sourceMappingURL=privateTriangleLayer.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"privateTriangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/privateTriangleLayer.ts"],"names":[],"mappings":"
|
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,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAkC/C,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,EAAE;YACpC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO;YAC3B,EAAE,EAAE,QAAQ;YACZ,EAAE,EAAE,QAAQ;YACZ,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAG,CAAC,gBAAgB,EAAE;YAC5D,QAAQ,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;YACpD,OAAO,EAAE;gBACL,SAAS;gBACT,OAAO;gBACP,QAAQ;gBACR,aAAa;gBACb,iBAAiB;aACpB;YACD,WAAW,EAAE,KAAK,EAAE,qCAAqC;SAC5D,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE;YAChC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ;YAC5B,EAAE,EAAE,YAAY;YAChB,EAAE,EAAE,YAAY;YAChB,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAG,CAAC,gBAAgB,EAAE;YAC5D,QAAQ,EAAE,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;YAChD,OAAO,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC;YACnD,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,IAAS;;QACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAE5B,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAY,CAAC;QAEnE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC9B,CAAC;QACD,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAClC,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,aAAa,CAAC,YAAY,CAAC,QAAQ,iCAC5B,IAAI,CAAC,QAAQ,KAChB,SAAS,EAAE;gBACP,eAAe,EAAE,YAAY,CAAC,eAAe;gBAC7C,qBAAqB,EACjB,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,0CAAG,CAAC,CAAC,mCAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACxD,eAAe,EACX,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,0CAAG,CAAC,CAAC,mCAAI,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACxD,4BAA4B;gBAC5B,MAAM,EAAE;oBACJ,GAAG,CAAC,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,mCAAI,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAC3C,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,CAAC,CAAC,GAAG,GAAG,CAChC;oBACD,CAAC,CAAC,mBAAmB;iBACY;gBACrC,aAAa,EACT,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,mCAAI,YAAY,CAAC,aAAa;gBAC1D,oBAAoB,EAChB,MAAA,IAAI,CAAC,KAAK,CAAC,oBAAoB,mCAC/B,YAAY,CAAC,oBAAoB;aACxC,IACH,CAAC;QAEH,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE5C,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;QAEnC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACvB,SAAS,CAAC,YAAY,CAAC,QAAQ,iCACxB,IAAI,CAAC,QAAQ,KAChB,YAAY,EAAE;oBACV,oBAAoB,EAChB,MAAA,IAAI,CAAC,KAAK,CAAC,oBAAoB,mCAC/B,YAAY,CAAC,oBAAoB;iBACxC,IACH,CAAC;YACH,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACxB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,iCAAM,IAAI,CAAC,KAAK,KAAE,QAAQ,EAAE,IAAI,IAAG,CAAC;QACrD,CAAC;IACL,CAAC;IAED,kBAAkB;QACd,OAAO,CAAC,CAAC;IACb,CAAC;IAED,cAAc,CAAC,EAAE,IAAI,EAAyB;;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,gBAAgB,GAAuB,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,OAAO,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAG,CAAC,CAAC,CAAA,KAAK,WAAW,EAAE,CAAC;YAC9C,MAAM,KAAK,GACP,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB;gBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACxD,gBAAgB,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,uCACO,IAAI,KACP,UAAU,EAAE,gBAAgB,IAC9B;IACN,CAAC;CACJ;AAED,oBAAoB,CAAC,SAAS,GAAG,sBAAsB,CAAC;AACxD,oBAAoB,CAAC,YAAY,GAAG,YAAY,CAAC;AAEjD,MAAM,yBAAyB,GAAG;;;;CAIjC,CAAC;AAIF,kEAAkE;AAClE,MAAM,oBAAoB,GAAG;IACzB,IAAI,EAAE,cAAc;IACpB,EAAE,EAAE,yBAAyB;IAC7B,EAAE,EAAE,SAAS;IACb,YAAY,EAAE;QACV,oBAAoB,EAAE,KAAK;KAC9B;CACkE,CAAC;AAExE,MAAM,qBAAqB,GAAG,QAAQ,CAAC;;;;;;;;;CAStC,CAAC;AAWF,kEAAkE;AAClE,MAAM,iBAAiB,GAAG;IACtB,IAAI,EAAE,WAAW;IACjB,EAAE,EAAE,qBAAqB;IACzB,EAAE,EAAE,qBAAqB;IACzB,YAAY,EAAE;QACV,eAAe,EAAE,KAAK;QACtB,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,KAAK;QACtB,MAAM,EAAE,WAAW;QACnB,aAAa,EAAE,KAAK;QACpB,oBAAoB,EAAE,KAAK;KAC9B;CAC8D,CAAC"}
|
@@ -3,7 +3,7 @@ import type { UpdateParameters } from "@deck.gl/core";
|
|
3
3
|
import { CompositeLayer } from "@deck.gl/core";
|
4
4
|
import type { ReportBoundingBoxAction } from "../../components/Map";
|
5
5
|
import type { ExtendedLayerProps } from "../utils/layerTools";
|
6
|
-
import type { Material } from "
|
6
|
+
import type { Material } from "@deck.gl/core";
|
7
7
|
import PrivateTriangleLayer from "./privateTriangleLayer";
|
8
8
|
export type Params = {
|
9
9
|
vertexArray: Float32Array;
|
@@ -173,6 +173,7 @@ export default class TriangleLayer extends CompositeLayer {
|
|
173
173
|
// isFinishedLoading only in state
|
174
174
|
return [];
|
175
175
|
}
|
176
|
+
const enableLighting = !(this.props.material === false);
|
176
177
|
const layer = new PrivateTriangleLayer(this.getSubLayerProps({
|
177
178
|
geometryTriangles: this.state["geometryTriangles"],
|
178
179
|
geometryLines: this.state["geometryLines"],
|
@@ -184,6 +185,7 @@ export default class TriangleLayer extends CompositeLayer {
|
|
184
185
|
smoothShading: this.props.smoothShading,
|
185
186
|
depthTest: this.props.depthTest,
|
186
187
|
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
188
|
+
enableLighting,
|
187
189
|
}));
|
188
190
|
return [layer];
|
189
191
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"triangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangleLayer.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"triangleLayer.js","sourceRoot":"","sources":["../../../src/layers/triangle/triangleLayer.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const vsShader = "#version 300 es\n#define SHADER_NAME 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 vec3 worldPos;\nout float property;\n\
|
1
|
+
declare const vsShader = "#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 vec3 worldPos;\nout float property;\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 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 vec4 color = vec4(0.0);\n DECKGL_FILTER_COLOR(color, geometry);\n}\n";
|
2
2
|
export default vsShader;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
const vsShader = `\
|
2
2
|
#version 300 es
|
3
|
-
#define SHADER_NAME vertex-shader
|
3
|
+
#define SHADER_NAME triangle-vertex-shader
|
4
4
|
|
5
5
|
precision highp float;
|
6
6
|
|
@@ -16,17 +16,15 @@ out vec4 position_commonspace;
|
|
16
16
|
out vec3 worldPos;
|
17
17
|
out float property;
|
18
18
|
|
19
|
-
uniform bool ZIncreasingDownwards;
|
20
|
-
|
21
19
|
const vec3 pickingColor = vec3(1.0, 1.0, 0.0);
|
22
20
|
|
23
21
|
void main(void) {
|
24
22
|
geometry.pickingColor = pickingColor;
|
25
23
|
|
26
|
-
cameraPosition =
|
24
|
+
cameraPosition = project.cameraPosition;
|
27
25
|
|
28
26
|
vec3 position = positions;
|
29
|
-
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
27
|
+
position[2] *= triangles.ZIncreasingDownwards ? -1.0 : 1.0;
|
30
28
|
|
31
29
|
worldPos = position;
|
32
30
|
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
1
|
+
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0ChB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME
|
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 position_commonspace;\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";
|
2
2
|
export default _default;
|
@@ -1,6 +1,6 @@
|
|
1
1
|
export default `\
|
2
2
|
#version 300 es
|
3
|
-
#define SHADER_NAME
|
3
|
+
#define SHADER_NAME triangle-lines-vertex-shader
|
4
4
|
|
5
5
|
precision highp float;
|
6
6
|
|
@@ -8,11 +8,9 @@ in vec3 positions;
|
|
8
8
|
|
9
9
|
out vec4 position_commonspace;
|
10
10
|
|
11
|
-
uniform bool ZIncreasingDownwards;
|
12
|
-
|
13
11
|
void main(void) {
|
14
12
|
vec3 position = positions;
|
15
|
-
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
13
|
+
position[2] *= triangleMesh.ZIncreasingDownwards ? -1.0 : 1.0;
|
16
14
|
|
17
15
|
vec3 position_commonspace = project_position(position);
|
18
16
|
gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
1
|
+
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/triangle/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;CAiBd,CAAC"}
|
@@ -66,5 +66,5 @@ export declare function defineBoundingBox(dataArray: Float32Array, zIncreasingDo
|
|
66
66
|
* @param discreteColormapFunction If true, the color map function is targeting indices ranging from 0 to colormapSize.
|
67
67
|
* @returns Array of colors.
|
68
68
|
*/
|
69
|
-
export declare function getImageData(colorMapName: string, colorTables: colorTablesArray, colorMapFunction: ColorMapFunctionType | undefined, colormapSize?: number, discreteColormapFunction?: boolean):
|
69
|
+
export declare function getImageData(colorMapName: string, colorTables: colorTablesArray, colorMapFunction: ColorMapFunctionType | undefined, colormapSize?: number, discreteColormapFunction?: boolean): Uint8Array;
|
70
70
|
export {};
|
@@ -133,6 +133,6 @@ export function getImageData(colorMapName, colorTables, colorMapFunction, colorm
|
|
133
133
|
data[3 * i + 2] = color[2];
|
134
134
|
}
|
135
135
|
}
|
136
|
-
return data ? data : [0, 0, 0];
|
136
|
+
return data ? data : new Uint8Array([0, 0, 0]);
|
137
137
|
}
|
138
138
|
//# sourceMappingURL=layerTools.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"layerTools.js","sourceRoot":"","sources":["../../../src/layers/utils/layerTools.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"layerTools.js","sourceRoot":"","sources":["../../../src/layers/utils/layerTools.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
export declare const vsShader = "#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\
|
1
|
+
export declare const vsShader = "#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 color;\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 color = 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 vec4 dummyColor = vec4(0.0);\n\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n DECKGL_FILTER_COLOR(dummyColor, geometry);\n}\n";
|
@@ -11,22 +11,18 @@ in vec4 instanceColors;
|
|
11
11
|
in vec4 instanceOutlineColors;
|
12
12
|
in vec3 instancePickingColors;
|
13
13
|
|
14
|
-
uniform int sizeUnits;
|
15
|
-
uniform bool ZIncreasingDownwards;
|
16
|
-
uniform bool useOutlineColor;
|
17
|
-
|
18
14
|
out vec4 color;
|
19
15
|
|
20
16
|
void main(void) {
|
21
17
|
vec3 position = instancePositions;
|
22
|
-
position.z *= (ZIncreasingDownwards? -1.0 : 1.0);
|
18
|
+
position.z *= (wellMarkers.ZIncreasingDownwards? -1.0 : 1.0);
|
23
19
|
|
24
20
|
geometry.worldPosition = position;
|
25
21
|
geometry.pickingColor = instancePickingColors;
|
26
22
|
|
27
|
-
color = useOutlineColor ? instanceOutlineColors : instanceColors;
|
23
|
+
color = wellMarkers.useOutlineColor ? instanceOutlineColors : instanceColors;
|
28
24
|
|
29
|
-
float sizeInPixels = project_size_to_pixel(instanceSizes, sizeUnits);
|
25
|
+
float sizeInPixels = project_size_to_pixel(instanceSizes, wellMarkers.sizeUnits);
|
30
26
|
float projectedSize = project_pixel_size(sizeInPixels);
|
31
27
|
|
32
28
|
float sinA = sin (PI / 180.0 * instanceAzimuths);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/well_markers/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG
|
1
|
+
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/well_markers/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8CvB,CAAC"}
|
@@ -1,9 +1,8 @@
|
|
1
1
|
import { Model } from "@luma.gl/engine";
|
2
|
-
import type { Accessor, Color,
|
2
|
+
import type { Accessor, Color, Position, PickingInfo, UpdateParameters, Unit } from "@deck.gl/core";
|
3
3
|
import { Layer } from "@deck.gl/core";
|
4
|
-
import type { UniformValue } from "@luma.gl/core";
|
5
4
|
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
6
|
-
export type WellMarkersLayerProps = _WellMarkersLayerProps
|
5
|
+
export type WellMarkersLayerProps = _WellMarkersLayerProps;
|
7
6
|
/**
|
8
7
|
* Input data of the layer.
|
9
8
|
*/
|
@@ -80,11 +79,7 @@ export default class WellMarkersLayer extends Layer<WellMarkersLayerProps> {
|
|
80
79
|
initializeState(): void;
|
81
80
|
updateState(params: UpdateParameters<Layer<WellMarkersLayerProps>>): void;
|
82
81
|
getModels(): Model[];
|
83
|
-
draw(args:
|
84
|
-
moduleParameters?: unknown;
|
85
|
-
uniforms: Record<string, UniformValue>;
|
86
|
-
context: LayerContext;
|
87
|
-
}): void;
|
82
|
+
draw(args: any): void;
|
88
83
|
getPickingInfo({ info }: {
|
89
84
|
info: PickingInfo;
|
90
85
|
}): LayerPickInfo;
|
@@ -1,4 +1,3 @@
|
|
1
|
-
//import { GL } from "@luma.gl/constants";
|
2
1
|
import { Geometry, Model } from "@luma.gl/engine";
|
3
2
|
import { Layer, project, picking, UNIT } from "@deck.gl/core";
|
4
3
|
import { createPropertyData } from "../utils/layerTools";
|
@@ -146,18 +145,26 @@ export default class WellMarkersLayer extends Layer {
|
|
146
145
|
}
|
147
146
|
return [];
|
148
147
|
}
|
148
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
149
149
|
draw(args) {
|
150
150
|
if (!this.state["shapeModel"]) {
|
151
151
|
return;
|
152
152
|
}
|
153
|
-
const { uniforms } = args;
|
154
153
|
const models = this.getModels();
|
155
154
|
if (models.length && models.length < 2) {
|
156
155
|
return;
|
157
156
|
}
|
158
|
-
models[0].
|
157
|
+
models[0].shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { wellMarkers: {
|
158
|
+
useOutlineColor: false,
|
159
|
+
sizeUnits: UNIT[this.props.sizeUnits],
|
160
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
161
|
+
} }));
|
159
162
|
models[0].draw(args.context.renderPass);
|
160
|
-
models[1].
|
163
|
+
models[1].shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { wellMarkers: {
|
164
|
+
useOutlineColor: true,
|
165
|
+
sizeUnits: UNIT[this.props.sizeUnits],
|
166
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
167
|
+
} }));
|
161
168
|
models[1].draw(args.context.renderPass);
|
162
169
|
}
|
163
170
|
getPickingInfo({ info }) {
|
@@ -183,14 +190,18 @@ export default class WellMarkersLayer extends Layer {
|
|
183
190
|
return super.getShaders({
|
184
191
|
vs: vsShader,
|
185
192
|
fs: fsShader,
|
186
|
-
modules: [project, picking, utilities],
|
193
|
+
modules: [project, picking, utilities, wellMarkersUniforms],
|
187
194
|
});
|
188
195
|
}
|
189
196
|
initShapes() {
|
190
197
|
const triangle_positions = [
|
191
198
|
-1.0, -1.0, 0.0, 1.0, -1.0, 0.0, 0.0, 1.0, 0.0,
|
192
199
|
];
|
193
|
-
const
|
200
|
+
const triangle_outline = [
|
201
|
+
-1.0, -1.0, 0.0, 1.0, -1.0, 0.0, 0.0, 1.0, 0.0, -1.0, -1.0, 0.0,
|
202
|
+
];
|
203
|
+
const circle_positions = [];
|
204
|
+
const circle_outline = [];
|
194
205
|
const N = 32;
|
195
206
|
const R = 1.0;
|
196
207
|
for (let i = 0; i <= N; ++i) {
|
@@ -198,22 +209,30 @@ export default class WellMarkersLayer extends Layer {
|
|
198
209
|
circle_positions.push(R * Math.cos(angle));
|
199
210
|
circle_positions.push(R * Math.sin(angle));
|
200
211
|
circle_positions.push(0.0);
|
212
|
+
// push center again to represent a circle with a triangle strip
|
213
|
+
circle_positions.push(0.0);
|
214
|
+
circle_positions.push(0.0);
|
215
|
+
circle_positions.push(0.0);
|
216
|
+
circle_outline.push(R * Math.cos(angle));
|
217
|
+
circle_outline.push(R * Math.sin(angle));
|
218
|
+
circle_outline.push(0.0);
|
201
219
|
}
|
202
220
|
const square_positions = [
|
203
221
|
-1.0, 1.0, 0.0, 1.0, 1.0, 0.0, -1.0, -1.0, 0.0, 1.0, -1.0, 0.0,
|
204
222
|
];
|
205
223
|
const square_outline = [
|
206
224
|
-1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, -1.0, 0.0, -1.0, -1.0, 0.0,
|
225
|
+
-1.0, 1.0, 0.0,
|
207
226
|
];
|
208
227
|
this.shapes.set("triangle", {
|
209
228
|
drawMode: "triangle-list",
|
210
229
|
positions: new Float32Array(triangle_positions),
|
211
|
-
outline: new Float32Array(
|
230
|
+
outline: new Float32Array(triangle_outline),
|
212
231
|
});
|
213
232
|
this.shapes.set("circle", {
|
214
|
-
drawMode: "triangle-
|
233
|
+
drawMode: "triangle-strip",
|
215
234
|
positions: new Float32Array(circle_positions),
|
216
|
-
outline: new Float32Array(
|
235
|
+
outline: new Float32Array(circle_outline),
|
217
236
|
});
|
218
237
|
this.shapes.set("square", {
|
219
238
|
drawMode: "triangle-strip",
|
@@ -233,17 +252,13 @@ export default class WellMarkersLayer extends Layer {
|
|
233
252
|
attributes: {
|
234
253
|
positions: { size: 3, value: shape.positions },
|
235
254
|
},
|
236
|
-
}),
|
237
|
-
useOutlineColor: false,
|
238
|
-
}, isInstanced: true, instanceCount: this.getNumInstances() }));
|
255
|
+
}), isInstanced: true, instanceCount: this.getNumInstances() }));
|
239
256
|
const outlineModel = new Model(device, Object.assign(Object.assign({ id: `${this.props.id}-outline` }, shaders), { bufferLayout: this.getAttributeManager().getBufferLayouts(), geometry: new Geometry({
|
240
|
-
topology: "line-
|
257
|
+
topology: "line-strip",
|
241
258
|
attributes: {
|
242
259
|
positions: { size: 3, value: shape.outline },
|
243
260
|
},
|
244
|
-
}),
|
245
|
-
useOutlineColor: true,
|
246
|
-
}, isInstanced: true, instanceCount: this.getNumInstances() }));
|
261
|
+
}), isInstanced: true, instanceCount: this.getNumInstances() }));
|
247
262
|
return [shapeModel, outlineModel];
|
248
263
|
}
|
249
264
|
_createEmptyModels() {
|
@@ -265,6 +280,24 @@ export default class WellMarkersLayer extends Layer {
|
|
265
280
|
];
|
266
281
|
}
|
267
282
|
}
|
283
|
+
const wellMarkersUniformsBlock = /*glsl*/ `\
|
284
|
+
uniform wellMarkersUniforms {
|
285
|
+
int sizeUnits;
|
286
|
+
bool useOutlineColor;
|
287
|
+
bool ZIncreasingDownwards;
|
288
|
+
} wellMarkers;
|
289
|
+
`;
|
290
|
+
// NOTE: this must exactly the same name than in the uniform block
|
291
|
+
const wellMarkersUniforms = {
|
292
|
+
name: "wellMarkers",
|
293
|
+
vs: wellMarkersUniformsBlock,
|
294
|
+
fs: undefined,
|
295
|
+
uniformTypes: {
|
296
|
+
sizeUnits: "f32",
|
297
|
+
useOutlineColor: "u32",
|
298
|
+
ZIncreasingDownwards: "u32",
|
299
|
+
},
|
300
|
+
};
|
268
301
|
WellMarkersLayer.layerName = "WellMarkersLayer";
|
269
302
|
WellMarkersLayer.defaultProps = defaultProps;
|
270
303
|
//# sourceMappingURL=wellMarkersLayer.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"wellMarkersLayer.js","sourceRoot":"","sources":["../../../src/layers/well_markers/wellMarkersLayer.ts"],"names":[],"mappings":"AAAA,
|
1
|
+
{"version":3,"file":"wellMarkersLayer.js","sourceRoot":"","sources":["../../../src/layers/well_markers/wellMarkersLayer.ts"],"names":[],"mappings":"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"}
|