@webviz/subsurface-viewer 1.11.0 → 1.11.1
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/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,5 +1,5 @@
|
|
1
1
|
const fsShader = `#version 300 es
|
2
|
-
#define SHADER_NAME
|
2
|
+
#define SHADER_NAME map-fragment-shader
|
3
3
|
|
4
4
|
precision highp float;
|
5
5
|
|
@@ -18,26 +18,13 @@ out vec4 fragColor;
|
|
18
18
|
|
19
19
|
uniform sampler2D colormap;
|
20
20
|
|
21
|
-
uniform bool isContoursDepth;
|
22
|
-
uniform float contourReferencePoint;
|
23
|
-
uniform float contourInterval;
|
24
|
-
|
25
|
-
uniform float valueRangeMin;
|
26
|
-
uniform float valueRangeMax;
|
27
|
-
uniform float colorMapRangeMin;
|
28
|
-
uniform float colorMapRangeMax;
|
29
|
-
|
30
|
-
uniform vec3 colorMapClampColor;
|
31
|
-
uniform bool isClampColor;
|
32
|
-
uniform bool isColorMapClampColorTransparent;
|
33
|
-
uniform bool smoothShading;
|
34
21
|
|
35
22
|
void main(void) {
|
36
23
|
geometry.uv = vTexCoord;
|
37
24
|
|
38
25
|
vec3 normal = normals_commonspace;
|
39
26
|
|
40
|
-
if
|
27
|
+
if(!map.smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {
|
41
28
|
normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
|
42
29
|
}
|
43
30
|
|
@@ -51,16 +38,15 @@ void main(void) {
|
|
51
38
|
float propertyValue = property;
|
52
39
|
|
53
40
|
// This may happen due to GPU interpolation precision causing color artifacts.
|
54
|
-
propertyValue = clamp(propertyValue, valueRangeMin, valueRangeMax);
|
41
|
+
propertyValue = clamp(propertyValue, map.valueRangeMin, map.valueRangeMax);
|
55
42
|
|
56
|
-
float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);
|
43
|
+
float x = (propertyValue - map.colorMapRangeMin) / (map.colorMapRangeMax - map.colorMapRangeMin);
|
57
44
|
if (x < 0.0 || x > 1.0) {
|
58
45
|
// Out of range. Use clampcolor.
|
59
|
-
if (isClampColor) {
|
60
|
-
color = vec4(colorMapClampColor.rgb, 1.0);
|
61
|
-
|
46
|
+
if (map.isClampColor) {
|
47
|
+
color = vec4(map.colorMapClampColor.rgb, 1.0);
|
62
48
|
}
|
63
|
-
else if (isColorMapClampColorTransparent) {
|
49
|
+
else if (map.isColorMapClampColorTransparent) {
|
64
50
|
discard;
|
65
51
|
return;
|
66
52
|
}
|
@@ -76,25 +62,27 @@ void main(void) {
|
|
76
62
|
color = texture(colormap, vec2(x, 0.5));
|
77
63
|
}
|
78
64
|
|
79
|
-
bool is_contours = contourReferencePoint != -1.0 && contourInterval != -1.0;
|
65
|
+
bool is_contours = map.contourReferencePoint != -1.0 && map.contourInterval != -1.0;
|
80
66
|
if (is_contours) {
|
81
|
-
float val = isContoursDepth ? (abs(worldPos.z) - contourReferencePoint) / contourInterval
|
82
|
-
: (propertyValue - contourReferencePoint) / contourInterval;
|
67
|
+
float val = map.isContoursDepth ? (abs(worldPos.z) - map.contourReferencePoint) / map.contourInterval
|
68
|
+
: (propertyValue - map.contourReferencePoint) / map.contourInterval;
|
83
69
|
|
84
70
|
float f = fract(val);
|
85
71
|
float df = fwidth(val);
|
86
72
|
|
87
|
-
// keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance
|
73
|
+
// keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance from contour line.
|
88
74
|
float c = smoothstep(0.0, df * 2.0, f);
|
89
75
|
|
90
76
|
color = color * vec4(c, c, c, 1.0);
|
91
77
|
}
|
92
78
|
|
93
79
|
// Use two sided phong lighting. This has no effect if "material" property is not set.
|
94
|
-
vec3 lightColor =
|
80
|
+
vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
|
81
|
+
|
95
82
|
fragColor = vec4(lightColor, 1.0);
|
83
|
+
|
96
84
|
DECKGL_FILTER_COLOR(fragColor, geometry);
|
97
85
|
}
|
98
86
|
`;
|
99
87
|
export default fsShader;
|
100
|
-
//# sourceMappingURL=fragment.
|
88
|
+
//# sourceMappingURL=fragment.glsl.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"fragment.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqFhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME
|
1
|
+
declare const fragmentShader = "#version 300 es\n#define SHADER_NAME map-lines-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nvoid main(void) {\n fragColor = vec4(0.0, 0.0, 0.0, 1.0);\n DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
|
2
2
|
export default fragmentShader;
|
@@ -3,7 +3,7 @@ import type { Color, CompositeLayerProps, Layer, UpdateParameters } from "@deck.
|
|
3
3
|
import { CompositeLayer } from "@deck.gl/core";
|
4
4
|
import type { ReportBoundingBoxAction } from "../../components/Map";
|
5
5
|
import type { ExtendedLayerProps, ColorMapFunctionType } from "../utils/layerTools";
|
6
|
-
import type { Material } from "
|
6
|
+
import type { Material } from "@deck.gl/core";
|
7
7
|
import PrivateMapLayer from "./privateMapLayer";
|
8
8
|
type Frame = {
|
9
9
|
/** mesh origin
|
@@ -235,6 +235,7 @@ export default class MapLayer extends CompositeLayer {
|
|
235
235
|
if (isModelMatrix) {
|
236
236
|
rotatingModelMatrix.multiplyRight(this.props.modelMatrix);
|
237
237
|
}
|
238
|
+
const enableLighting = !(this.props.material === false);
|
238
239
|
const layer = new PrivateMapLayer(this.getSubLayerProps({
|
239
240
|
positions: this.state["positions"],
|
240
241
|
normals: this.state["normals"],
|
@@ -255,6 +256,7 @@ export default class MapLayer extends CompositeLayer {
|
|
255
256
|
smoothShading: this.props.smoothShading,
|
256
257
|
depthTest: this.props.depthTest,
|
257
258
|
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
259
|
+
enableLighting,
|
258
260
|
}));
|
259
261
|
return [layer];
|
260
262
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"mapLayer.js","sourceRoot":"","sources":["../../../src/layers/map/mapLayer.ts"],"names":[],"mappings":"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"}
|
@@ -1,15 +1,9 @@
|
|
1
|
-
import type { Color,
|
2
|
-
import { Layer } from "@deck.gl/core";
|
1
|
+
import type { Color, PickingInfo, UpdateParameters, LayerContext } from "@deck.gl/core";
|
3
2
|
import type { Device, UniformValue } from "@luma.gl/core";
|
4
|
-
import { Model } from "@luma.gl/engine";
|
5
3
|
import type { ExtendedLayerProps, LayerPickInfo, ColorMapFunctionType } from "../utils/layerTools";
|
6
4
|
import type { DeckGLLayerContext } from "../../components/Map";
|
7
|
-
|
8
|
-
|
9
|
-
diffuse: number;
|
10
|
-
shininess: number;
|
11
|
-
specularColor: [number, number, number];
|
12
|
-
} | boolean;
|
5
|
+
import { Layer } from "@deck.gl/core";
|
6
|
+
import { Model } from "@luma.gl/engine";
|
13
7
|
export interface PrivateMapLayerProps extends ExtendedLayerProps {
|
14
8
|
positions: Float32Array;
|
15
9
|
normals: Float32Array;
|
@@ -28,9 +22,13 @@ export interface PrivateMapLayerProps extends ExtendedLayerProps {
|
|
28
22
|
smoothShading: boolean;
|
29
23
|
depthTest: boolean;
|
30
24
|
ZIncreasingDownwards: boolean;
|
25
|
+
enableLighting: boolean;
|
31
26
|
}
|
32
27
|
export default class PrivateMapLayer extends Layer<PrivateMapLayerProps> {
|
33
28
|
get isLoaded(): boolean;
|
29
|
+
setShaderModuleProps(args: Partial<{
|
30
|
+
[x: string]: Partial<Record<string, unknown> | undefined>;
|
31
|
+
}>): void;
|
34
32
|
initializeState(context: DeckGLLayerContext): void;
|
35
33
|
shouldUpdateState({ props, oldProps, context, changeFlags, }: UpdateParameters<this>): boolean;
|
36
34
|
updateState({ context }: UpdateParameters<this>): void;
|
@@ -1,11 +1,14 @@
|
|
1
|
-
import { COORDINATE_SYSTEM
|
2
|
-
import {
|
3
|
-
import {
|
1
|
+
import { COORDINATE_SYSTEM } from "@deck.gl/core";
|
2
|
+
import { utilities } from "../shader_modules";
|
3
|
+
import { lighting } from "@luma.gl/shadertools";
|
4
|
+
import { phongMaterial } from "../shader_modules/phong-lighting/phong-material";
|
4
5
|
import { createPropertyData, getImageData } from "../utils/layerTools";
|
5
|
-
import fs from "./fragment.
|
6
|
-
import fsLineShader from "./fragment_lines.glsl";
|
6
|
+
import fs from "./fragment.glsl";
|
7
7
|
import vs from "./vertex.glsl";
|
8
|
+
import fsLineShader from "./fragment_lines.glsl";
|
8
9
|
import vsLineShader from "./vertex_lines.glsl";
|
10
|
+
import { Layer, project32, picking } from "@deck.gl/core";
|
11
|
+
import { Model, Geometry } from "@luma.gl/engine";
|
9
12
|
const defaultProps = {
|
10
13
|
data: ["dummy"],
|
11
14
|
contours: [-1, -1],
|
@@ -17,6 +20,7 @@ const defaultProps = {
|
|
17
20
|
meshValueRange: [0.0, 1.0],
|
18
21
|
depthTest: true,
|
19
22
|
ZIncreasingDownwards: true,
|
23
|
+
enableLighting: true,
|
20
24
|
};
|
21
25
|
// This is a private layer used only by the composite MapLayer
|
22
26
|
export default class PrivateMapLayer extends Layer {
|
@@ -24,6 +28,9 @@ export default class PrivateMapLayer extends Layer {
|
|
24
28
|
var _a;
|
25
29
|
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
26
30
|
}
|
31
|
+
setShaderModuleProps(args) {
|
32
|
+
super.setShaderModuleProps(Object.assign(Object.assign({}, args), { lighting: Object.assign(Object.assign({}, args["lighting"]), { enabled: this.props.enableLighting }) }));
|
33
|
+
}
|
27
34
|
initializeState(context) {
|
28
35
|
const gl = context.device;
|
29
36
|
const [mesh_model, mesh_lines_model] = this._getModels(gl);
|
@@ -79,13 +86,17 @@ export default class PrivateMapLayer extends Layer {
|
|
79
86
|
colorMapClampColor = colorMapClampColor.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
|
80
87
|
const isColorMapClampColorTransparent = this.props.colorMapClampColor === false;
|
81
88
|
const smoothShading = this.props.normals.length == 0 ? false : this.props.smoothShading;
|
82
|
-
const mesh_model = new Model(device, Object.assign(Object.assign({ id: `${this.props.id}-mesh` }, this.getShaders()), { geometry: new Geometry({
|
89
|
+
const mesh_model = new Model(this.context.device, Object.assign(Object.assign({ id: `${this.props.id}-mesh` }, this.getShaders()), { geometry: new Geometry({
|
83
90
|
topology: "triangle-list",
|
84
91
|
attributes: Object.assign(Object.assign({ positions: { value: this.props.positions, size: 3 } }, (this.props.normals.length > 0 && {
|
85
92
|
normals: { value: this.props.normals, size: 3 },
|
86
93
|
})), { properties: { value: this.props.vertexProperties, size: 1 } }),
|
87
94
|
indices: { value: this.props.triangleIndices, size: 1 },
|
88
|
-
}), bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
95
|
+
}), bufferLayout: this.getAttributeManager().getBufferLayouts(), bindings: {
|
96
|
+
colormap: colormap,
|
97
|
+
}, isInstanced: false }));
|
98
|
+
mesh_model.shaderInputs.setProps({
|
99
|
+
map: {
|
89
100
|
contourReferencePoint,
|
90
101
|
contourInterval,
|
91
102
|
isContoursDepth,
|
@@ -98,9 +109,8 @@ export default class PrivateMapLayer extends Layer {
|
|
98
109
|
isClampColor,
|
99
110
|
smoothShading,
|
100
111
|
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
101
|
-
},
|
102
|
-
|
103
|
-
}, isInstanced: false }));
|
112
|
+
},
|
113
|
+
});
|
104
114
|
// MESH LINES
|
105
115
|
const mesh_lines_model = new Model(device, {
|
106
116
|
id: `${this.props.id}-lines`,
|
@@ -114,16 +124,32 @@ export default class PrivateMapLayer extends Layer {
|
|
114
124
|
indices: { value: this.props.lineIndices, size: 1 },
|
115
125
|
}),
|
116
126
|
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
117
|
-
modules: [project32, picking],
|
127
|
+
modules: [project32, picking, mapUniforms],
|
118
128
|
isInstanced: false,
|
119
129
|
});
|
130
|
+
mesh_lines_model.shaderInputs.setProps({
|
131
|
+
map: {
|
132
|
+
contourReferencePoint,
|
133
|
+
contourInterval,
|
134
|
+
isContoursDepth,
|
135
|
+
valueRangeMin,
|
136
|
+
valueRangeMax,
|
137
|
+
colorMapRangeMin,
|
138
|
+
colorMapRangeMax,
|
139
|
+
colorMapClampColor,
|
140
|
+
isColorMapClampColorTransparent,
|
141
|
+
isClampColor,
|
142
|
+
smoothShading,
|
143
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
144
|
+
},
|
145
|
+
});
|
120
146
|
return [mesh_model, mesh_lines_model];
|
121
147
|
}
|
122
148
|
draw(args) {
|
123
149
|
if (!this.state["models"]) {
|
124
150
|
return;
|
125
151
|
}
|
126
|
-
const {
|
152
|
+
const { context } = args;
|
127
153
|
const { gl } = context;
|
128
154
|
const [mesh_model, mesh_lines_model] = this.state["models"];
|
129
155
|
gl.enable(gl.POLYGON_OFFSET_FILL);
|
@@ -137,10 +163,6 @@ export default class PrivateMapLayer extends Layer {
|
|
137
163
|
gl.enable(gl.DEPTH_TEST);
|
138
164
|
}
|
139
165
|
if (this.props.gridLines) {
|
140
|
-
mesh_lines_model.setUniforms({
|
141
|
-
uniforms,
|
142
|
-
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
143
|
-
});
|
144
166
|
mesh_lines_model.draw(context.renderPass);
|
145
167
|
}
|
146
168
|
if (!this.state["isLoaded"]) {
|
@@ -179,10 +201,56 @@ export default class PrivateMapLayer extends Layer {
|
|
179
201
|
return super.getShaders({
|
180
202
|
vs,
|
181
203
|
fs,
|
182
|
-
modules: [
|
204
|
+
modules: [
|
205
|
+
project32,
|
206
|
+
picking,
|
207
|
+
utilities,
|
208
|
+
lighting,
|
209
|
+
phongMaterial,
|
210
|
+
mapUniforms,
|
211
|
+
],
|
183
212
|
});
|
184
213
|
}
|
185
214
|
}
|
186
215
|
PrivateMapLayer.layerName = "privateMapLayer";
|
187
216
|
PrivateMapLayer.defaultProps = defaultProps;
|
217
|
+
// local shader module for the uniforms
|
218
|
+
const mapUniformsBlock = /*glsl*/ `\
|
219
|
+
uniform mapUniforms {
|
220
|
+
bool isContoursDepth;
|
221
|
+
float contourReferencePoint;
|
222
|
+
float contourInterval;
|
223
|
+
|
224
|
+
float valueRangeMin;
|
225
|
+
float valueRangeMax;
|
226
|
+
float colorMapRangeMin;
|
227
|
+
float colorMapRangeMax;
|
228
|
+
|
229
|
+
vec3 colorMapClampColor;
|
230
|
+
bool isClampColor;
|
231
|
+
bool isColorMapClampColorTransparent;
|
232
|
+
bool smoothShading;
|
233
|
+
bool ZIncreasingDownwards;
|
234
|
+
} map;
|
235
|
+
`;
|
236
|
+
// NOTE: this must exactly the same name as in the uniform block
|
237
|
+
const mapUniforms = {
|
238
|
+
name: "map",
|
239
|
+
vs: mapUniformsBlock,
|
240
|
+
fs: mapUniformsBlock,
|
241
|
+
uniformTypes: {
|
242
|
+
isContoursDepth: "u32",
|
243
|
+
contourReferencePoint: "f32",
|
244
|
+
contourInterval: "f32",
|
245
|
+
valueRangeMin: "f32",
|
246
|
+
valueRangeMax: "f32",
|
247
|
+
colorMapRangeMin: "f32",
|
248
|
+
colorMapRangeMax: "f32",
|
249
|
+
colorMapClampColor: "vec3<f32>",
|
250
|
+
isClampColor: "u32",
|
251
|
+
isColorMapClampColorTransparent: "u32",
|
252
|
+
smoothShading: "u32",
|
253
|
+
ZIncreasingDownwards: "u32",
|
254
|
+
},
|
255
|
+
};
|
188
256
|
//# sourceMappingURL=privateMapLayer.js.map
|
@@ -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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"}
|
@@ -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;\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\
|
1
|
+
declare const vsShader = "#version 300 es\n#define SHADER_NAME map-vertex-shader\n\nprecision highp float;\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 = vec3(1.0, 1.0, 0.0);\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 vColor = vec4(colors.rgb, 1.0);\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 map-vertex-shader
|
4
4
|
|
5
5
|
precision highp float;
|
6
6
|
|
@@ -20,16 +20,14 @@ out vec3 worldPos;
|
|
20
20
|
out float property;
|
21
21
|
flat out int vertexIndex;
|
22
22
|
|
23
|
-
uniform bool ZIncreasingDownwards;
|
24
|
-
|
25
23
|
void main(void) {
|
26
24
|
geometry.pickingColor = vec3(1.0, 1.0, 0.0);
|
27
25
|
vertexIndex = gl_VertexID;
|
28
26
|
|
29
27
|
vec3 position = positions;
|
30
|
-
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
28
|
+
position[2] *= map.ZIncreasingDownwards ? -1.0 : 1.0;
|
31
29
|
|
32
|
-
cameraPosition =
|
30
|
+
cameraPosition = project.cameraPosition;
|
33
31
|
|
34
32
|
worldPos = position;
|
35
33
|
geometry.worldPosition = position;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG
|
1
|
+
{"version":3,"file":"vertex.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/vertex.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgDhB,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 map-lines-vertex-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] *= map.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 DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\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 map-lines-vertex-shader
|
4
4
|
|
5
5
|
precision highp float;
|
6
6
|
|
@@ -12,10 +12,11 @@ uniform bool ZIncreasingDownwards;
|
|
12
12
|
|
13
13
|
void main(void) {
|
14
14
|
vec3 position = positions;
|
15
|
-
position[2] *= ZIncreasingDownwards ? -1.0 : 1.0;
|
15
|
+
position[2] *= map.ZIncreasingDownwards ? -1.0 : 1.0;
|
16
16
|
|
17
17
|
vec3 position_commonspace = project_position(position);
|
18
18
|
gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));
|
19
|
+
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
|
19
20
|
}
|
20
21
|
`;
|
21
22
|
//# sourceMappingURL=vertex_lines.glsl.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe
|
1
|
+
{"version":3,"file":"vertex_lines.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/vertex_lines.glsl.ts"],"names":[],"mappings":"AAAA,eAAe;;;;;;;;;;;;;;;;;;;;CAoBd,CAAC"}
|
@@ -10,7 +10,7 @@ export default class NorthArrow3DLayer extends Layer<NorthArrow3DLayerProps> {
|
|
10
10
|
initializeState(context: LayerContext): void;
|
11
11
|
shouldUpdateState(): boolean;
|
12
12
|
updateState({ context }: UpdateParameters<this>): void;
|
13
|
-
draw(
|
13
|
+
draw(drawOptions: any): void;
|
14
14
|
_getModels(device: Device): {
|
15
15
|
model: Model;
|
16
16
|
models: Model[];
|
@@ -24,10 +24,10 @@ export default class NorthArrow3DLayer extends Layer {
|
|
24
24
|
}
|
25
25
|
// Signature from the base class, eslint doesn't like the any type.
|
26
26
|
// eslint-disable-next-line
|
27
|
-
draw(
|
28
|
-
const { gl } = context;
|
27
|
+
draw(drawOptions) {
|
28
|
+
const { gl } = drawOptions.context;
|
29
29
|
gl.disable(gl.DEPTH_TEST);
|
30
|
-
super.draw(
|
30
|
+
super.draw(drawOptions);
|
31
31
|
gl.enable(gl.DEPTH_TEST);
|
32
32
|
}
|
33
33
|
_getModels(device) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"northArrow3DLayer.js","sourceRoot":"","sources":["../../../src/layers/northarrow/northArrow3DLayer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAMpD,MAAM,YAAY,GAAG;IACjB,QAAQ,EAAE,mBAAmB;IAC7B,IAAI,EAAE,cAAc;IACpB,EAAE,EAAE,mBAAmB;IACvB,OAAO,EAAE,IAAI;IACb,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,KAA6B;IACxE,eAAe,CAAC,OAAqB;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,EAAE,OAAO,EAA0B;QAC3C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,CAAC;IACL,CAAC;IAED,mEAAmE;IACnE,2BAA2B;IAC3B,IAAI,CAAC,
|
1
|
+
{"version":3,"file":"northArrow3DLayer.js","sourceRoot":"","sources":["../../../src/layers/northarrow/northArrow3DLayer.ts"],"names":[],"mappings":"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"}
|
@@ -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 northarrow-fragment-shader\n\nprecision highp float;\n\nout vec4 fragColor;\n\nuniform vec4 uColor;\n\nvoid main(void) {\n fragColor = uColor;\n}\n";
|
2
2
|
export default _default;
|
@@ -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 northarrow-vertex-shader\n\nprecision highp float;\n\nin vec3 positions;\n\nvoid main(void) {\n vec3 position_commonspace = project_position(positions);\n gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));\n}\n";
|
2
2
|
export default _default;
|
@@ -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 piechart-fragment-shader\n\nprecision highp float;\n\nflat in int pie_index_;\n\nout vec4 fragColor;\n\nin vec4 vColor;\n\nvoid main(void) {\n\n //Picking pass.\n if (picking.isActive > 0.5) {\n // Express triangle index in 255 system.\n float r = 0.0;\n float g = 0.0;\n float b = 0.0;\n \n int idx = pie_index_;\n \n if (idx >= (256 * 256) - 1) {\n r = floor(float(idx) / (256.0 * 256.0));\n idx -= int(r * (256.0 * 256.0));\n }\n \n if (idx >= 256 - 1) {\n g = floor(float(idx) / 256.0);\n idx -= int(g * 256.0);\n }\n \n b = float(idx);\n \n fragColor = vec4(r / 255.0, g / 255.0, b / 255.0, 1.0);\n return;\n }\n\n fragColor = vColor;\n}\n";
|
2
2
|
export default _default;
|
@@ -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 piechart-vertex-shader\n\nprecision highp float;\n\nin vec3 positions;\nin vec3 colors;\nin float do_scale;\nin float mx;\nin float my;\nin int pie_index;\n\nflat out int pie_index_;\n\nuniform float scale;\n\nout vec4 vColor;\n\nvoid main(void) {\n\n vec3 v = positions;\n\n if (do_scale == 1.0) {\n // Triangle vertex' are (mx,my) and two more. The\n // latter two will be scaled so that the triangle (or the pie piece its part of) will\n // have constant size depending on zoom.\n float x = scale * (positions.x - mx);\n float y = scale * (positions.y - my);\n\n v = vec3(x + mx, y + my, 0.0);\n }\n\n vec3 position_commonspace = project_position(v);\n\n vColor = vec4(colors.rgb, 1.0);\n\n pie_index_ = pie_index;\n\n gl_Position = project_common_position_to_clipspace(vec4(position_commonspace, 0.0));\n}\n";
|
2
2
|
export default _default;
|