@deck.gl/geo-layers 9.4.0-alpha.2 → 9.4.0-beta.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/dist.dev.js +6375 -5029
- package/dist/geo-cell-layer/GeoCellLayer.d.ts.map +1 -1
- package/dist/geo-cell-layer/GeoCellLayer.js +2 -1
- package/dist/geo-cell-layer/GeoCellLayer.js.map +1 -1
- package/dist/index.cjs +21181 -1889
- package/dist/index.cjs.map +3 -4
- package/dist/mesh-layer/mesh-layer-uniforms.d.ts +1 -0
- package/dist/mesh-layer/mesh-layer-uniforms.d.ts.map +1 -1
- package/dist/mesh-layer/mesh-layer-uniforms.js +8 -0
- package/dist/mesh-layer/mesh-layer-uniforms.js.map +1 -1
- package/dist/mesh-layer/mesh-layer.d.ts.map +1 -1
- package/dist/mesh-layer/mesh-layer.js +15 -6
- package/dist/mesh-layer/mesh-layer.js.map +1 -1
- package/dist/mesh-layer/mesh-layer.wgsl.d.ts +3 -0
- package/dist/mesh-layer/mesh-layer.wgsl.d.ts.map +1 -0
- package/dist/mesh-layer/mesh-layer.wgsl.js +130 -0
- package/dist/mesh-layer/mesh-layer.wgsl.js.map +1 -0
- package/dist/mesh-layer/mesh-pbr-material.d.ts +252 -0
- package/dist/mesh-layer/mesh-pbr-material.d.ts.map +1 -0
- package/dist/mesh-layer/mesh-pbr-material.js +27 -0
- package/dist/mesh-layer/mesh-pbr-material.js.map +1 -0
- package/dist/trips-layer/trips-layer-uniforms.d.ts +1 -0
- package/dist/trips-layer/trips-layer-uniforms.d.ts.map +1 -1
- package/dist/trips-layer/trips-layer-uniforms.js +14 -3
- package/dist/trips-layer/trips-layer-uniforms.js.map +1 -1
- package/dist/trips-layer/trips-layer.d.ts +6 -1
- package/dist/trips-layer/trips-layer.d.ts.map +1 -1
- package/dist/trips-layer/trips-layer.js +57 -24
- package/dist/trips-layer/trips-layer.js.map +1 -1
- package/dist/trips-layer/trips-layer.wgsl.d.ts +11 -0
- package/dist/trips-layer/trips-layer.wgsl.d.ts.map +1 -0
- package/dist/trips-layer/trips-layer.wgsl.js +48 -0
- package/dist/trips-layer/trips-layer.wgsl.js.map +1 -0
- package/dist.min.js +1415 -149
- package/dist.webgl-only/a5-layer/a5-layer.js +30 -0
- package/dist.webgl-only/a5-layer/a5-layer.js.map +1 -0
- package/dist.webgl-only/geo-cell-layer/GeoCellLayer.js +57 -0
- package/dist.webgl-only/geo-cell-layer/GeoCellLayer.js.map +1 -0
- package/dist.webgl-only/geohash-layer/geohash-layer.js +24 -0
- package/dist.webgl-only/geohash-layer/geohash-layer.js.map +1 -0
- package/dist.webgl-only/geohash-layer/geohash-utils.js +54 -0
- package/dist.webgl-only/geohash-layer/geohash-utils.js.map +1 -0
- package/dist.webgl-only/great-circle-layer/great-circle-layer.js +17 -0
- package/dist.webgl-only/great-circle-layer/great-circle-layer.js.map +1 -0
- package/dist.webgl-only/h3-layers/h3-cluster-layer.js +52 -0
- package/dist.webgl-only/h3-layers/h3-cluster-layer.js.map +1 -0
- package/dist.webgl-only/h3-layers/h3-hexagon-layer.js +209 -0
- package/dist.webgl-only/h3-layers/h3-hexagon-layer.js.map +1 -0
- package/dist.webgl-only/h3-layers/h3-utils.js +60 -0
- package/dist.webgl-only/h3-layers/h3-utils.js.map +1 -0
- package/dist.webgl-only/index.cjs +22542 -0
- package/dist.webgl-only/index.cjs.map +6 -0
- package/dist.webgl-only/index.js +22 -0
- package/dist.webgl-only/index.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-fragment.glsl.js +34 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-fragment.glsl.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-uniforms.js +19 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-uniforms.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-vertex.glsl.js +64 -0
- package/dist.webgl-only/mesh-layer/mesh-layer-vertex.glsl.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-layer.js +149 -0
- package/dist.webgl-only/mesh-layer/mesh-layer.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-layer.wgsl.js +5 -0
- package/dist.webgl-only/mesh-layer/mesh-layer.wgsl.js.map +1 -0
- package/dist.webgl-only/mesh-layer/mesh-pbr-material.js +27 -0
- package/dist.webgl-only/mesh-layer/mesh-pbr-material.js.map +1 -0
- package/dist.webgl-only/mvt-layer/coordinate-transform.js +45 -0
- package/dist.webgl-only/mvt-layer/coordinate-transform.js.map +1 -0
- package/dist.webgl-only/mvt-layer/find-index-binary.js +100 -0
- package/dist.webgl-only/mvt-layer/find-index-binary.js.map +1 -0
- package/dist.webgl-only/mvt-layer/mvt-layer.js +315 -0
- package/dist.webgl-only/mvt-layer/mvt-layer.js.map +1 -0
- package/dist.webgl-only/quadkey-layer/quadkey-layer.js +27 -0
- package/dist.webgl-only/quadkey-layer/quadkey-layer.js.map +1 -0
- package/dist.webgl-only/quadkey-layer/quadkey-utils.js +30 -0
- package/dist.webgl-only/quadkey-layer/quadkey-utils.js.map +1 -0
- package/dist.webgl-only/s2-layer/s2-geometry.js +127 -0
- package/dist.webgl-only/s2-layer/s2-geometry.js.map +1 -0
- package/dist.webgl-only/s2-layer/s2-layer.js +24 -0
- package/dist.webgl-only/s2-layer/s2-layer.js.map +1 -0
- package/dist.webgl-only/s2-layer/s2-utils.js +91 -0
- package/dist.webgl-only/s2-layer/s2-utils.js.map +1 -0
- package/dist.webgl-only/terrain-layer/terrain-layer.js +260 -0
- package/dist.webgl-only/terrain-layer/terrain-layer.js.map +1 -0
- package/dist.webgl-only/tile-3d-layer/tile-3d-layer.js +343 -0
- package/dist.webgl-only/tile-3d-layer/tile-3d-layer.js.map +1 -0
- package/dist.webgl-only/tile-layer/tile-layer.js +233 -0
- package/dist.webgl-only/tile-layer/tile-layer.js.map +1 -0
- package/dist.webgl-only/tileset-2d/index.js +7 -0
- package/dist.webgl-only/tileset-2d/index.js.map +1 -0
- package/dist.webgl-only/tileset-2d/memoize.js +45 -0
- package/dist.webgl-only/tileset-2d/memoize.js.map +1 -0
- package/dist.webgl-only/tileset-2d/tile-2d-header.js +141 -0
- package/dist.webgl-only/tileset-2d/tile-2d-header.js.map +1 -0
- package/dist.webgl-only/tileset-2d/tile-2d-traversal.js +208 -0
- package/dist.webgl-only/tileset-2d/tile-2d-traversal.js.map +1 -0
- package/dist.webgl-only/tileset-2d/tileset-2d.js +557 -0
- package/dist.webgl-only/tileset-2d/tileset-2d.js.map +1 -0
- package/dist.webgl-only/tileset-2d/types.js +5 -0
- package/dist.webgl-only/tileset-2d/types.js.map +1 -0
- package/dist.webgl-only/tileset-2d/utils.js +246 -0
- package/dist.webgl-only/tileset-2d/utils.js.map +1 -0
- package/dist.webgl-only/trips-layer/trips-layer-uniforms.js +23 -0
- package/dist.webgl-only/trips-layer/trips-layer-uniforms.js.map +1 -0
- package/dist.webgl-only/trips-layer/trips-layer.js +97 -0
- package/dist.webgl-only/trips-layer/trips-layer.js.map +1 -0
- package/dist.webgl-only/trips-layer/trips-layer.wgsl.js +3 -0
- package/dist.webgl-only/trips-layer/trips-layer.wgsl.js.map +1 -0
- package/dist.webgl-only/wms-layer/utils.js +17 -0
- package/dist.webgl-only/wms-layer/utils.js.map +1 -0
- package/dist.webgl-only/wms-layer/wms-layer.js +198 -0
- package/dist.webgl-only/wms-layer/wms-layer.js.map +1 -0
- package/package.json +11 -6
- package/src/geo-cell-layer/GeoCellLayer.ts +2 -0
- package/src/mesh-layer/mesh-layer-uniforms.ts +9 -0
- package/src/mesh-layer/mesh-layer.ts +15 -6
- package/src/mesh-layer/mesh-layer.wgsl.ts +130 -0
- package/src/mesh-layer/mesh-pbr-material.ts +39 -0
- package/src/trips-layer/trips-layer-uniforms.ts +15 -3
- package/src/trips-layer/trips-layer.ts +84 -38
- package/src/trips-layer/trips-layer.wgsl.ts +63 -0
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
/* eslint-disable max-len */
|
|
5
|
+
export { default as A5Layer } from "./a5-layer/a5-layer.js";
|
|
6
|
+
export { WMSLayer as _WMSLayer } from "./wms-layer/wms-layer.js";
|
|
7
|
+
export { default as GreatCircleLayer } from "./great-circle-layer/great-circle-layer.js";
|
|
8
|
+
export { default as S2Layer } from "./s2-layer/s2-layer.js";
|
|
9
|
+
export { default as QuadkeyLayer } from "./quadkey-layer/quadkey-layer.js";
|
|
10
|
+
export { default as TileLayer } from "./tile-layer/tile-layer.js";
|
|
11
|
+
export { default as TripsLayer } from "./trips-layer/trips-layer.js";
|
|
12
|
+
export { default as H3ClusterLayer } from "./h3-layers/h3-cluster-layer.js";
|
|
13
|
+
export { default as H3HexagonLayer } from "./h3-layers/h3-hexagon-layer.js";
|
|
14
|
+
export { default as Tile3DLayer } from "./tile-3d-layer/tile-3d-layer.js";
|
|
15
|
+
export { default as TerrainLayer } from "./terrain-layer/terrain-layer.js";
|
|
16
|
+
export { default as MVTLayer } from "./mvt-layer/mvt-layer.js";
|
|
17
|
+
export { default as GeohashLayer } from "./geohash-layer/geohash-layer.js";
|
|
18
|
+
export { default as _GeoCellLayer } from "./geo-cell-layer/GeoCellLayer.js";
|
|
19
|
+
export { getURLFromTemplate as _getURLFromTemplate } from "./tileset-2d/index.js";
|
|
20
|
+
export { Tileset2D as _Tileset2D } from "./tileset-2d/index.js";
|
|
21
|
+
export { Tile2DHeader as _Tile2DHeader } from "./tileset-2d/index.js";
|
|
22
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,4BAA4B;AAE5B,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,+BAA4B;AACvD,OAAO,EAAC,QAAQ,IAAI,SAAS,EAAC,iCAA8B;AAC5D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,mDAAgD;AACpF,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,+BAA4B;AACvD,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,mCAAgC;AAC7D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,qCAAkC;AAChE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,wCAAqC;AACvE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,wCAAqC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,yCAAsC;AACrE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AACtE,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,iCAA8B;AAC1D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,yCAAsC;AAEtE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,yCAAsC;AAwBvE,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,8BAA2B;AAC7E,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,8BAA2B;AAC3D,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,8BAA2B"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
export default `#version 300 es
|
|
5
|
+
#define SHADER_NAME simple-mesh-layer-fs
|
|
6
|
+
precision highp float;
|
|
7
|
+
uniform sampler2D sampler;
|
|
8
|
+
in vec2 vTexCoord;
|
|
9
|
+
in vec3 cameraPosition;
|
|
10
|
+
in vec3 normals_commonspace;
|
|
11
|
+
in vec4 position_commonspace;
|
|
12
|
+
in vec4 vColor;
|
|
13
|
+
out vec4 fragColor;
|
|
14
|
+
void main(void) {
|
|
15
|
+
#ifdef MODULE_PBRMATERIAL
|
|
16
|
+
fragColor = vColor * pbr_filterColor(vec4(0));
|
|
17
|
+
geometry.uv = pbr_vUV0;
|
|
18
|
+
fragColor.a *= layer.opacity;
|
|
19
|
+
#else
|
|
20
|
+
geometry.uv = vTexCoord;
|
|
21
|
+
vec3 normal;
|
|
22
|
+
if (simpleMesh.flatShading) {
|
|
23
|
+
normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
|
|
24
|
+
} else {
|
|
25
|
+
normal = normals_commonspace;
|
|
26
|
+
}
|
|
27
|
+
vec4 color = simpleMesh.hasTexture ? texture(sampler, vTexCoord) : vColor;
|
|
28
|
+
vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
|
|
29
|
+
fragColor = vec4(lightColor, color.a * layer.opacity);
|
|
30
|
+
#endif
|
|
31
|
+
DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
32
|
+
}
|
|
33
|
+
`;
|
|
34
|
+
//# sourceMappingURL=mesh-layer-fragment.glsl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-layer-fragment.glsl.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-fragment.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2CE"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
const uniformBlock = `\
|
|
5
|
+
layout(std140) uniform meshUniforms {
|
|
6
|
+
bool pickFeatureIds;
|
|
7
|
+
} mesh;
|
|
8
|
+
`;
|
|
9
|
+
const source = null;
|
|
10
|
+
export const meshUniforms = {
|
|
11
|
+
name: 'mesh',
|
|
12
|
+
vs: uniformBlock,
|
|
13
|
+
fs: uniformBlock,
|
|
14
|
+
source,
|
|
15
|
+
uniformTypes: {
|
|
16
|
+
pickFeatureIds: 'f32'
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=mesh-layer-uniforms.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-layer-uniforms.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,MAAM,YAAY,GAAG;;;;CAIpB,CAAC;AAEF,MAAM,MAAM,QAMV;AAMF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,YAAY;IAChB,EAAE,EAAE,YAAY;IAChB,MAAM;IACN,YAAY,EAAE;QACZ,cAAc,EAAE,KAAK;KACtB;CACyC,CAAC"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
export default `#version 300 es
|
|
5
|
+
#define SHADER_NAME simple-mesh-layer-vs
|
|
6
|
+
in vec3 positions;
|
|
7
|
+
in vec3 normals;
|
|
8
|
+
in vec3 colors;
|
|
9
|
+
in vec2 texCoords;
|
|
10
|
+
in vec4 uvRegions;
|
|
11
|
+
in float rowIndexes;
|
|
12
|
+
in vec4 instanceColors;
|
|
13
|
+
in vec3 instanceModelMatrixCol0;
|
|
14
|
+
in vec3 instanceModelMatrixCol1;
|
|
15
|
+
in vec3 instanceModelMatrixCol2;
|
|
16
|
+
out vec2 vTexCoord;
|
|
17
|
+
out vec3 cameraPosition;
|
|
18
|
+
out vec3 normals_commonspace;
|
|
19
|
+
out vec4 position_commonspace;
|
|
20
|
+
out vec4 vColor;
|
|
21
|
+
vec2 applyUVRegion(vec2 uv) {
|
|
22
|
+
#ifdef HAS_UV_REGIONS
|
|
23
|
+
return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
|
|
24
|
+
#else
|
|
25
|
+
return uv;
|
|
26
|
+
#endif
|
|
27
|
+
}
|
|
28
|
+
void main(void) {
|
|
29
|
+
vec2 uv = applyUVRegion(texCoords);
|
|
30
|
+
geometry.uv = uv;
|
|
31
|
+
if (mesh.pickFeatureIds) {
|
|
32
|
+
geometry.pickingColor = picking_getPickingColorFromIndex(rowIndexes);
|
|
33
|
+
} else {
|
|
34
|
+
geometry.pickingColor = picking_getPickingColorFromInstanceID();
|
|
35
|
+
}
|
|
36
|
+
mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
|
|
37
|
+
vTexCoord = uv;
|
|
38
|
+
cameraPosition = project.cameraPosition;
|
|
39
|
+
vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
|
|
40
|
+
vec3 pos = (instanceModelMatrix * positions) * simpleMesh.sizeScale;
|
|
41
|
+
vec3 projectedPosition = project_position(positions);
|
|
42
|
+
position_commonspace = vec4(projectedPosition, 1.0);
|
|
43
|
+
gl_Position = project_common_position_to_clipspace(position_commonspace);
|
|
44
|
+
geometry.position = position_commonspace;
|
|
45
|
+
normals_commonspace = project_normal(instanceModelMatrix * normals);
|
|
46
|
+
geometry.normal = normals_commonspace;
|
|
47
|
+
DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
|
|
48
|
+
#ifdef MODULE_PBRMATERIAL
|
|
49
|
+
pbr_vPosition = geometry.position.xyz;
|
|
50
|
+
#ifdef HAS_NORMALS
|
|
51
|
+
pbr_vNormal = geometry.normal;
|
|
52
|
+
#endif
|
|
53
|
+
#ifdef HAS_UV
|
|
54
|
+
pbr_vUV0 = uv;
|
|
55
|
+
#else
|
|
56
|
+
pbr_vUV0 = vec2(0., 0.);
|
|
57
|
+
#endif
|
|
58
|
+
pbr_vUV1 = vec2(0., 0.);
|
|
59
|
+
geometry.uv = pbr_vUV0;
|
|
60
|
+
#endif
|
|
61
|
+
DECKGL_FILTER_COLOR(vColor, geometry);
|
|
62
|
+
}
|
|
63
|
+
`;
|
|
64
|
+
//# sourceMappingURL=mesh-layer-vertex.glsl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8EE"}
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
import { parsePBRMaterial } from '@luma.gl/gltf';
|
|
5
|
+
import { Model } from '@luma.gl/engine';
|
|
6
|
+
import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
|
|
7
|
+
import { meshUniforms } from "./mesh-layer-uniforms.js";
|
|
8
|
+
import { meshPbrMaterial } from "./mesh-pbr-material.js";
|
|
9
|
+
import vs from "./mesh-layer-vertex.glsl.js";
|
|
10
|
+
import fs from "./mesh-layer-fragment.glsl.js";
|
|
11
|
+
import source from "./mesh-layer.wgsl.js";
|
|
12
|
+
function validateGeometryAttributes(attributes) {
|
|
13
|
+
const positionAttribute = attributes.positions || attributes.POSITION;
|
|
14
|
+
const vertexCount = positionAttribute.value.length / positionAttribute.size;
|
|
15
|
+
const hasColorAttribute = attributes.COLOR_0 || attributes.colors;
|
|
16
|
+
if (!hasColorAttribute) {
|
|
17
|
+
attributes.colors = {
|
|
18
|
+
size: 4,
|
|
19
|
+
value: new Uint8Array(vertexCount * 4).fill(255),
|
|
20
|
+
normalized: true
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
const defaultProps = {
|
|
25
|
+
pbrMaterial: { type: 'object', value: null },
|
|
26
|
+
featureIds: { type: 'array', value: null, optional: true }
|
|
27
|
+
};
|
|
28
|
+
class MeshLayer extends SimpleMeshLayer {
|
|
29
|
+
getShaders() {
|
|
30
|
+
const shaders = super.getShaders();
|
|
31
|
+
return {
|
|
32
|
+
...shaders,
|
|
33
|
+
vs,
|
|
34
|
+
fs,
|
|
35
|
+
source,
|
|
36
|
+
modules: [...shaders.modules, meshPbrMaterial, meshUniforms]
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
initializeState() {
|
|
40
|
+
const { featureIds } = this.props;
|
|
41
|
+
super.initializeState();
|
|
42
|
+
const attributeManager = this.getAttributeManager();
|
|
43
|
+
if (featureIds) {
|
|
44
|
+
// attributeManager is always defined in a primitive layer
|
|
45
|
+
attributeManager.add({
|
|
46
|
+
/** Feature id for each mesh vertex. */
|
|
47
|
+
rowIndexes: {
|
|
48
|
+
type: 'uint32',
|
|
49
|
+
size: 1,
|
|
50
|
+
noAlloc: true,
|
|
51
|
+
// eslint-disable-next-line @typescript-eslint/unbound-method
|
|
52
|
+
update: this.calculateFeatureIdsPickingIndexes
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
updateState(params) {
|
|
58
|
+
super.updateState(params);
|
|
59
|
+
const { props, oldProps } = params;
|
|
60
|
+
if (props.pbrMaterial !== oldProps.pbrMaterial) {
|
|
61
|
+
this.updatePbrMaterialUniforms(props.pbrMaterial);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
draw(opts) {
|
|
65
|
+
const { featureIds } = this.props;
|
|
66
|
+
const { model } = this.state;
|
|
67
|
+
if (!model) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const meshProps = {
|
|
71
|
+
pickFeatureIds: Boolean(featureIds)
|
|
72
|
+
};
|
|
73
|
+
const pbrProjectionProps = {
|
|
74
|
+
camera: this.context.viewport.cameraPosition
|
|
75
|
+
};
|
|
76
|
+
model.shaderInputs.setProps({
|
|
77
|
+
pbrProjection: pbrProjectionProps,
|
|
78
|
+
mesh: meshProps
|
|
79
|
+
});
|
|
80
|
+
super.draw(opts);
|
|
81
|
+
}
|
|
82
|
+
getModel(mesh) {
|
|
83
|
+
const { id } = this.props;
|
|
84
|
+
const parsedPBRMaterial = this.parseMaterial(this.props.pbrMaterial, mesh);
|
|
85
|
+
// Keep material to explicitly remove textures
|
|
86
|
+
this.setState({ parsedPBRMaterial });
|
|
87
|
+
const shaders = this.getShaders();
|
|
88
|
+
validateGeometryAttributes(mesh.attributes);
|
|
89
|
+
const model = new Model(this.context.device, {
|
|
90
|
+
...this.getShaders(),
|
|
91
|
+
id,
|
|
92
|
+
geometry: mesh,
|
|
93
|
+
bufferLayout: this.getAttributeManager().getBufferLayouts(),
|
|
94
|
+
defines: {
|
|
95
|
+
...shaders.defines,
|
|
96
|
+
...parsedPBRMaterial?.defines,
|
|
97
|
+
HAS_UV_REGIONS: mesh.attributes.uvRegions ? 1 : 0,
|
|
98
|
+
HAS_FEATURE_IDS: this.props.featureIds ? 1 : 0
|
|
99
|
+
},
|
|
100
|
+
parameters: parsedPBRMaterial?.parameters,
|
|
101
|
+
isInstanced: true
|
|
102
|
+
});
|
|
103
|
+
return model;
|
|
104
|
+
}
|
|
105
|
+
updatePbrMaterialUniforms(material) {
|
|
106
|
+
const { model } = this.state;
|
|
107
|
+
if (model) {
|
|
108
|
+
const { mesh } = this.props;
|
|
109
|
+
const parsedPBRMaterial = this.parseMaterial(material, mesh);
|
|
110
|
+
// Keep material to explicitly remove textures
|
|
111
|
+
this.setState({ parsedPBRMaterial });
|
|
112
|
+
const { pbr_baseColorSampler } = parsedPBRMaterial.bindings;
|
|
113
|
+
const { emptyTexture } = this.state;
|
|
114
|
+
const meshTexture = pbr_baseColorSampler || emptyTexture;
|
|
115
|
+
const simpleMeshProps = {
|
|
116
|
+
...({ sampler: meshTexture }),
|
|
117
|
+
hasTexture: Boolean(pbr_baseColorSampler)
|
|
118
|
+
};
|
|
119
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
120
|
+
const { camera, ...pbrMaterialProps } = {
|
|
121
|
+
...parsedPBRMaterial.bindings,
|
|
122
|
+
...parsedPBRMaterial.uniforms
|
|
123
|
+
};
|
|
124
|
+
model.shaderInputs.setProps({ simpleMesh: simpleMeshProps, pbrMaterial: pbrMaterialProps });
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
parseMaterial(material, mesh) {
|
|
128
|
+
const unlit = Boolean(material.pbrMetallicRoughness && material.pbrMetallicRoughness.baseColorTexture);
|
|
129
|
+
return parsePBRMaterial(this.context.device, { unlit, ...material }, { NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords }, {
|
|
130
|
+
pbrDebug: false,
|
|
131
|
+
lights: true,
|
|
132
|
+
useTangents: false
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
calculateFeatureIdsPickingIndexes(attribute) {
|
|
136
|
+
// This updater is only called if featureIds is not null
|
|
137
|
+
const featureIds = this.props.featureIds;
|
|
138
|
+
attribute.value = new Uint32Array(featureIds);
|
|
139
|
+
}
|
|
140
|
+
finalizeState(context) {
|
|
141
|
+
super.finalizeState(context);
|
|
142
|
+
this.state.parsedPBRMaterial?.generatedTextures.forEach(texture => texture.destroy());
|
|
143
|
+
this.setState({ parsedPBRMaterial: null });
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
MeshLayer.layerName = 'MeshLayer';
|
|
147
|
+
MeshLayer.defaultProps = defaultProps;
|
|
148
|
+
export default MeshLayer;
|
|
149
|
+
//# sourceMappingURL=mesh-layer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-layer.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-layer.wgsl.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.wgsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe,UAAU,MA6HvB"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
import { pbrMaterial } from '@luma.gl/shadertools';
|
|
5
|
+
// The stock PBR module still uses the pre-indexed UV field name in one helper and owns a
|
|
6
|
+
// separate camera uniform. Align it with the current PBR input struct and deck.gl's project
|
|
7
|
+
// module until these compatibility fixes can be made in luma.gl itself.
|
|
8
|
+
const source = pbrMaterial.source
|
|
9
|
+
.replace(/fn pbr_setPositionNormalTangentUV\([\s\S]*?\n}\n/, `fn pbr_setPositionNormalTangentUV(position: vec4f, normal: vec4f, tangent: vec4f, uv: vec2f)
|
|
10
|
+
{
|
|
11
|
+
fragmentInputs.pbr_vPosition = position.xyz;
|
|
12
|
+
fragmentInputs.pbr_vNormal = normal.xyz;
|
|
13
|
+
fragmentInputs.pbr_vTBN = mat3x3f(
|
|
14
|
+
vec3f(1.0, 0.0, 0.0),
|
|
15
|
+
vec3f(0.0, 1.0, 0.0),
|
|
16
|
+
vec3f(0.0, 0.0, 1.0)
|
|
17
|
+
);
|
|
18
|
+
fragmentInputs.pbr_vUV0 = uv;
|
|
19
|
+
fragmentInputs.pbr_vUV1 = uv;
|
|
20
|
+
}
|
|
21
|
+
`)
|
|
22
|
+
.replace(/pbrProjection\.camera/g, 'project.cameraPosition');
|
|
23
|
+
export const meshPbrMaterial = {
|
|
24
|
+
...pbrMaterial,
|
|
25
|
+
source
|
|
26
|
+
};
|
|
27
|
+
//# sourceMappingURL=mesh-pbr-material.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mesh-pbr-material.js","sourceRoot":"","sources":["../../src/mesh-layer/mesh-pbr-material.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AASjD,yFAAyF;AACzF,4FAA4F;AAC5F,wEAAwE;AACxE,MAAM,MAAM,GAAI,WAAW,CAAC,MAAiB;KAC1C,OAAO,CACN,kDAAkD,EAClD;;;;;;;;;;;;CAYH,CACE;KACA,OAAO,CAAC,wBAAwB,EAAE,wBAAwB,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,GAAG,WAAW;IACd,MAAM;CACqF,CAAC"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
import { lerp } from '@math.gl/core';
|
|
5
|
+
const availableTransformations = {
|
|
6
|
+
Point,
|
|
7
|
+
MultiPoint,
|
|
8
|
+
LineString,
|
|
9
|
+
MultiLineString,
|
|
10
|
+
Polygon,
|
|
11
|
+
MultiPolygon
|
|
12
|
+
};
|
|
13
|
+
function Point([pointX, pointY], [nw, se], viewport) {
|
|
14
|
+
const x = lerp(nw[0], se[0], pointX);
|
|
15
|
+
const y = lerp(nw[1], se[1], pointY);
|
|
16
|
+
return viewport.unprojectFlat([x, y]);
|
|
17
|
+
}
|
|
18
|
+
function getPoints(geometry, bbox, viewport) {
|
|
19
|
+
return geometry.map(g => Point(g, bbox, viewport));
|
|
20
|
+
}
|
|
21
|
+
function MultiPoint(multiPoint, bbox, viewport) {
|
|
22
|
+
return getPoints(multiPoint, bbox, viewport);
|
|
23
|
+
}
|
|
24
|
+
function LineString(line, bbox, viewport) {
|
|
25
|
+
return getPoints(line, bbox, viewport);
|
|
26
|
+
}
|
|
27
|
+
function MultiLineString(multiLineString, bbox, viewport) {
|
|
28
|
+
return multiLineString.map(lineString => LineString(lineString, bbox, viewport));
|
|
29
|
+
}
|
|
30
|
+
function Polygon(polygon, bbox, viewport) {
|
|
31
|
+
return polygon.map(polygonRing => getPoints(polygonRing, bbox, viewport));
|
|
32
|
+
}
|
|
33
|
+
function MultiPolygon(multiPolygon, bbox, viewport) {
|
|
34
|
+
return multiPolygon.map(polygon => Polygon(polygon, bbox, viewport));
|
|
35
|
+
}
|
|
36
|
+
export function transform(geometry, bbox, viewport) {
|
|
37
|
+
const nw = viewport.projectFlat([bbox.west, bbox.north]);
|
|
38
|
+
const se = viewport.projectFlat([bbox.east, bbox.south]);
|
|
39
|
+
const projectedBbox = [nw, se];
|
|
40
|
+
return {
|
|
41
|
+
...geometry,
|
|
42
|
+
coordinates: availableTransformations[geometry.type](geometry.coordinates, projectedBbox, viewport)
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=coordinate-transform.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coordinate-transform.js","sourceRoot":"","sources":["../../src/mvt-layer/coordinate-transform.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAGpC,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAC;AAGnC,MAAM,wBAAwB,GAAG;IAC/B,KAAK;IACL,UAAU;IACV,UAAU;IACV,eAAe;IACf,OAAO;IACP,YAAY;CACb,CAAC;AAEF,SAAS,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAmB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAa,EAAE,QAAkB;IACzF,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAErC,OAAO,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,SAAS,CAAC,QAAQ,EAAE,IAAgB,EAAE,QAAkB;IAC/D,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,UAAU,CAAC,UAAU,EAAE,IAAgB,EAAE,QAAkB;IAClE,OAAO,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,UAAU,CAAC,IAAI,EAAE,IAAgB,EAAE,QAAkB;IAC5D,OAAO,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,eAAe,EAAE,IAAgB,EAAE,QAAkB;IAC5E,OAAO,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,OAAO,CAAC,OAAO,EAAE,IAAgB,EAAE,QAAkB;IAC5D,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,YAAY,CAAC,YAAY,EAAE,IAAgB,EAAE,QAAkB;IACtE,OAAO,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,QAAQ,EAAE,IAAoB,EAAE,QAAkB;IAC1E,MAAM,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,MAAM,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAE/B,OAAO;QACL,GAAG,QAAQ;QACX,WAAW,EAAE,wBAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAClD,QAAQ,CAAC,WAAW,EACpB,aAAa,EACb,QAAQ,CACT;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
// deck.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
const GEOM_TYPES = ['points', 'lines', 'polygons'];
|
|
5
|
+
/**
|
|
6
|
+
* Return the index of feature (numericProps or featureIds) for given feature id
|
|
7
|
+
* Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
|
|
8
|
+
* of the feature 33.
|
|
9
|
+
*/
|
|
10
|
+
export default function findIndexBinary(data, // The data in binary format
|
|
11
|
+
uniqueIdProperty, // Name of the unique id property
|
|
12
|
+
featureId, // feature id to find
|
|
13
|
+
layerName // the layer to search in
|
|
14
|
+
) {
|
|
15
|
+
for (const gt of GEOM_TYPES) {
|
|
16
|
+
const index = data[gt] && findIndexByType(data[gt], uniqueIdProperty, featureId, layerName);
|
|
17
|
+
if (index >= 0) {
|
|
18
|
+
return index;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return -1;
|
|
22
|
+
}
|
|
23
|
+
function findIndexByType(geomData, uniqueIdProperty, featureId, layerName) {
|
|
24
|
+
const featureIds = geomData.featureIds.value;
|
|
25
|
+
if (!featureIds.length) {
|
|
26
|
+
return -1;
|
|
27
|
+
}
|
|
28
|
+
let startFeatureIndex = 0;
|
|
29
|
+
let endFeatureIndex = featureIds[featureIds.length - 1] + 1;
|
|
30
|
+
if (layerName) {
|
|
31
|
+
const layerRange = getLayerRange(geomData, layerName);
|
|
32
|
+
if (layerRange) {
|
|
33
|
+
startFeatureIndex = layerRange[0];
|
|
34
|
+
endFeatureIndex = layerRange[1] + 1;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
return -1;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
// Look for the uniqueIdProperty
|
|
41
|
+
let featureIndex = -1;
|
|
42
|
+
if (uniqueIdProperty in geomData.numericProps) {
|
|
43
|
+
const vertexIndex = geomData.numericProps[uniqueIdProperty].value.findIndex((x, i) => x === featureId && featureIds[i] >= startFeatureIndex && featureIds[i] < endFeatureIndex);
|
|
44
|
+
return vertexIndex >= 0 ? geomData.globalFeatureIds.value[vertexIndex] : -1;
|
|
45
|
+
}
|
|
46
|
+
else if (uniqueIdProperty) {
|
|
47
|
+
featureIndex = findIndex(geomData.properties, elem => elem[uniqueIdProperty] === featureId, startFeatureIndex, endFeatureIndex);
|
|
48
|
+
}
|
|
49
|
+
else if (geomData.fields) {
|
|
50
|
+
featureIndex = findIndex(geomData.fields, (elem) => elem.id === featureId, startFeatureIndex, endFeatureIndex);
|
|
51
|
+
}
|
|
52
|
+
return featureIndex >= 0 ? getGlobalFeatureId(geomData, featureIndex) : -1;
|
|
53
|
+
}
|
|
54
|
+
// Returns [firstFeatureIndex, lastFeatureIndex]
|
|
55
|
+
// MVTLoader parses tiles layer-by-layer, so each layer is a continuous range
|
|
56
|
+
function getLayerRange(geomData, layerName) {
|
|
57
|
+
if (!geomData.__layers) {
|
|
58
|
+
// Cache a map from properties.layerName to index ranges
|
|
59
|
+
const layerNames = {};
|
|
60
|
+
const { properties } = geomData;
|
|
61
|
+
for (let i = 0; i < properties.length; i++) {
|
|
62
|
+
const { layerName: key } = properties[i];
|
|
63
|
+
if (!key) {
|
|
64
|
+
// ignore
|
|
65
|
+
}
|
|
66
|
+
else if (layerNames[key]) {
|
|
67
|
+
layerNames[key][1] = i;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
layerNames[key] = [i, i];
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
geomData.__layers = layerNames;
|
|
74
|
+
}
|
|
75
|
+
return geomData.__layers[layerName];
|
|
76
|
+
}
|
|
77
|
+
// Returns global feature id
|
|
78
|
+
function getGlobalFeatureId(geomData, featureIndex) {
|
|
79
|
+
if (!geomData.__ids) {
|
|
80
|
+
// Cache a map from featureId to globalFeatureId
|
|
81
|
+
const result = [];
|
|
82
|
+
const featureIds = geomData.featureIds.value;
|
|
83
|
+
const globalFeatureIds = geomData.globalFeatureIds.value;
|
|
84
|
+
for (let i = 0; i < featureIds.length; i++) {
|
|
85
|
+
result[featureIds[i]] = globalFeatureIds[i];
|
|
86
|
+
}
|
|
87
|
+
geomData.__ids = result;
|
|
88
|
+
}
|
|
89
|
+
return geomData.__ids[featureIndex];
|
|
90
|
+
}
|
|
91
|
+
// Like array.findIndex, but only search within a range
|
|
92
|
+
function findIndex(array, predicate, startIndex, endIndex) {
|
|
93
|
+
for (let i = startIndex; i < endIndex; i++) {
|
|
94
|
+
if (predicate(array[i], i)) {
|
|
95
|
+
return i;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return -1;
|
|
99
|
+
}
|
|
100
|
+
//# sourceMappingURL=find-index-binary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"find-index-binary.js","sourceRoot":"","sources":["../../src/mvt-layer/find-index-binary.ts"],"names":[],"mappings":"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"}
|