@webviz/subsurface-viewer 0.4.1 → 0.4.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/layers/grid3d/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.js +1 -23
- package/dist/layers/grid3d/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.js +6 -15
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateLayer.d.ts +1 -0
- package/dist/layers/grid3d/privateLayer.js +13 -7
- package/dist/layers/grid3d/privateLayer.js.map +1 -1
- package/dist/layers/grid3d/vertex.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex.glsl.js +9 -4
- package/dist/layers/grid3d/vertex.glsl.js.map +1 -1
- package/dist/layers/grid3d/vertex_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex_lines.glsl.js +6 -1
- package/dist/layers/grid3d/vertex_lines.glsl.js.map +1 -1
- package/dist/layers/shader_modules/index.d.ts +1 -0
- package/dist/layers/shader_modules/index.js +1 -0
- package/dist/layers/shader_modules/index.js.map +1 -1
- package/dist/layers/shader_modules/utilities.d.ts +4 -0
- package/dist/layers/shader_modules/utilities.js +26 -0
- package/dist/layers/shader_modules/utilities.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-fragment-shader\n\nprecision highp float;\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nin float property;\n\nflat in int vertexIndex;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\n\
|
|
1
|
+
declare const fsShader = "#version 300 es\n#define SHADER_NAME grid3d-fragment-shader\n\nprecision highp float;\n\nin vec3 cameraPosition;\nin vec4 position_commonspace;\nin float property;\n\nflat in int vertexIndex;\n\nuniform sampler2D colormap;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\n\n\nvoid main(void) {\n\n if (picking_uActive && !picking_uAttribute) {\n gl_FragColor = encodeVertexIndexToRGB(vertexIndex); \n return;\n }\n\n vec3 normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n \n // Calculate color from propertyValue using colormap.\n vec4 color = vec4(1.0, 1.0, 1.0, 1.0);\n float propertyValue = property;\n float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n if (x < 0.0 || x > 1.0) {\n // Out of range. Use clampcolor.\n if (isClampColor) {\n color = vec4(colorMapClampColor.rgb, 1.0);\n\n }\n else if (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 color = texture2D(colormap, vec2(x, 0.5));\n }\n }\n else {\n color = texture2D(colormap, vec2(x, 0.5));\n }\n\n // Use normal lighting. This has no effect if \"material\" property is not set.\n vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n gl_FragColor = vec4(lightColor, 1.0); \n DECKGL_FILTER_COLOR(gl_FragColor, geometry);\n}\n";
|
|
2
2
|
export default fsShader;
|
|
@@ -20,33 +20,11 @@ uniform vec3 colorMapClampColor;
|
|
|
20
20
|
uniform bool isClampColor;
|
|
21
21
|
uniform bool isColorMapClampColorTransparent;
|
|
22
22
|
|
|
23
|
-
vec4 encodeVertexIndexToRGB () {
|
|
24
|
-
|
|
25
|
-
float r = 0.0;
|
|
26
|
-
float g = 0.0;
|
|
27
|
-
float b = 0.0;
|
|
28
|
-
|
|
29
|
-
int idx = vertexIndex;
|
|
30
|
-
|
|
31
|
-
if (idx >= (256 * 256) - 1) {
|
|
32
|
-
r = floor(float(idx) / (256.0 * 256.0));
|
|
33
|
-
idx -= int(r * (256.0 * 256.0));
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
if (idx >= 256 - 1) {
|
|
37
|
-
g = floor(float(idx) / 256.0);
|
|
38
|
-
idx -= int(g * 256.0);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
b = float(idx);
|
|
42
|
-
|
|
43
|
-
return vec4(r / 255.0, g / 255.0, b / 255.0, 1.0);
|
|
44
|
-
}
|
|
45
23
|
|
|
46
24
|
void main(void) {
|
|
47
25
|
|
|
48
26
|
if (picking_uActive && !picking_uAttribute) {
|
|
49
|
-
gl_FragColor = encodeVertexIndexToRGB
|
|
27
|
+
gl_FragColor = encodeVertexIndexToRGB(vertexIndex);
|
|
50
28
|
return;
|
|
51
29
|
}
|
|
52
30
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import { CompositeLayer } from "@deck.gl/core/typed";
|
|
11
11
|
import privateLayer from "./privateLayer";
|
|
12
12
|
import { makeFullMesh } from "./webworker";
|
|
13
|
-
import { isEqual } from "lodash";
|
|
14
13
|
import { load, JSONLoader } from "@loaders.gl/core";
|
|
15
14
|
function GetBBox(points) {
|
|
16
15
|
let xmax = -99999999;
|
|
@@ -67,15 +66,6 @@ function load_data(pointsData, polysData, propertiesData) {
|
|
|
67
66
|
return Promise.all([points, polys, properties]);
|
|
68
67
|
});
|
|
69
68
|
}
|
|
70
|
-
function applyZIncrasingDownward(data, zDownward) {
|
|
71
|
-
if (!zDownward) {
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
|
-
const count = data.length / 3;
|
|
75
|
-
for (let i = 0; i < count; ++i) {
|
|
76
|
-
data[i * 3 + 2] *= -1;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
69
|
const defaultProps = {
|
|
80
70
|
"@@type": "Grid3DLayer",
|
|
81
71
|
name: "Grid 3D",
|
|
@@ -101,7 +91,6 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
101
91
|
rebuildData(reportBoundingBox) {
|
|
102
92
|
const p = load_data(this.props.pointsData, this.props.polysData, this.props.propertiesData);
|
|
103
93
|
p.then(([points, polys, properties]) => {
|
|
104
|
-
applyZIncrasingDownward(points, this.props.ZIncreasingDownwards);
|
|
105
94
|
const bbox = GetBBox(points);
|
|
106
95
|
// Using inline web worker for calculating the triangle mesh from
|
|
107
96
|
// loaded input data so not to halt the GUI thread.
|
|
@@ -145,10 +134,11 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
145
134
|
this.rebuildData(reportBoundingBox);
|
|
146
135
|
}
|
|
147
136
|
updateState({ props, oldProps, }) {
|
|
148
|
-
const needs_reload =
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
137
|
+
const needs_reload = props.pointsData !== oldProps.pointsData ||
|
|
138
|
+
props.polysData !== oldProps.polysData ||
|
|
139
|
+
props.propertiesData !== oldProps.propertiesData ||
|
|
140
|
+
props.gridLines !== oldProps.gridLines ||
|
|
141
|
+
props.ZIncreasingDownwards !== oldProps.ZIncreasingDownwards;
|
|
152
142
|
if (needs_reload) {
|
|
153
143
|
this.setState(Object.assign(Object.assign({}, this.state), { isFinishedLoading: false }));
|
|
154
144
|
const reportBoundingBox = false;
|
|
@@ -172,6 +162,7 @@ export default class Grid3DLayer extends CompositeLayer {
|
|
|
172
162
|
propertyValueRange: this.state["propertyValueRange"],
|
|
173
163
|
material: this.props.material,
|
|
174
164
|
depthTest: this.props.depthTest,
|
|
165
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
|
175
166
|
}));
|
|
176
167
|
return [layer];
|
|
177
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAK1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"grid3dLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/grid3dLayer.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAK1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQpD,SAAS,OAAO,CACZ,MAAoB;IAEpB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;IAErB,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,QAAQ,CAAC;IACpB,IAAI,IAAI,GAAG,QAAQ,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACxC,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3D,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAC9D;IACD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,SAAe,eAAe,CAC1B,IAAsC;;QAEtC,IAAI,IAAI,YAAY,YAAY,EAAE;YAC9B,OAAO,IAAI,CAAC;SACf;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAc,EAAE,UAAU,CAAC,CAAC;YAC1D,OAAO,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;SACvC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACzE,CAAC;CAAA;AAED,SAAe,cAAc,CACzB,IAAqC;;QAErC,IAAI,IAAI,YAAY,WAAW,EAAE;YAC7B,OAAO,IAAI,CAAC;SACf;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC;SAChC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAc,EAAE,UAAU,CAAC,CAAC;YAC1D,OAAO,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;SACtC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,6CAA6C,CAAC,CAAC;IACzE,CAAC;CAAA;AAED,SAAe,SAAS,CACpB,UAA4C,EAC5C,SAA0C,EAC1C,cAAgD;;QAEhD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,CAAC;QACzD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;IACpD,CAAC;CAAA;AA4ED,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,SAAS;IACf,EAAE,EAAE,eAAe;IACnB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IACd,YAAY,EAAE,EAAE;IAChB,SAAS,EAAE,IAAI;IACf,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;IAC9B,SAAS,EAAE,IAAI;IACf,oBAAoB,EAAE,IAAI;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,cAAgC;IACrE,IAAI,QAAQ;;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,MAAM,QAAQ,GACV,KAAK,CAAC,QAAQ;YACd,SAAS,CAAC,MAAM,GAAG,CAAC;YACpB,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,0CAAG,mBAAmB,CAAC,mCAAI,KAAK,CAAC;QAC9D,OAAO,QAAQ,IAAI,UAAU,CAAC;IAClC,CAAC;IAED,WAAW,CAAC,iBAA0B;QAClC,MAAM,CAAC,GAAG,SAAS,CACf,IAAI,CAAC,KAAK,CAAC,UAAU,EACrB,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,cAAc,CAC5B,CAAC;QAEF,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE;YACnC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAE7B,iEAAiE;YACjE,mDAAmD;YACnD,MAAM,IAAI,GAAG,IAAI,IAAI,CACjB,CAAC,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,EAC9C,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAC9B,CAAC;YACF,MAAM,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;YAElC,MAAM,eAAe,GAAoB;gBACrC,MAAM;gBACN,KAAK;gBACL,UAAU;aACb,CAAC;YAEF,SAAS,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YACvC,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE;;gBACxB,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACtD,MAAM,MAAM,GAAG;oBACX,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,MAAA,IAAI,CAAC,KAAK,CAAC,aAAa,mCAAI,kBAAkB;oBAC1D,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;oBAClC,KAAK,EAAE,UAAU;oBACjB,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;iBAChD,CAAC;gBAEF,IAAI,CAAC,QAAQ,CAAC;oBACV,IAAI;oBACJ,UAAU;oBACV,kBAAkB;oBAClB,MAAM;iBACT,CAAC,CAAC;gBAEH,IACI,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,KAAK,WAAW;oBACxD,iBAAiB,EACnB;oBACE,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;iBAC3C;gBAED,SAAS,CAAC,SAAS,EAAE,CAAC;gBAEtB,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,iBAAiB,EAAE,IAAI,IACzB,CAAC;YACP,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe;QACX,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,iBAAiB,EAAE,KAAK,IAC1B,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,WAAW,CAAC,EACR,KAAK,EACL,QAAQ,GAIX;QACG,MAAM,YAAY,GACd,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU;YACxC,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,SAAS;YACtC,KAAK,CAAC,cAAc,KAAK,QAAQ,CAAC,cAAc;YAChD,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,SAAS;YACtC,KAAK,CAAC,oBAAoB,KAAK,QAAQ,CAAC,oBAAoB,CAAC;QACjE,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,QAAQ,iCACN,IAAI,CAAC,KAAK,KACb,iBAAiB,EAAE,KAAK,IAC1B,CAAC;YACH,MAAM,iBAAiB,GAAG,KAAK,CAAC;YAChC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;SACvC;IACL,CAAC;IAED,YAAY;QACR,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACtC,kCAAkC;YAClC,OAAO,EAAE,CAAC;SACb;QAED,MAAM,KAAK,GAAG,IAAI,YAAY,CAC1B,IAAI,CAAC,gBAAgB,CAAC;YAClB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACxB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YACnC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;YACrC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;YACvC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB;YACjD,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;YAC7C,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACpD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;YAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;YAC/B,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB;SACxD,CAAC,CACL,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;CACJ;AAED,WAAW,CAAC,SAAS,GAAG,aAAa,CAAC;AACtC,WAAW,CAAC,YAAY,GAAG,YAA2C,CAAC"}
|
|
@@ -56,6 +56,7 @@ export interface privateLayerProps extends ExtendedLayerProps {
|
|
|
56
56
|
gridLines: boolean;
|
|
57
57
|
propertyValueRange: [number, number];
|
|
58
58
|
depthTest: boolean;
|
|
59
|
+
ZIncreasingDownwards: boolean;
|
|
59
60
|
}
|
|
60
61
|
export default class privateLayer extends Layer<privateLayerProps> {
|
|
61
62
|
get isLoaded(): boolean;
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { COORDINATE_SYSTEM, Layer, picking, project,
|
|
1
|
+
import { COORDINATE_SYSTEM, Layer, picking, project, } from "@deck.gl/core/typed";
|
|
2
2
|
import { createPropertyData } from "../utils/layerTools";
|
|
3
3
|
import { Model, Geometry } from "@luma.gl/engine";
|
|
4
4
|
import { getImageData } from "../utils/layerTools";
|
|
5
|
+
import { Texture2D } from "@luma.gl/webgl";
|
|
6
|
+
import GL from "@luma.gl/constants";
|
|
5
7
|
import vsShader from "./vertex.glsl";
|
|
6
8
|
import fsShader from "./fragment.fs.glsl";
|
|
7
9
|
import vsLineShader from "./vertex_lines.glsl";
|
|
8
10
|
import fsLineShader from "./fragment_lines.glsl";
|
|
9
|
-
import {
|
|
10
|
-
import GL from "@luma.gl/constants";
|
|
11
|
+
import { localPhongLighting, utilities } from "../shader_modules";
|
|
11
12
|
const DEFAULT_TEXTURE_PARAMETERS = {
|
|
12
13
|
[GL.TEXTURE_MIN_FILTER]: GL.LINEAR_MIPMAP_LINEAR,
|
|
13
14
|
[GL.TEXTURE_MAG_FILTER]: GL.LINEAR,
|
|
@@ -19,6 +20,7 @@ const defaultProps = {
|
|
|
19
20
|
coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
|
|
20
21
|
propertyValueRange: [0.0, 1.0],
|
|
21
22
|
depthTest: true,
|
|
23
|
+
ZIncreasingDownwards: true,
|
|
22
24
|
};
|
|
23
25
|
// This is a private layer used only by the composite Map3DLayer
|
|
24
26
|
export default class privateLayer extends Layer {
|
|
@@ -60,7 +62,7 @@ export default class privateLayer extends Layer {
|
|
|
60
62
|
},
|
|
61
63
|
vertexCount: this.props.mesh.vertexCount,
|
|
62
64
|
}),
|
|
63
|
-
modules: [project, picking,
|
|
65
|
+
modules: [project, picking, localPhongLighting, utilities],
|
|
64
66
|
isInstanced: false, // This only works when set to false.
|
|
65
67
|
});
|
|
66
68
|
// MESH LINES
|
|
@@ -120,12 +122,14 @@ export default class privateLayer extends Layer {
|
|
|
120
122
|
colorMapRangeMax,
|
|
121
123
|
colorMapClampColor,
|
|
122
124
|
isColorMapClampColorTransparent,
|
|
123
|
-
isClampColor }))
|
|
125
|
+
isClampColor, ZIncreasingDownwards: this.props.ZIncreasingDownwards }))
|
|
124
126
|
.draw();
|
|
125
127
|
gl.disable(gl.POLYGON_OFFSET_FILL);
|
|
126
128
|
// Draw lines.
|
|
127
129
|
if (this.props.gridLines) {
|
|
128
|
-
mesh_lines_model
|
|
130
|
+
mesh_lines_model
|
|
131
|
+
.setUniforms(Object.assign(Object.assign({}, uniforms), { ZIncreasingDownwards: this.props.ZIncreasingDownwards }))
|
|
132
|
+
.draw();
|
|
129
133
|
}
|
|
130
134
|
if (!this.props.depthTest) {
|
|
131
135
|
gl.enable(gl.DEPTH_TEST);
|
|
@@ -152,7 +156,9 @@ export default class privateLayer extends Layer {
|
|
|
152
156
|
const b = info.color[2];
|
|
153
157
|
const vertexIndex = 256 * 256 * r + 256 * g + b;
|
|
154
158
|
if ((_a = info.coordinate) === null || _a === void 0 ? void 0 : _a[2]) {
|
|
155
|
-
const depth =
|
|
159
|
+
const depth = this.props.ZIncreasingDownwards
|
|
160
|
+
? -info.coordinate[2]
|
|
161
|
+
: info.coordinate[2];
|
|
156
162
|
layer_properties.push(createPropertyData("Depth", depth));
|
|
157
163
|
}
|
|
158
164
|
const properties = this.props.mesh.attributes.properties.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"privateLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateLayer.ts"],"names":[],"mappings":"AACA,OAAO,EACH,iBAAiB,EACjB,KAAK,EACL,OAAO,EACP,OAAO,
|
|
1
|
+
{"version":3,"file":"privateLayer.js","sourceRoot":"","sources":["../../../src/layers/grid3d/privateLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-vertex-shader\nprecision highp float;\n\
|
|
1
|
+
declare const vsShader = "#version 300 es\n#define SHADER_NAME grid3d-vertex-shader\nprecision highp float;\n\nattribute vec3 positions;\nattribute float properties;\n\n// Outputs to fragment shader\nout vec3 cameraPosition;\nout vec4 position_commonspace;\nout float property;\n\nflat out int vertexIndex;\n\nuniform bool ZIncreasingDownwards;\n\nconst vec3 pickingColor = vec3(1.0, 1.0, 0.0);\n\nvoid main(void) { \n \n vertexIndex = gl_VertexID;\n cameraPosition = project_uCameraPosition;\n property = properties;\n geometry.pickingColor = pickingColor;\n\n vec3 position = positions;\n position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;\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;
|
|
@@ -3,7 +3,6 @@ const vsShader = `\
|
|
|
3
3
|
#define SHADER_NAME grid3d-vertex-shader
|
|
4
4
|
precision highp float;
|
|
5
5
|
|
|
6
|
-
|
|
7
6
|
attribute vec3 positions;
|
|
8
7
|
attribute float properties;
|
|
9
8
|
|
|
@@ -14,6 +13,8 @@ out float property;
|
|
|
14
13
|
|
|
15
14
|
flat out int vertexIndex;
|
|
16
15
|
|
|
16
|
+
uniform bool ZIncreasingDownwards;
|
|
17
|
+
|
|
17
18
|
const vec3 pickingColor = vec3(1.0, 1.0, 0.0);
|
|
18
19
|
|
|
19
20
|
void main(void) {
|
|
@@ -21,10 +22,14 @@ void main(void) {
|
|
|
21
22
|
vertexIndex = gl_VertexID;
|
|
22
23
|
cameraPosition = project_uCameraPosition;
|
|
23
24
|
property = properties;
|
|
24
|
-
geometry.pickingColor = pickingColor;
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
geometry.pickingColor = pickingColor;
|
|
26
|
+
|
|
27
|
+
vec3 position = positions;
|
|
28
|
+
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
|
29
|
+
|
|
30
|
+
position_commonspace = vec4(project_position(position), 0.0);
|
|
27
31
|
gl_Position = project_common_position_to_clipspace(position_commonspace);
|
|
32
|
+
|
|
28
33
|
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
|
|
29
34
|
|
|
30
35
|
vec4 color = vec4(0.0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
|
1
|
+
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqChB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
declare const _default: "#version 300 es\n#define SHADER_NAME vertex-lines-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4 position_commonspace;\n\nvoid main(void) {\n vec3 position_commonspace = project_position(
|
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME vertex-lines-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nout vec4 position_commonspace;\n\nuniform bool ZIncreasingDownwards;\n\nvoid main(void) {\n vec3 position = positions;\n position[2] *= 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;
|
|
@@ -8,8 +8,13 @@ in vec3 positions;
|
|
|
8
8
|
|
|
9
9
|
out vec4 position_commonspace;
|
|
10
10
|
|
|
11
|
+
uniform bool ZIncreasingDownwards;
|
|
12
|
+
|
|
11
13
|
void main(void) {
|
|
12
|
-
vec3
|
|
14
|
+
vec3 position = positions;
|
|
15
|
+
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
|
16
|
+
|
|
17
|
+
vec3 position_commonspace = project_position(position);
|
|
13
18
|
gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));
|
|
14
19
|
}
|
|
15
20
|
`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
|
1
|
+
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/grid3d/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;CAmBd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
const fs = `vec4 encodeVertexIndexToRGB (int vertexIndex) {
|
|
2
|
+
|
|
3
|
+
float r = 0.0;
|
|
4
|
+
float g = 0.0;
|
|
5
|
+
float b = 0.0;
|
|
6
|
+
|
|
7
|
+
if (vertexIndex >= (256 * 256) - 1) {
|
|
8
|
+
r = floor(float(vertexIndex) / (256.0 * 256.0));
|
|
9
|
+
vertexIndex -= int(r * (256.0 * 256.0));
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
if (vertexIndex >= 256 - 1) {
|
|
13
|
+
g = floor(float(vertexIndex) / 256.0);
|
|
14
|
+
vertexIndex -= int(g * 256.0);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
b = float(vertexIndex);
|
|
18
|
+
|
|
19
|
+
return vec4(r / 255.0, g / 255.0, b / 255.0, 1.0);
|
|
20
|
+
}
|
|
21
|
+
`;
|
|
22
|
+
export const utilities = {
|
|
23
|
+
name: "utilities",
|
|
24
|
+
fs,
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=utilities.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/utilities.ts"],"names":[],"mappings":"AAAA,MAAM,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;EAoBT,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,IAAI,EAAE,WAAW;IACjB,EAAE;CACL,CAAC"}
|