@webviz/subsurface-viewer 0.28.1 → 0.28.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/DashSubsurfaceViewer.js +1 -1
- package/dist/DashSubsurfaceViewer.js.map +1 -1
- package/dist/SubsurfaceViewer.d.ts +1 -1
- package/dist/components/ColorLegend.d.ts +1 -1
- package/dist/components/ColorLegend.js.map +1 -1
- package/dist/components/Map.d.ts +1 -1
- package/dist/components/Map.js +7 -7
- package/dist/components/Map.js.map +1 -1
- package/dist/extensions/side-projection-extension.d.ts +4 -3
- package/dist/extensions/side-projection-extension.js +7 -6
- package/dist/extensions/side-projection-extension.js.map +1 -1
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.d.ts +3 -4
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js +4 -7
- package/dist/layers/BoxSelectionLayer/boxSelectionLayer.js.map +1 -1
- package/dist/layers/axes/axesLayer.d.ts +3 -3
- package/dist/layers/axes/axesLayer.js +6 -4
- package/dist/layers/axes/axesLayer.js.map +1 -1
- package/dist/layers/axes/boxLayer.d.ts +2 -2
- package/dist/layers/axes/boxLayer.js +5 -8
- package/dist/layers/axes/boxLayer.js.map +1 -1
- package/dist/layers/axes2d/axes2DLayer.d.ts +4 -5
- package/dist/layers/axes2d/axes2DLayer.js +23 -23
- package/dist/layers/axes2d/axes2DLayer.js.map +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.d.ts +1 -1
- package/dist/layers/colormap/colormap.fs.glsl.js +11 -10
- package/dist/layers/colormap/colormap.fs.glsl.js.map +1 -1
- package/dist/layers/colormap/colormapLayer.d.ts +6 -6
- package/dist/layers/colormap/colormapLayer.js +14 -28
- package/dist/layers/colormap/colormapLayer.js.map +1 -1
- package/dist/layers/drawing/drawingLayer.d.ts +3 -3
- package/dist/layers/drawing/drawingLayer.js +8 -7
- package/dist/layers/drawing/drawingLayer.js.map +1 -1
- package/dist/layers/fault_polygons/faultPolygonsLayer.d.ts +3 -3
- package/dist/layers/fault_polygons/faultPolygonsLayer.js +3 -4
- package/dist/layers/fault_polygons/faultPolygonsLayer.js.map +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment.fs.glsl.js +11 -9
- package/dist/layers/grid3d/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.d.ts +1 -1
- package/dist/layers/grid3d/fragment_lines.glsl.js +0 -7
- package/dist/layers/grid3d/fragment_lines.glsl.js.map +1 -1
- package/dist/layers/grid3d/grid3dLayer.d.ts +3 -3
- package/dist/layers/grid3d/grid3dLayer.js +2 -2
- package/dist/layers/grid3d/grid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/privateGrid3dLayer.d.ts +10 -4
- package/dist/layers/grid3d/privateGrid3dLayer.js +73 -56
- package/dist/layers/grid3d/privateGrid3dLayer.js.map +1 -1
- package/dist/layers/grid3d/typeDefs.d.ts +4 -2
- package/dist/layers/grid3d/vertex.glsl.d.ts +1 -1
- package/dist/layers/grid3d/vertex.glsl.js +3 -3
- package/dist/layers/grid3d/webworker.js +6 -4
- package/dist/layers/grid3d/webworker.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.d.ts +1 -1
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js +13 -11
- package/dist/layers/hillshading2d/hillshading2d.fs.glsl.js.map +1 -1
- package/dist/layers/hillshading2d/hillshading2dLayer.d.ts +7 -7
- package/dist/layers/hillshading2d/hillshading2dLayer.js +5 -11
- package/dist/layers/hillshading2d/hillshading2dLayer.js.map +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.d.ts +2 -2
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js +1 -1
- package/dist/layers/intersection/unfoldedGeoJsonLayer.js.map +1 -1
- package/dist/layers/map/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/map/fragment.fs.glsl.js +13 -19
- package/dist/layers/map/fragment.fs.glsl.js.map +1 -1
- package/dist/layers/map/mapLayer.d.ts +4 -4
- package/dist/layers/map/mapLayer.js +1 -1
- package/dist/layers/map/mapLayer.js.map +1 -1
- package/dist/layers/map/privateMapLayer.d.ts +10 -5
- package/dist/layers/map/privateMapLayer.js +73 -72
- package/dist/layers/map/privateMapLayer.js.map +1 -1
- package/dist/layers/map/webworker.d.ts +1 -1
- package/dist/layers/map/webworker.js +4 -4
- package/dist/layers/map/webworker.js.map +1 -1
- package/dist/layers/northarrow/northArrow3DLayer.d.ts +4 -4
- package/dist/layers/northarrow/northArrow3DLayer.js +7 -10
- package/dist/layers/northarrow/northArrow3DLayer.js.map +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/pieChartLayer.d.ts +3 -4
- package/dist/layers/piechart/pieChartLayer.js +10 -9
- package/dist/layers/piechart/pieChartLayer.js.map +1 -1
- package/dist/layers/points/pointsLayer.d.ts +3 -3
- package/dist/layers/points/pointsLayer.js +1 -1
- package/dist/layers/points/pointsLayer.js.map +1 -1
- package/dist/layers/points/privatePointsLayer.d.ts +4 -13
- package/dist/layers/points/privatePointsLayer.js +5 -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 +14 -13
- package/dist/layers/points/vertex.glsl.js.map +1 -1
- package/dist/layers/polylines/polylinesLayer.d.ts +3 -3
- package/dist/layers/polylines/polylinesLayer.js +5 -3
- package/dist/layers/polylines/polylinesLayer.js.map +1 -1
- package/dist/layers/polylines/privatePolylinesLayer.d.ts +37 -9
- package/dist/layers/polylines/privatePolylinesLayer.js +6 -6
- package/dist/layers/polylines/privatePolylinesLayer.js.map +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.d.ts +2 -2
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js +1 -1
- package/dist/layers/selectable_geojson/selectableGeoJsonLayer.js.map +1 -1
- package/dist/layers/shader_modules/localPhongLighting.d.ts +19 -1
- package/dist/layers/triangle/fragment.fs.glsl.d.ts +1 -1
- package/dist/layers/triangle/fragment.fs.glsl.js +4 -3
- 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 +2 -2
- package/dist/layers/triangle/privateTriangleLayer.d.ts +9 -8
- package/dist/layers/triangle/privateTriangleLayer.js +21 -16
- package/dist/layers/triangle/privateTriangleLayer.js.map +1 -1
- package/dist/layers/triangle/triangleLayer.d.ts +4 -4
- package/dist/layers/triangle/triangleLayer.js +5 -3
- package/dist/layers/triangle/triangleLayer.js.map +1 -1
- package/dist/layers/triangle/webworker.js +2 -2
- package/dist/layers/triangle/webworker.js.map +1 -1
- package/dist/layers/utils/layerTools.d.ts +3 -3
- package/dist/layers/utils/propertyMapTools.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.d.ts +1 -1
- package/dist/layers/well_markers/fragment.glsl.js +4 -3
- package/dist/layers/well_markers/fragment.glsl.js.map +1 -1
- package/dist/layers/well_markers/vertex.glsl.d.ts +1 -1
- package/dist/layers/well_markers/vertex.glsl.js +10 -14
- package/dist/layers/well_markers/vertex.glsl.js.map +1 -1
- package/dist/layers/well_markers/wellMarkersLayer.d.ts +6 -4
- package/dist/layers/well_markers/wellMarkersLayer.js +43 -50
- package/dist/layers/well_markers/wellMarkersLayer.js.map +1 -1
- package/dist/layers/wells/wellsLayer.d.ts +2 -2
- package/dist/layers/wells/wellsLayer.js +4 -4
- package/dist/layers/wells/wellsLayer.js.map +1 -1
- package/dist/utils/configuration.d.ts +0 -616
- package/dist/utils/configuration.js +6 -11
- package/dist/utils/configuration.js.map +1 -1
- package/dist/utils/measurement.d.ts +1 -1
- package/dist/utils/measurement.js +1 -1
- package/dist/utils/measurement.js.map +1 -1
- package/dist/utils/specExtractor.d.ts +1 -1
- package/dist/viewports/intersectionViewport.d.ts +1 -1
- package/dist/viewports/intersectionViewport.js +1 -1
- package/dist/viewports/intersectionViewport.js.map +1 -1
- package/dist/views/intersectionView.d.ts +4 -3
- package/dist/views/intersectionView.js +1 -1
- package/dist/views/intersectionView.js.map +1 -1
- package/package.json +13 -11
- package/dist/layers/points/fragment.glsl.d.ts +0 -2
- package/dist/layers/points/fragment.glsl.js +0 -69
- package/dist/layers/points/fragment.glsl.js.map +0 -1
@@ -1,19 +1,11 @@
|
|
1
|
-
import { COORDINATE_SYSTEM, Layer, picking, project, project32, } from "@deck.gl/core
|
2
|
-
import
|
3
|
-
import { Texture2D } from "@luma.gl/webgl";
|
4
|
-
import { Model, Geometry } from "@luma.gl/engine";
|
1
|
+
import { COORDINATE_SYSTEM, Layer, picking, project, project32, } from "@deck.gl/core";
|
2
|
+
import { Geometry, Model } from "@luma.gl/engine";
|
5
3
|
import { localPhongLighting, utilities } from "../shader_modules";
|
6
|
-
import {
|
7
|
-
import vs from "./vertex.glsl";
|
4
|
+
import { createPropertyData, getImageData } from "../utils/layerTools";
|
8
5
|
import fs from "./fragment.fs.glsl";
|
9
|
-
import vsLineShader from "./vertex_lines.glsl";
|
10
6
|
import fsLineShader from "./fragment_lines.glsl";
|
11
|
-
|
12
|
-
|
13
|
-
[GL.TEXTURE_MAG_FILTER]: GL.LINEAR,
|
14
|
-
[GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
|
15
|
-
[GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE,
|
16
|
-
};
|
7
|
+
import vs from "./vertex.glsl";
|
8
|
+
import vsLineShader from "./vertex_lines.glsl";
|
17
9
|
const defaultProps = {
|
18
10
|
data: ["dummy"],
|
19
11
|
contours: [-1, -1],
|
@@ -33,10 +25,10 @@ export default class PrivateMapLayer extends Layer {
|
|
33
25
|
return (_a = this.state["isLoaded"]) !== null && _a !== void 0 ? _a : false;
|
34
26
|
}
|
35
27
|
initializeState(context) {
|
36
|
-
const
|
37
|
-
const [
|
28
|
+
const gl = context.device;
|
29
|
+
const [mesh_model, mesh_lines_model] = this._getModels(gl);
|
38
30
|
this.setState({
|
39
|
-
models: [
|
31
|
+
models: [mesh_model, mesh_lines_model],
|
40
32
|
isLoaded: false,
|
41
33
|
});
|
42
34
|
}
|
@@ -53,95 +45,104 @@ export default class PrivateMapLayer extends Layer {
|
|
53
45
|
}
|
54
46
|
//eslint-disable-next-line
|
55
47
|
_getModels(gl) {
|
56
|
-
|
48
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
49
|
+
const colormap = gl.createTexture({
|
50
|
+
sampler: {
|
51
|
+
addressModeU: "clamp-to-edge",
|
52
|
+
addressModeV: "clamp-to-edge",
|
53
|
+
minFilter: "linear",
|
54
|
+
magFilter: "linear",
|
55
|
+
},
|
56
|
+
width: 256,
|
57
|
+
height: 1,
|
58
|
+
format: "rgb8unorm-webgl",
|
59
|
+
data: getImageData(this.props.colorMapName, this.context.userData.colorTables, this.props.colorMapFunction),
|
60
|
+
});
|
57
61
|
// MESH MODEL
|
58
|
-
const
|
59
|
-
|
62
|
+
const contourReferencePoint = (_a = this.props.contours[0]) !== null && _a !== void 0 ? _a : -1.0;
|
63
|
+
const contourInterval = (_b = this.props.contours[1]) !== null && _b !== void 0 ? _b : -1.0;
|
64
|
+
const isContoursDepth = this.props.isContoursDepth;
|
65
|
+
const valueRangeMin = (_c = this.props.propertyValueRange[0]) !== null && _c !== void 0 ? _c : 0.0;
|
66
|
+
const valueRangeMax = (_d = this.props.propertyValueRange[1]) !== null && _d !== void 0 ? _d : 1.0;
|
67
|
+
// If specified color map will extend from colorMapRangeMin to colorMapRangeMax.
|
68
|
+
// Otherwise it will extend from valueRangeMin to valueRangeMax.
|
69
|
+
const colorMapRangeMin = (_f = (_e = this.props.colorMapRange) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : valueRangeMin;
|
70
|
+
const colorMapRangeMax = (_h = (_g = this.props.colorMapRange) === null || _g === void 0 ? void 0 : _g[1]) !== null && _h !== void 0 ? _h : valueRangeMax;
|
71
|
+
const isClampColor = this.props.colorMapClampColor !== undefined &&
|
72
|
+
this.props.colorMapClampColor !== true &&
|
73
|
+
this.props.colorMapClampColor !== false;
|
74
|
+
let colorMapClampColor = isClampColor
|
75
|
+
? this.props.colorMapClampColor
|
76
|
+
: [0, 0, 0];
|
77
|
+
// Normalize to [0,1] range.
|
78
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
79
|
+
// @ts-ignore
|
80
|
+
colorMapClampColor = colorMapClampColor.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
|
81
|
+
const isColorMapClampColorTransparent = this.props.colorMapClampColor === false;
|
82
|
+
const smoothShading = this.props.normals.length == 0 ? false : this.props.smoothShading;
|
83
|
+
const mesh_model = new Model(gl, Object.assign(Object.assign({ id: `${this.props.id}-mesh` }, this.getShaders()), { geometry: new Geometry({
|
84
|
+
topology: "triangle-list",
|
60
85
|
attributes: Object.assign(Object.assign({ positions: { value: this.props.positions, size: 3 } }, (this.props.normals.length > 0 && {
|
61
86
|
normals: { value: this.props.normals, size: 3 },
|
62
87
|
})), { properties: { value: this.props.vertexProperties, size: 1 } }),
|
63
88
|
indices: { value: this.props.triangleIndices, size: 1 },
|
64
|
-
}),
|
89
|
+
}), bufferLayout: this.getAttributeManager().getBufferLayouts(), uniforms: {
|
90
|
+
contourReferencePoint,
|
91
|
+
contourInterval,
|
92
|
+
isContoursDepth,
|
93
|
+
valueRangeMin,
|
94
|
+
valueRangeMax,
|
95
|
+
colorMapRangeMin,
|
96
|
+
colorMapRangeMax,
|
97
|
+
colorMapClampColor,
|
98
|
+
isColorMapClampColorTransparent,
|
99
|
+
isClampColor,
|
100
|
+
smoothShading,
|
101
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
102
|
+
}, bindings: {
|
103
|
+
colormap: colormap,
|
104
|
+
}, isInstanced: false }));
|
65
105
|
// MESH LINES
|
66
106
|
const mesh_lines_model = new Model(gl, {
|
67
107
|
id: `${this.props.id}-lines`,
|
68
108
|
vs: vsLineShader,
|
69
109
|
fs: fsLineShader,
|
70
110
|
geometry: new Geometry({
|
71
|
-
|
111
|
+
topology: "line-list",
|
72
112
|
attributes: {
|
73
113
|
positions: { value: this.props.positions, size: 3 },
|
74
114
|
},
|
75
115
|
indices: { value: this.props.lineIndices, size: 1 },
|
76
116
|
}),
|
117
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
77
118
|
modules: [project],
|
78
119
|
isInstanced: false,
|
79
120
|
});
|
80
121
|
return [mesh_model, mesh_lines_model];
|
81
122
|
}
|
82
|
-
// Signature from the base class, eslint doesn't like the any type.
|
83
|
-
// eslint-disable-next-line
|
84
123
|
draw(args) {
|
85
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
86
124
|
if (!this.state["models"]) {
|
87
125
|
return;
|
88
126
|
}
|
89
127
|
const { uniforms, context } = args;
|
90
128
|
const { gl } = context;
|
91
|
-
const
|
92
|
-
|
93
|
-
const isContoursDepth = this.props.isContoursDepth;
|
94
|
-
const [model_mesh, mesh_lines_model] = this.state["models"];
|
95
|
-
const valueRangeMin = (_c = this.props.propertyValueRange[0]) !== null && _c !== void 0 ? _c : 0.0;
|
96
|
-
const valueRangeMax = (_d = this.props.propertyValueRange[1]) !== null && _d !== void 0 ? _d : 1.0;
|
97
|
-
// If specified color map will extend from colorMapRangeMin to colorMapRangeMax.
|
98
|
-
// Otherwise it will extend from valueRangeMin to valueRangeMax.
|
99
|
-
const colorMapRangeMin = (_f = (_e = this.props.colorMapRange) === null || _e === void 0 ? void 0 : _e[0]) !== null && _f !== void 0 ? _f : valueRangeMin;
|
100
|
-
const colorMapRangeMax = (_h = (_g = this.props.colorMapRange) === null || _g === void 0 ? void 0 : _g[1]) !== null && _h !== void 0 ? _h : valueRangeMax;
|
101
|
-
const isClampColor = this.props.colorMapClampColor !== undefined &&
|
102
|
-
this.props.colorMapClampColor !== true &&
|
103
|
-
this.props.colorMapClampColor !== false;
|
104
|
-
let colorMapClampColor = isClampColor
|
105
|
-
? this.props.colorMapClampColor
|
106
|
-
: [0, 0, 0];
|
107
|
-
// Normalize to [0,1] range.
|
108
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
109
|
-
// @ts-ignore
|
110
|
-
colorMapClampColor = colorMapClampColor.map((x) => (x !== null && x !== void 0 ? x : 0) / 255);
|
111
|
-
const isColorMapClampColorTransparent = this.props.colorMapClampColor === false;
|
112
|
-
const smoothShading = this.props.normals.length == 0 ? false : this.props.smoothShading;
|
113
|
-
gl.enable(GL.POLYGON_OFFSET_FILL);
|
129
|
+
const [mesh_model, mesh_lines_model] = this.state["models"];
|
130
|
+
gl.enable(gl.POLYGON_OFFSET_FILL);
|
114
131
|
if (!this.props.depthTest) {
|
115
|
-
gl.disable(
|
132
|
+
gl.disable(gl.DEPTH_TEST);
|
116
133
|
}
|
117
134
|
gl.polygonOffset(1, 1);
|
118
|
-
|
119
|
-
|
120
|
-
contourInterval,
|
121
|
-
isContoursDepth, colormap: new Texture2D(context.gl, {
|
122
|
-
width: 256,
|
123
|
-
height: 1,
|
124
|
-
format: GL.RGB,
|
125
|
-
data: getImageData(this.props.colorMapName, this.context.userData
|
126
|
-
.colorTables, this.props.colorMapFunction),
|
127
|
-
parameters: DEFAULT_TEXTURE_PARAMETERS,
|
128
|
-
}), valueRangeMin,
|
129
|
-
valueRangeMax,
|
130
|
-
colorMapRangeMin,
|
131
|
-
colorMapRangeMax,
|
132
|
-
colorMapClampColor,
|
133
|
-
isColorMapClampColorTransparent,
|
134
|
-
isClampColor,
|
135
|
-
smoothShading, ZIncreasingDownwards: this.props.ZIncreasingDownwards }))
|
136
|
-
.draw();
|
137
|
-
gl.disable(GL.POLYGON_OFFSET_FILL);
|
135
|
+
mesh_model.draw(context.renderPass);
|
136
|
+
gl.disable(gl.POLYGON_OFFSET_FILL);
|
138
137
|
if (!this.props.depthTest) {
|
139
|
-
gl.enable(
|
138
|
+
gl.enable(gl.DEPTH_TEST);
|
140
139
|
}
|
141
140
|
if (this.props.gridLines) {
|
142
|
-
mesh_lines_model
|
143
|
-
|
144
|
-
.
|
141
|
+
mesh_lines_model.setUniforms({
|
142
|
+
uniforms,
|
143
|
+
ZIncreasingDownwards: this.props.ZIncreasingDownwards,
|
144
|
+
});
|
145
|
+
mesh_lines_model.draw(context.renderPass);
|
145
146
|
}
|
146
147
|
if (!this.state["isLoaded"]) {
|
147
148
|
this.setState(Object.assign(Object.assign({}, this.state), { isLoaded: true }));
|
@@ -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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"}
|
@@ -4,4 +4,4 @@ import type { Params } from "./mapLayer";
|
|
4
4
|
*/
|
5
5
|
export declare function makeFullMesh(e: {
|
6
6
|
data: Params;
|
7
|
-
}): [Float32Array,
|
7
|
+
}): [Float32Array, Float32Array, Uint32Array, Float32Array, Uint32Array, number[], number[]];
|
@@ -119,7 +119,7 @@ export function makeFullMesh(e) {
|
|
119
119
|
const nCells = (nx - 1) * (ny - 1);
|
120
120
|
const nTriangles = nCells * 2;
|
121
121
|
const positions = new Float32Array(isCellCenteredProperties ? nCells * 6 * 3 : nNodes * 3);
|
122
|
-
const normals = new
|
122
|
+
const normals = new Float32Array(isCellCenteredProperties || !smoothShading ? 0 : nNodes * 3);
|
123
123
|
const triangleIndices = new Uint32Array(nTriangles * 3);
|
124
124
|
const vertexProperties = new Float32Array(isCellCenteredProperties ? nCells * 6 : nNodes);
|
125
125
|
let nLineIndices = 0;
|
@@ -149,9 +149,9 @@ export function makeFullMesh(e) {
|
|
149
149
|
positions[3 * i + 2] = z;
|
150
150
|
if (smoothShading) {
|
151
151
|
const normal = calcNormal(w, h, nx, ny, isMesh, smoothShading, meshData, ox, oy, dx, dy); // eslint-disable-line
|
152
|
-
normals[3 * i + 0] = normal[0]
|
153
|
-
normals[3 * i + 1] = normal[1]
|
154
|
-
normals[3 * i + 2] = normal[2]
|
152
|
+
normals[3 * i + 0] = normal[0];
|
153
|
+
normals[3 * i + 1] = normal[1];
|
154
|
+
normals[3 * i + 2] = normal[2];
|
155
155
|
}
|
156
156
|
vertexProperties[i] = propertyValue;
|
157
157
|
i++;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"webworker.js","sourceRoot":"","sources":["../../../src/layers/map/webworker.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,CAAmB;IAC5C,MAAM,CACF,aAAa,EACb,mBAAmB,EACnB,MAAM,EACN,KAAK,EACL,aAAa,EACb,SAAS,EACZ,GAAG,CAAC,CAAC,IAAI,CAAC;IAQX,SAAS,qBAAqB,CAAC,IAAkB;QAC7C,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;QACpB,IAAI,GAAG,GAAG,QAAQ,CAAC;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;YACpC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACxC,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,SAAS,YAAY,CAAC,CAAM,EAAE,CAAM;QAChC,MAAM,CAAC,GAAG;YACN,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAC5B,CAAC;QACF,OAAO,CAAQ,CAAC;IACpB,CAAC;IAED,SAAS,SAAS,CAAC,CAAU;QACzB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,SAAS,SAAS,CAAC,CAAM;QACrB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACV,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACV,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAED,SAAS,UAAU,CACf,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,MAAe,EACf,aAAsB,EACtB,QAAsB,EACtB,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;QAEV,IAAI,CAAC,aAAa,EAAE,CAAC;YACjB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrB,CAAC;QAED,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE5B,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC9D,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC5E,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC5E,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC5E,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAE5E,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,4CAA4C;QACxE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,0CAA0C;QACjE,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QACzF,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC/F,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC/F,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAC/F,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;QAE/F,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAQ,CAAC;QAChE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAQ,CAAC;QAChE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAQ,CAAC;QAChE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAQ,CAAC;QAEhE,oCAAoC;QACpC,wCAAwC;QACxC,+BAA+B;QAC/B,+DAA+D;QAC/D,YAAY;QACZ,YAAY;QACZ,iBAAiB;QACjB,YAAY;QACZ,YAAY;QAEZ,MAAM,OAAO,GAAU,EAAE,CAAC;QAC1B,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;QAED,SAAS,CAAC,IAAI,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,QAAQ,GAAG,aAA6B,CAAC;IAC/C,MAAM,cAAc,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,QAAQ,CAAC;IAEvD,uCAAuC;IACvC,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAEjE,cAAc;IACd,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE3B,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAE9B,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,iCAAiC;IAC5D,MAAM,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE1B,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC;IACzC,MAAM,wBAAwB,GAAG,UAAU,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAEpE,IAAI,UAAU,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,UAAU,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;QAC/D,OAAO,CAAC,KAAK,CACT,mGAAmG,CACtG,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC;IAE9B,MAAM,SAAS,GAAG,IAAI,YAAY,CAC9B,wBAAwB,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACzD,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,SAAS,CACzB,wBAAwB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAC9D,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,IAAI,YAAY,CACrC,wBAAwB,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CACjD,CAAC;IACF,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,SAAS,EAAE,CAAC;QACZ,YAAY,GAAG,wBAAwB;YACnC,CAAC,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC;YACpB,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,YAAY,CAAC,CAAC;IAElD,0DAA0D;IAC1D,4EAA4E;IAC5E,gFAAgF;IAChF,8FAA8F;IAE9F,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC5B,8CAA8C;QAC9C,iBAAiB;QACjB,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1B,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAEtB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,kBAAkB;gBACrD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEpC,MAAM,aAAa,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;gBAEzC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC1B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC1B,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAEzB,IAAI,aAAa,EAAE,CAAC;oBAChB,MAAM,MAAM,GAAG,UAAU,CACrB,CAAC,EACD,CAAC,EACD,EAAE,EACF,EAAE,EACF,MAAM,EACN,aAAa,EACb,QAAQ,EACR,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,CACL,CAAC,CAAC,sBAAsB;oBACzB,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,6BAA6B;oBACnE,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;oBACrC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACzC,CAAC;gBAED,gBAAgB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC;gBACpC,CAAC,EAAE,CAAC;YACR,CAAC;QACL,CAAC;QAED,cAAc;QACd,CAAC,GAAG,CAAC,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACtB,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAE5B,MAAM,MAAM,GACR,CAAC,MAAM;oBACP,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACtF,MAAM,MAAM,GACR,CAAC,MAAM;oBACP,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACtF,MAAM,MAAM,GACR,CAAC,MAAM;oBACP,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACtF,MAAM,MAAM,GACR,CAAC,MAAM;oBACP,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBAEtF,aAAa;gBACb,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;oBACnB,kBAAkB;oBAClB,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC9B,CAAC;oBAED,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC9B,CAAC;gBACL,CAAC;qBAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;oBAC1B,kBAAkB;oBAClB,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC9B,CAAC;oBAED,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC9B,CAAC;gBACL,CAAC;gBAED,SAAS;gBACT,IAAI,SAAS,EAAE,CAAC;oBACZ,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;wBACnB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;oBAED,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;wBACnB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;oBAED,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;wBAClC,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;oBAED,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;wBAClC,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;oBAED,WAAW;oBACX,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;wBAC7C,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;oBAED,WAAW;oBACX,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;wBAC7C,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;oBAC1B,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,0CAA0C;QAE1C,cAAc;QACd,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9B,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB;gBAEzC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACtB,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAClC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAE5B,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACzE,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACzE,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBACzE,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;gBAEzE,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAErC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAErC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB;gBACnD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAErC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;gBACvB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB;gBACnD,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAErC,MAAM,aAAa,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,8FAA8F;gBACtI,MAAM,aAAa,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;gBAEpD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC5B,4BAA4B;oBAC5B,SAAS;gBACb,CAAC;gBAED,aAAa;gBACb,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;oBACnB,kBAAkB;oBAClB,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,IAAI,SAAS,EAAE,CAAC;4BACZ,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BAEtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBAED,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;oBAC1C,CAAC;oBAED,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,IAAI,SAAS,EAAE,CAAC;4BACZ,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BAEtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBACD,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;oBAC1C,CAAC;gBACL,CAAC;qBAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;oBAC1B,kBAAkB;oBAClB,IAAI,MAAM,EAAE,CAAC;wBACT,0BAA0B;wBAC1B,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,IAAI,SAAS,EAAE,CAAC;4BACZ,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BAEtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBAED,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;oBAC1C,CAAC;oBAED,IAAI,MAAM,EAAE,CAAC;wBACT,2BAA2B;wBAC3B,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;wBACvB,MAAM,EAAE,GAAG,CAAC,CAAC;wBACb,CAAC,EAAE,CAAC;wBACJ,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACpB,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAEpB,IAAI,SAAS,EAAE,CAAC;4BACZ,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BAEtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;4BACtB,WAAW,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC1B,CAAC;wBAED,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;wBACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;oBAC1C,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAeD,MAAM,mBAAmB,GAAe;QACpC,SAAS;QACT,OAAO;QACP,eAAe;QACf,gBAAgB;QAChB,WAAW;QACX,eAAe;QACf,kBAAkB;KACrB,CAAC;IAEF,OAAO,mBAAmB,CAAC;AAC/B,CAAC"}
|
1
|
+
{"version":3,"file":"webworker.js","sourceRoot":"","sources":["../../../src/layers/map/webworker.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import type { LayerContext, UpdateParameters } from "@deck.gl/core
|
2
|
-
import { Layer } from "@deck.gl/core
|
1
|
+
import type { Color, LayerContext, UpdateParameters } from "@deck.gl/core";
|
2
|
+
import { Layer } from "@deck.gl/core";
|
3
3
|
import { Model } from "@luma.gl/engine";
|
4
|
-
import type {
|
4
|
+
import type { Device } from "@luma.gl/core";
|
5
5
|
import type { ExtendedLayerProps } from "../utils/layerTools";
|
6
6
|
export interface NorthArrow3DLayerProps extends ExtendedLayerProps {
|
7
7
|
color: Color;
|
@@ -11,7 +11,7 @@ export default class NorthArrow3DLayer extends Layer<NorthArrow3DLayerProps> {
|
|
11
11
|
shouldUpdateState(): boolean;
|
12
12
|
updateState({ context }: UpdateParameters<this>): void;
|
13
13
|
draw({ moduleParameters, uniforms, context }: any): void;
|
14
|
-
_getModels(gl:
|
14
|
+
_getModels(gl: Device): {
|
15
15
|
model: Model;
|
16
16
|
models: Model[];
|
17
17
|
modelsByName: {
|
@@ -1,9 +1,8 @@
|
|
1
|
-
import { Layer,
|
2
|
-
import
|
3
|
-
import { Model, Geometry } from "@luma.gl/engine";
|
1
|
+
import { Layer, OrthographicViewport, project } from "@deck.gl/core";
|
2
|
+
import { Geometry, Model } from "@luma.gl/engine";
|
4
3
|
import { Vector3 } from "@math.gl/core";
|
5
|
-
import vertexShader from "./northarrow-vertex.glsl";
|
6
4
|
import fragmentShader from "./northarrow-fragment.glsl";
|
5
|
+
import vertexShader from "./northarrow-vertex.glsl";
|
7
6
|
const defaultProps = {
|
8
7
|
"@@type": "NorthArrow3DLayer",
|
9
8
|
name: "NorthArrow3D",
|
@@ -13,15 +12,14 @@ const defaultProps = {
|
|
13
12
|
};
|
14
13
|
export default class NorthArrow3DLayer extends Layer {
|
15
14
|
initializeState(context) {
|
16
|
-
|
17
|
-
this.setState(this._getModels(gl));
|
15
|
+
this.setState(this._getModels(context.device));
|
18
16
|
}
|
19
17
|
shouldUpdateState() {
|
20
18
|
return true;
|
21
19
|
}
|
22
20
|
updateState({ context }) {
|
23
|
-
if (context.
|
24
|
-
this.setState(this._getModels(context.
|
21
|
+
if (context.device) {
|
22
|
+
this.setState(this._getModels(context.device));
|
25
23
|
}
|
26
24
|
}
|
27
25
|
// Signature from the base class, eslint doesn't like the any type.
|
@@ -32,7 +30,6 @@ export default class NorthArrow3DLayer extends Layer {
|
|
32
30
|
super.draw({ moduleParameters, uniforms, context });
|
33
31
|
gl.enable(gl.DEPTH_TEST);
|
34
32
|
}
|
35
|
-
//eslint-disable-next-line
|
36
33
|
_getModels(gl) {
|
37
34
|
const model_lines = GetArrowLines();
|
38
35
|
const is_orthographic = this.context.viewport.constructor === OrthographicViewport;
|
@@ -73,7 +70,7 @@ export default class NorthArrow3DLayer extends Layer {
|
|
73
70
|
fs: fragmentShader,
|
74
71
|
uniforms: { uColor: color },
|
75
72
|
geometry: new Geometry({
|
76
|
-
|
73
|
+
topology: "line-list",
|
77
74
|
attributes: {
|
78
75
|
positions: new Float32Array(lines),
|
79
76
|
},
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"northArrow3DLayer.js","sourceRoot":"","sources":["../../../src/layers/northarrow/northArrow3DLayer.ts"],"names":[],"mappings":"
|
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 graph-layer-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 (
|
1
|
+
declare const _default: "#version 300 es\n#define SHADER_NAME graph-layer-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,8 +1,7 @@
|
|
1
|
-
import type {
|
2
|
-
import { Layer } from "@deck.gl/core
|
1
|
+
import type { Color, PickingInfo, UpdateParameters } from "@deck.gl/core";
|
2
|
+
import { Layer } from "@deck.gl/core";
|
3
3
|
import { Model } from "@luma.gl/engine";
|
4
|
-
import type { LayerPickInfo } from "../utils/layerTools";
|
5
|
-
import type { ExtendedLayerProps } from "../utils/layerTools";
|
4
|
+
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
6
5
|
type PieProperties = [{
|
7
6
|
color: Color;
|
8
7
|
label: string;
|
@@ -1,10 +1,10 @@
|
|
1
|
-
import { Layer, picking, project } from "@deck.gl/core
|
2
|
-
import GL from "@luma.gl/constants";
|
3
|
-
import {
|
1
|
+
import { Layer, picking, project } from "@deck.gl/core";
|
2
|
+
import { GL } from "@luma.gl/constants";
|
3
|
+
import { Geometry, Model } from "@luma.gl/engine";
|
4
4
|
import { Vector2 } from "@math.gl/core";
|
5
5
|
import { createPropertyData } from "../utils/layerTools";
|
6
|
-
import vertexShader from "./vertex.glsl";
|
7
6
|
import fragmentShader from "./fragment.glsl";
|
7
|
+
import vertexShader from "./vertex.glsl";
|
8
8
|
const defaultProps = {
|
9
9
|
"@@type": "PieChartLayer",
|
10
10
|
name: "Pie chart",
|
@@ -26,8 +26,7 @@ export default class PieChartLayer extends Layer {
|
|
26
26
|
if (!((_a = this.state) === null || _a === void 0 ? void 0 : _a["model"])) {
|
27
27
|
const pieData = this.props.data;
|
28
28
|
if (pieData === null || pieData === void 0 ? void 0 : pieData.pies) {
|
29
|
-
|
30
|
-
this.setState(this.getModel(gl, pieData));
|
29
|
+
this.setState(this.getModel(context.device, pieData));
|
31
30
|
}
|
32
31
|
}
|
33
32
|
}
|
@@ -106,7 +105,7 @@ export default class PieChartLayer extends Layer {
|
|
106
105
|
vs: vertexShader,
|
107
106
|
fs: fragmentShader,
|
108
107
|
geometry: new Geometry({
|
109
|
-
|
108
|
+
topology: "triangle-list",
|
110
109
|
attributes: {
|
111
110
|
positions: { value: new Float32Array(vertexs), size: 3 },
|
112
111
|
colors: { value: new Float32Array(colors), size: 3 },
|
@@ -146,7 +145,8 @@ export default class PieChartLayer extends Layer {
|
|
146
145
|
if (!this.props.depthTest) {
|
147
146
|
gl.disable(GL.DEPTH_TEST);
|
148
147
|
}
|
149
|
-
model.setUniforms({ scale })
|
148
|
+
model.setUniforms({ scale });
|
149
|
+
model.draw(context.renderPass);
|
150
150
|
if (!this.props.depthTest) {
|
151
151
|
gl.enable(GL.DEPTH_TEST);
|
152
152
|
}
|
@@ -163,7 +163,8 @@ export default class PieChartLayer extends Layer {
|
|
163
163
|
const g = info.color[1];
|
164
164
|
const b = info.color[2];
|
165
165
|
const pieIndex = 256 * 256 * r + 256 * g + b;
|
166
|
-
const
|
166
|
+
const pieInfo = this.state["pieInfo"];
|
167
|
+
const [pie_label, pie_frac] = pieInfo[pieIndex];
|
167
168
|
const layer_properties = [];
|
168
169
|
layer_properties.push(createPropertyData(pie_label, pie_frac));
|
169
170
|
return Object.assign(Object.assign({}, info), { properties: layer_properties });
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"pieChartLayer.js","sourceRoot":"","sources":["../../../src/layers/piechart/pieChartLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"pieChartLayer.js","sourceRoot":"","sources":["../../../src/layers/piechart/pieChartLayer.ts"],"names":[],"mappings":"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"}
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/// <reference types="react" />
|
2
|
-
import type { PickingInfo, UpdateParameters } from "@deck.gl/core
|
3
|
-
import { CompositeLayer } from "@deck.gl/core
|
4
|
-
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
2
|
+
import type { PickingInfo, UpdateParameters } from "@deck.gl/core";
|
3
|
+
import { CompositeLayer } from "@deck.gl/core";
|
5
4
|
import type { ReportBoundingBoxAction } from "../../components/Map";
|
5
|
+
import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
|
6
6
|
import { PrivatePointsLayer } from "./privatePointsLayer";
|
7
7
|
export interface PointsLayerProps extends ExtendedLayerProps {
|
8
8
|
/**
|