@deck.gl/extensions 9.0.0-beta.1 → 9.0.0-beta.11
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/brushing/brushing-extension.js +80 -0
- package/{typed → dist}/brushing/shader-module.d.ts +1 -1
- package/{typed → dist}/brushing/shader-module.d.ts.map +1 -1
- package/dist/brushing/shader-module.js +92 -0
- package/{typed → dist}/clip/clip-extension.d.ts.map +1 -1
- package/dist/clip/clip-extension.js +117 -0
- package/{typed → dist}/collision-filter/collision-filter-effect.d.ts +4 -2
- package/dist/collision-filter/collision-filter-effect.d.ts.map +1 -0
- package/dist/collision-filter/collision-filter-effect.js +194 -0
- package/dist/collision-filter/collision-filter-extension.js +49 -0
- package/{typed → dist}/collision-filter/collision-filter-pass.d.ts +3 -2
- package/dist/collision-filter/collision-filter-pass.d.ts.map +1 -0
- package/dist/collision-filter/collision-filter-pass.js +23 -0
- package/{typed → dist}/collision-filter/shader-module.d.ts.map +1 -1
- package/dist/collision-filter/shader-module.js +87 -0
- package/dist/data-filter/aggregator.d.ts.map +1 -0
- package/dist/{esm/data-filter → data-filter}/aggregator.js +40 -41
- package/{typed → dist}/data-filter/data-filter-extension.d.ts +39 -7
- package/dist/data-filter/data-filter-extension.d.ts.map +1 -0
- package/dist/data-filter/data-filter-extension.js +256 -0
- package/dist/data-filter/shader-module.d.ts +39 -0
- package/dist/data-filter/shader-module.d.ts.map +1 -0
- package/dist/data-filter/shader-module.js +199 -0
- package/dist/dist.dev.js +2667 -11058
- package/{typed → dist}/fill-style/fill-style-extension.d.ts +2 -30
- package/dist/fill-style/fill-style-extension.d.ts.map +1 -0
- package/dist/fill-style/fill-style-extension.js +116 -0
- package/{typed/fill-style/shaders.glsl.d.ts → dist/fill-style/shader-module.d.ts} +1 -1
- package/dist/fill-style/shader-module.d.ts.map +1 -0
- package/dist/fill-style/shader-module.js +96 -0
- package/dist/fp64/fp64-extension.js +35 -0
- package/dist/fp64/project64.glsl.js +81 -0
- package/dist/fp64/project64.js +50 -0
- package/dist/index.cjs +2795 -0
- package/dist/index.cjs.map +7 -0
- package/dist/index.d.ts +19 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +11 -0
- package/{typed → dist}/mask/mask-effect.d.ts +6 -5
- package/dist/mask/mask-effect.d.ts.map +1 -0
- package/dist/mask/mask-effect.js +192 -0
- package/dist/mask/mask-extension.js +57 -0
- package/dist/mask/mask-pass.d.ts +61 -0
- package/dist/mask/mask-pass.d.ts.map +1 -0
- package/dist/mask/mask-pass.js +52 -0
- package/{typed → dist}/mask/shader-module.d.ts.map +1 -1
- package/dist/mask/shader-module.js +77 -0
- package/{typed → dist}/path-style/path-style-extension.d.ts.map +1 -1
- package/dist/path-style/path-style-extension.js +112 -0
- package/dist/path-style/shaders.glsl.js +86 -0
- package/{typed → dist}/terrain/height-map-builder.d.ts +1 -1
- package/dist/terrain/height-map-builder.d.ts.map +1 -0
- package/dist/terrain/height-map-builder.js +104 -0
- package/{typed → dist}/terrain/shader-module.d.ts +2 -2
- package/dist/terrain/shader-module.d.ts.map +1 -0
- package/dist/terrain/shader-module.js +137 -0
- package/{typed → dist}/terrain/terrain-cover.d.ts +1 -1
- package/dist/terrain/terrain-cover.d.ts.map +1 -0
- package/dist/terrain/terrain-cover.js +188 -0
- package/{typed → dist}/terrain/terrain-effect.d.ts +6 -7
- package/dist/terrain/terrain-effect.d.ts.map +1 -0
- package/dist/terrain/terrain-effect.js +174 -0
- package/dist/terrain/terrain-extension.js +44 -0
- package/dist/terrain/terrain-pass.d.ts +53 -0
- package/dist/terrain/terrain-pass.d.ts.map +1 -0
- package/dist/terrain/terrain-pass.js +69 -0
- package/{typed → dist}/terrain/terrain-picking-pass.d.ts +1 -1
- package/dist/terrain/terrain-picking-pass.d.ts.map +1 -0
- package/dist/terrain/terrain-picking-pass.js +67 -0
- package/{typed → dist}/terrain/utils.d.ts +1 -0
- package/{typed → dist}/terrain/utils.d.ts.map +1 -1
- package/dist/terrain/utils.js +25 -0
- package/{typed → dist}/utils/debug.d.ts.map +1 -1
- package/dist/utils/debug.js +50 -0
- package/dist/utils/projection-utils.js +153 -0
- package/dist/utils/syntax-tags.d.ts +6 -0
- package/dist/utils/syntax-tags.d.ts.map +1 -0
- package/dist/utils/syntax-tags.js +5 -0
- package/dist.min.js +918 -1254
- package/package.json +19 -16
- package/src/brushing/shader-module.ts +4 -3
- package/src/clip/clip-extension.ts +10 -9
- package/src/collision-filter/collision-filter-effect.ts +35 -31
- package/src/collision-filter/collision-filter-pass.ts +7 -13
- package/src/collision-filter/shader-module.ts +6 -4
- package/src/data-filter/aggregator.ts +8 -13
- package/src/data-filter/data-filter-extension.ts +181 -56
- package/src/data-filter/shader-module.ts +132 -37
- package/src/fill-style/fill-style-extension.ts +4 -5
- package/src/fill-style/{shaders.glsl.ts → shader-module.ts} +6 -5
- package/src/mask/mask-effect.ts +30 -20
- package/src/mask/mask-pass.ts +22 -18
- package/src/mask/shader-module.ts +7 -6
- package/src/path-style/path-style-extension.ts +1 -0
- package/src/terrain/shader-module.ts +14 -13
- package/src/terrain/terrain-cover.ts +2 -1
- package/src/terrain/terrain-effect.ts +19 -23
- package/src/terrain/terrain-pass.ts +37 -37
- package/src/terrain/terrain-picking-pass.ts +19 -25
- package/src/terrain/utils.ts +13 -7
- package/src/utils/debug.ts +1 -2
- package/src/utils/syntax-tags.ts +5 -0
- package/dist/es5/brushing/brushing-extension.js +0 -108
- package/dist/es5/brushing/brushing-extension.js.map +0 -1
- package/dist/es5/brushing/shader-module.js +0 -50
- package/dist/es5/brushing/shader-module.js.map +0 -1
- package/dist/es5/clip/clip-extension.js +0 -98
- package/dist/es5/clip/clip-extension.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-effect.js +0 -294
- package/dist/es5/collision-filter/collision-filter-effect.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-extension.js +0 -109
- package/dist/es5/collision-filter/collision-filter-extension.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-pass.js +0 -79
- package/dist/es5/collision-filter/collision-filter-pass.js.map +0 -1
- package/dist/es5/collision-filter/shader-module.js +0 -39
- package/dist/es5/collision-filter/shader-module.js.map +0 -1
- package/dist/es5/data-filter/aggregator.js +0 -79
- package/dist/es5/data-filter/aggregator.js.map +0 -1
- package/dist/es5/data-filter/data-filter-extension.js +0 -236
- package/dist/es5/data-filter/data-filter-extension.js.map +0 -1
- package/dist/es5/data-filter/shader-module.js +0 -122
- package/dist/es5/data-filter/shader-module.js.map +0 -1
- package/dist/es5/fill-style/fill-style-extension.js +0 -190
- package/dist/es5/fill-style/fill-style-extension.js.map +0 -1
- package/dist/es5/fill-style/shaders.glsl.js +0 -59
- package/dist/es5/fill-style/shaders.glsl.js.map +0 -1
- package/dist/es5/fp64/fp64-extension.js +0 -55
- package/dist/es5/fp64/fp64-extension.js.map +0 -1
- package/dist/es5/fp64/project64.glsl.js +0 -9
- package/dist/es5/fp64/project64.glsl.js.map +0 -1
- package/dist/es5/fp64/project64.js +0 -52
- package/dist/es5/fp64/project64.js.map +0 -1
- package/dist/es5/index.js +0 -88
- package/dist/es5/index.js.map +0 -1
- package/dist/es5/mask/mask-effect.js +0 -279
- package/dist/es5/mask/mask-effect.js.map +0 -1
- package/dist/es5/mask/mask-extension.js +0 -113
- package/dist/es5/mask/mask-extension.js.map +0 -1
- package/dist/es5/mask/mask-pass.js +0 -106
- package/dist/es5/mask/mask-pass.js.map +0 -1
- package/dist/es5/mask/shader-module.js +0 -38
- package/dist/es5/mask/shader-module.js.map +0 -1
- package/dist/es5/path-style/path-style-extension.js +0 -169
- package/dist/es5/path-style/path-style-extension.js.map +0 -1
- package/dist/es5/path-style/shaders.glsl.js +0 -25
- package/dist/es5/path-style/shaders.glsl.js.map +0 -1
- package/dist/es5/terrain/height-map-builder.js +0 -111
- package/dist/es5/terrain/height-map-builder.js.map +0 -1
- package/dist/es5/terrain/shader-module.js +0 -86
- package/dist/es5/terrain/shader-module.js.map +0 -1
- package/dist/es5/terrain/terrain-cover.js +0 -256
- package/dist/es5/terrain/terrain-cover.js.map +0 -1
- package/dist/es5/terrain/terrain-effect.js +0 -326
- package/dist/es5/terrain/terrain-effect.js.map +0 -1
- package/dist/es5/terrain/terrain-extension.js +0 -94
- package/dist/es5/terrain/terrain-extension.js.map +0 -1
- package/dist/es5/terrain/terrain-pass.js +0 -121
- package/dist/es5/terrain/terrain-pass.js.map +0 -1
- package/dist/es5/terrain/terrain-picking-pass.js +0 -124
- package/dist/es5/terrain/terrain-picking-pass.js.map +0 -1
- package/dist/es5/terrain/utils.js +0 -35
- package/dist/es5/terrain/utils.js.map +0 -1
- package/dist/es5/utils/debug.js +0 -71
- package/dist/es5/utils/debug.js.map +0 -1
- package/dist/es5/utils/projection-utils.js +0 -168
- package/dist/es5/utils/projection-utils.js.map +0 -1
- package/dist/esm/brushing/brushing-extension.js +0 -68
- package/dist/esm/brushing/brushing-extension.js.map +0 -1
- package/dist/esm/brushing/shader-module.js +0 -103
- package/dist/esm/brushing/shader-module.js.map +0 -1
- package/dist/esm/clip/clip-extension.js +0 -86
- package/dist/esm/clip/clip-extension.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-effect.js +0 -246
- package/dist/esm/collision-filter/collision-filter-effect.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-extension.js +0 -75
- package/dist/esm/collision-filter/collision-filter-extension.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-pass.js +0 -32
- package/dist/esm/collision-filter/collision-filter-pass.js.map +0 -1
- package/dist/esm/collision-filter/shader-module.js +0 -104
- package/dist/esm/collision-filter/shader-module.js.map +0 -1
- package/dist/esm/data-filter/aggregator.js.map +0 -1
- package/dist/esm/data-filter/data-filter-extension.js +0 -189
- package/dist/esm/data-filter/data-filter-extension.js.map +0 -1
- package/dist/esm/data-filter/shader-module.js +0 -164
- package/dist/esm/data-filter/shader-module.js.map +0 -1
- package/dist/esm/fill-style/fill-style-extension.js +0 -156
- package/dist/esm/fill-style/fill-style-extension.js.map +0 -1
- package/dist/esm/fill-style/shaders.glsl.js +0 -108
- package/dist/esm/fill-style/shaders.glsl.js.map +0 -1
- package/dist/esm/fp64/fp64-extension.js +0 -20
- package/dist/esm/fp64/fp64-extension.js.map +0 -1
- package/dist/esm/fp64/project64.glsl.js +0 -82
- package/dist/esm/fp64/project64.glsl.js.map +0 -1
- package/dist/esm/fp64/project64.js +0 -43
- package/dist/esm/fp64/project64.js.map +0 -1
- package/dist/esm/index.js +0 -11
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/mask/mask-effect.js +0 -228
- package/dist/esm/mask/mask-effect.js.map +0 -1
- package/dist/esm/mask/mask-extension.js +0 -83
- package/dist/esm/mask/mask-extension.js.map +0 -1
- package/dist/esm/mask/mask-pass.js +0 -58
- package/dist/esm/mask/mask-pass.js.map +0 -1
- package/dist/esm/mask/shader-module.js +0 -84
- package/dist/esm/mask/shader-module.js.map +0 -1
- package/dist/esm/path-style/path-style-extension.js +0 -130
- package/dist/esm/path-style/path-style-extension.js.map +0 -1
- package/dist/esm/path-style/shaders.glsl.js +0 -84
- package/dist/esm/path-style/shaders.glsl.js.map +0 -1
- package/dist/esm/terrain/height-map-builder.js +0 -86
- package/dist/esm/terrain/height-map-builder.js.map +0 -1
- package/dist/esm/terrain/shader-module.js +0 -127
- package/dist/esm/terrain/shader-module.js.map +0 -1
- package/dist/esm/terrain/terrain-cover.js +0 -212
- package/dist/esm/terrain/terrain-cover.js.map +0 -1
- package/dist/esm/terrain/terrain-effect.js +0 -219
- package/dist/esm/terrain/terrain-effect.js.map +0 -1
- package/dist/esm/terrain/terrain-extension.js +0 -59
- package/dist/esm/terrain/terrain-extension.js.map +0 -1
- package/dist/esm/terrain/terrain-pass.js +0 -71
- package/dist/esm/terrain/terrain-pass.js.map +0 -1
- package/dist/esm/terrain/terrain-picking-pass.js +0 -73
- package/dist/esm/terrain/terrain-picking-pass.js.map +0 -1
- package/dist/esm/terrain/utils.js +0 -19
- package/dist/esm/terrain/utils.js.map +0 -1
- package/dist/esm/utils/debug.js +0 -61
- package/dist/esm/utils/debug.js.map +0 -1
- package/dist/esm/utils/projection-utils.js +0 -134
- package/dist/esm/utils/projection-utils.js.map +0 -1
- package/typed/collision-filter/collision-filter-effect.d.ts.map +0 -1
- package/typed/collision-filter/collision-filter-pass.d.ts.map +0 -1
- package/typed/data-filter/aggregator.d.ts.map +0 -1
- package/typed/data-filter/data-filter-extension.d.ts.map +0 -1
- package/typed/data-filter/shader-module.d.ts +0 -9
- package/typed/data-filter/shader-module.d.ts.map +0 -1
- package/typed/fill-style/fill-style-extension.d.ts.map +0 -1
- package/typed/fill-style/shaders.glsl.d.ts.map +0 -1
- package/typed/index.d.ts +0 -19
- package/typed/index.d.ts.map +0 -1
- package/typed/mask/mask-effect.d.ts.map +0 -1
- package/typed/mask/mask-pass.d.ts +0 -19
- package/typed/mask/mask-pass.d.ts.map +0 -1
- package/typed/terrain/height-map-builder.d.ts.map +0 -1
- package/typed/terrain/shader-module.d.ts.map +0 -1
- package/typed/terrain/terrain-cover.d.ts.map +0 -1
- package/typed/terrain/terrain-effect.d.ts.map +0 -1
- package/typed/terrain/terrain-pass.d.ts +0 -11
- package/typed/terrain/terrain-pass.d.ts.map +0 -1
- package/typed/terrain/terrain-picking-pass.d.ts.map +0 -1
- /package/{typed → dist}/brushing/brushing-extension.d.ts +0 -0
- /package/{typed → dist}/brushing/brushing-extension.d.ts.map +0 -0
- /package/{typed → dist}/clip/clip-extension.d.ts +0 -0
- /package/{typed → dist}/collision-filter/collision-filter-extension.d.ts +0 -0
- /package/{typed → dist}/collision-filter/collision-filter-extension.d.ts.map +0 -0
- /package/{typed → dist}/collision-filter/shader-module.d.ts +0 -0
- /package/{typed → dist}/data-filter/aggregator.d.ts +0 -0
- /package/{typed → dist}/fp64/fp64-extension.d.ts +0 -0
- /package/{typed → dist}/fp64/fp64-extension.d.ts.map +0 -0
- /package/{typed → dist}/fp64/project64.d.ts +0 -0
- /package/{typed → dist}/fp64/project64.d.ts.map +0 -0
- /package/{typed → dist}/fp64/project64.glsl.d.ts +0 -0
- /package/{typed → dist}/fp64/project64.glsl.d.ts.map +0 -0
- /package/{typed → dist}/mask/mask-extension.d.ts +0 -0
- /package/{typed → dist}/mask/mask-extension.d.ts.map +0 -0
- /package/{typed → dist}/mask/shader-module.d.ts +0 -0
- /package/{typed → dist}/path-style/path-style-extension.d.ts +0 -0
- /package/{typed → dist}/path-style/shaders.glsl.d.ts +0 -0
- /package/{typed → dist}/path-style/shaders.glsl.d.ts.map +0 -0
- /package/{typed → dist}/terrain/terrain-extension.d.ts +0 -0
- /package/{typed → dist}/terrain/terrain-extension.d.ts.map +0 -0
- /package/{typed → dist}/utils/debug.d.ts +0 -0
- /package/{typed → dist}/utils/projection-utils.d.ts +0 -0
- /package/{typed → dist}/utils/projection-utils.d.ts.map +0 -0
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { joinLayerBounds, getRenderBounds, makeViewport } from "../utils/projection-utils.js";
|
|
2
|
+
import { createRenderTarget } from "./utils.js";
|
|
3
|
+
const MAP_MAX_SIZE = 2048;
|
|
4
|
+
/**
|
|
5
|
+
* Manages the lifecycle of the height map (a framebuffer that encodes elevation).
|
|
6
|
+
* One instance of height map is is shared across all layers. It is updated when the viewport changes
|
|
7
|
+
* or when some terrain source layer's data changes.
|
|
8
|
+
* During the draw call of any terrainDrawMode:offset layers,
|
|
9
|
+
* the vertex shader reads from this framebuffer to retrieve its z offset.
|
|
10
|
+
*/
|
|
11
|
+
export class HeightMapBuilder {
|
|
12
|
+
static isSupported(device) {
|
|
13
|
+
return device.isTextureFormatRenderable('rgba32float');
|
|
14
|
+
}
|
|
15
|
+
constructor(device) {
|
|
16
|
+
/** Viewport used to draw into the texture */
|
|
17
|
+
this.renderViewport = null;
|
|
18
|
+
/** Bounds of the height map texture, in cartesian space */
|
|
19
|
+
this.bounds = null;
|
|
20
|
+
/** Last rendered layers */
|
|
21
|
+
this.layers = [];
|
|
22
|
+
/** Last layer.getBounds() */
|
|
23
|
+
this.layersBounds = [];
|
|
24
|
+
/** The union of layersBounds in cartesian space */
|
|
25
|
+
this.layersBoundsCommon = null;
|
|
26
|
+
this.lastViewport = null;
|
|
27
|
+
this.device = device;
|
|
28
|
+
}
|
|
29
|
+
/** Returns the height map framebuffer for read/write access.
|
|
30
|
+
* Returns null when the texture is invalid.
|
|
31
|
+
*/
|
|
32
|
+
getRenderFramebuffer() {
|
|
33
|
+
if (!this.renderViewport) {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
if (!this.fbo) {
|
|
37
|
+
this.fbo = createRenderTarget(this.device, { id: 'height-map', float: true });
|
|
38
|
+
}
|
|
39
|
+
return this.fbo;
|
|
40
|
+
}
|
|
41
|
+
/** Called every render cycle to check if the framebuffer needs update */
|
|
42
|
+
shouldUpdate({ layers, viewport }) {
|
|
43
|
+
const layersChanged = layers.length !== this.layers.length ||
|
|
44
|
+
layers.some((layer, i) =>
|
|
45
|
+
// Layer instance is updated
|
|
46
|
+
// Layer props might have changed
|
|
47
|
+
// Undetermined props could have an effect on the output geometry of a terrain source,
|
|
48
|
+
// for example getElevation+updateTriggers, elevationScale, modelMatrix
|
|
49
|
+
layer !== this.layers[i] ||
|
|
50
|
+
// Some prop is in transition
|
|
51
|
+
layer.props.transitions ||
|
|
52
|
+
// Layer's geometry bounds have changed
|
|
53
|
+
layer.getBounds() !== this.layersBounds[i]);
|
|
54
|
+
if (layersChanged) {
|
|
55
|
+
// Recalculate cached bounds
|
|
56
|
+
this.layers = layers;
|
|
57
|
+
this.layersBounds = layers.map(layer => layer.getBounds());
|
|
58
|
+
this.layersBoundsCommon = joinLayerBounds(layers, viewport);
|
|
59
|
+
}
|
|
60
|
+
const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);
|
|
61
|
+
if (!this.layersBoundsCommon) {
|
|
62
|
+
this.renderViewport = null;
|
|
63
|
+
}
|
|
64
|
+
else if (layersChanged || viewportChanged) {
|
|
65
|
+
const bounds = getRenderBounds(this.layersBoundsCommon, viewport);
|
|
66
|
+
if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
|
|
67
|
+
this.renderViewport = null;
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
this.bounds = bounds;
|
|
71
|
+
this.lastViewport = viewport;
|
|
72
|
+
const scale = viewport.scale;
|
|
73
|
+
const pixelWidth = (bounds[2] - bounds[0]) * scale;
|
|
74
|
+
const pixelHeight = (bounds[3] - bounds[1]) * scale;
|
|
75
|
+
this.renderViewport =
|
|
76
|
+
pixelWidth > 0 || pixelHeight > 0
|
|
77
|
+
? makeViewport({
|
|
78
|
+
// It's not important whether the geometry is visible in this viewport, because
|
|
79
|
+
// vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader
|
|
80
|
+
// However the viewport must have the same center and zoom as the screen viewport
|
|
81
|
+
// So that projection uniforms used for calculating z are the same
|
|
82
|
+
bounds: [
|
|
83
|
+
viewport.center[0] - 1,
|
|
84
|
+
viewport.center[1] - 1,
|
|
85
|
+
viewport.center[0] + 1,
|
|
86
|
+
viewport.center[1] + 1
|
|
87
|
+
],
|
|
88
|
+
zoom: viewport.zoom,
|
|
89
|
+
width: Math.min(pixelWidth, MAP_MAX_SIZE),
|
|
90
|
+
height: Math.min(pixelHeight, MAP_MAX_SIZE),
|
|
91
|
+
viewport
|
|
92
|
+
})
|
|
93
|
+
: null;
|
|
94
|
+
return true;
|
|
95
|
+
}
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
delete() {
|
|
99
|
+
if (this.fbo) {
|
|
100
|
+
this.fbo.colorAttachments[0].delete();
|
|
101
|
+
this.fbo.delete();
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ShaderModule } from '@luma.gl/shadertools';
|
|
2
2
|
import type { Texture } from '@luma.gl/core';
|
|
3
|
-
import type { Bounds } from
|
|
4
|
-
import type { TerrainCover } from
|
|
3
|
+
import type { Bounds } from "../utils/projection-utils.js";
|
|
4
|
+
import type { TerrainCover } from "./terrain-cover.js";
|
|
5
5
|
/** Module parameters expected by the terrain shader module */
|
|
6
6
|
export type TerrainModuleSettings = {
|
|
7
7
|
picking: {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/terrain/shader-module.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGvD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,MAAM,EAAC,qCAAkC;AACtD,OAAO,KAAK,EAAC,YAAY,EAAC,2BAAwB;AAGlD,8DAA8D;AAC9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,kDAAkD;AAClD,eAAO,MAAM,YAAY;;IAEvB,6EAA6E;;IAE7E,2EAA2E;;IAE3E,6FAA6F;;IAE7F,0EAA0E;;IAE1E,mEAAmE;;CAEpE,CAAC;AAOF,eAAO,MAAM,aAAa,qCA6Hc,CAAC"}
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
import { project } from '@deck.gl/core';
|
|
3
|
+
import { glsl } from "../utils/syntax-tags.js";
|
|
4
|
+
/** A model can have one of the following modes */
|
|
5
|
+
export const TERRAIN_MODE = {
|
|
6
|
+
NONE: 0,
|
|
7
|
+
/** A terrain layer rendering encoded ground elevation into the height map */
|
|
8
|
+
WRITE_HEIGHT_MAP: 1,
|
|
9
|
+
/** An offset layer reading encoded ground elevation from the height map */
|
|
10
|
+
USE_HEIGHT_MAP: 2,
|
|
11
|
+
/** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */
|
|
12
|
+
USE_COVER: 3,
|
|
13
|
+
/** A terrain layer rendering to screen, using the cover fbo as texture */
|
|
14
|
+
USE_COVER_ONLY: 4,
|
|
15
|
+
/** Draped layer is rendered into a texture, and never to screen */
|
|
16
|
+
SKIP: 5
|
|
17
|
+
};
|
|
18
|
+
const TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)
|
|
19
|
+
.map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)
|
|
20
|
+
.join('\n');
|
|
21
|
+
// @ts-expect-error
|
|
22
|
+
export const terrainModule = {
|
|
23
|
+
name: 'terrain',
|
|
24
|
+
dependencies: [project],
|
|
25
|
+
inject: {
|
|
26
|
+
'vs:#decl': `
|
|
27
|
+
uniform float terrain_mode;
|
|
28
|
+
uniform sampler2D terrain_map;
|
|
29
|
+
uniform vec4 terrain_bounds;
|
|
30
|
+
out vec3 commonPos;
|
|
31
|
+
` + TERRAIN_MODE_CONSTANTS,
|
|
32
|
+
'vs:#main-start': `
|
|
33
|
+
if (terrain_mode == TERRAIN_MODE_SKIP) {
|
|
34
|
+
gl_Position = vec4(0.0);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
`,
|
|
38
|
+
'vs:DECKGL_FILTER_GL_POSITION': `
|
|
39
|
+
commonPos = geometry.position.xyz;
|
|
40
|
+
if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
|
|
41
|
+
vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
|
|
42
|
+
position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
|
|
43
|
+
commonPos.z += project_uCommonOrigin.z;
|
|
44
|
+
}
|
|
45
|
+
if (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
|
|
46
|
+
vec3 anchor = geometry.worldPosition;
|
|
47
|
+
anchor.z = 0.0;
|
|
48
|
+
vec3 anchorCommon = project_position(anchor);
|
|
49
|
+
vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;
|
|
50
|
+
if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {
|
|
51
|
+
float terrainZ = texture(terrain_map, texCoords).r;
|
|
52
|
+
geometry.position.z += terrainZ;
|
|
53
|
+
position = project_common_position_to_clipspace(geometry.position);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
`,
|
|
57
|
+
'fs:#decl': `
|
|
58
|
+
uniform float terrain_mode;
|
|
59
|
+
uniform sampler2D terrain_map;
|
|
60
|
+
uniform vec4 terrain_bounds;
|
|
61
|
+
in vec3 commonPos;
|
|
62
|
+
` + TERRAIN_MODE_CONSTANTS,
|
|
63
|
+
'fs:#main-start': `
|
|
64
|
+
if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
|
|
65
|
+
fragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
`,
|
|
69
|
+
'fs:DECKGL_FILTER_COLOR': `
|
|
70
|
+
if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {
|
|
71
|
+
vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
|
|
72
|
+
vec4 pixel = texture(terrain_map, texCoords);
|
|
73
|
+
if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {
|
|
74
|
+
color = pixel;
|
|
75
|
+
} else {
|
|
76
|
+
color = pixel + color * (1.0 - pixel.a);
|
|
77
|
+
}
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
`
|
|
81
|
+
},
|
|
82
|
+
// eslint-disable-next-line complexity
|
|
83
|
+
getUniforms: (opts = {}, uniforms) => {
|
|
84
|
+
if ('dummyHeightMap' in opts) {
|
|
85
|
+
const { drawToTerrainHeightMap, heightMap, heightMapBounds, dummyHeightMap, terrainCover, useTerrainHeightMap, terrainSkipRender } = opts;
|
|
86
|
+
const { project_uCommonOrigin } = uniforms;
|
|
87
|
+
let mode = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;
|
|
88
|
+
// height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty
|
|
89
|
+
let sampler = dummyHeightMap;
|
|
90
|
+
// height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null
|
|
91
|
+
let bounds = null;
|
|
92
|
+
if (drawToTerrainHeightMap) {
|
|
93
|
+
mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;
|
|
94
|
+
bounds = heightMapBounds;
|
|
95
|
+
}
|
|
96
|
+
else if (useTerrainHeightMap && heightMap) {
|
|
97
|
+
mode = TERRAIN_MODE.USE_HEIGHT_MAP;
|
|
98
|
+
sampler = heightMap;
|
|
99
|
+
bounds = heightMapBounds;
|
|
100
|
+
}
|
|
101
|
+
else if (terrainCover) {
|
|
102
|
+
// This is a terrain layer
|
|
103
|
+
const isPicking = opts.picking?.isActive;
|
|
104
|
+
const fbo = isPicking
|
|
105
|
+
? terrainCover.getPickingFramebuffer()
|
|
106
|
+
: terrainCover.getRenderFramebuffer();
|
|
107
|
+
sampler = fbo?.colorAttachments[0].texture;
|
|
108
|
+
if (isPicking) {
|
|
109
|
+
// Never render the layer itself in picking pass
|
|
110
|
+
mode = TERRAIN_MODE.SKIP;
|
|
111
|
+
}
|
|
112
|
+
if (sampler) {
|
|
113
|
+
mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;
|
|
114
|
+
bounds = terrainCover.bounds;
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
sampler = dummyHeightMap;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
/* eslint-disable camelcase */
|
|
121
|
+
return {
|
|
122
|
+
terrain_mode: mode,
|
|
123
|
+
terrain_map: sampler,
|
|
124
|
+
// Convert bounds to the common space, as [minX, minY, width, height]
|
|
125
|
+
terrain_bounds: bounds
|
|
126
|
+
? [
|
|
127
|
+
bounds[0] - project_uCommonOrigin[0],
|
|
128
|
+
bounds[1] - project_uCommonOrigin[1],
|
|
129
|
+
bounds[2] - bounds[0],
|
|
130
|
+
bounds[3] - bounds[1]
|
|
131
|
+
]
|
|
132
|
+
: [0, 0, 0, 0]
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
return null;
|
|
136
|
+
}
|
|
137
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Framebuffer } from '@luma.gl/core';
|
|
2
2
|
import type { Layer, Viewport } from '@deck.gl/core';
|
|
3
|
-
import { Bounds } from
|
|
3
|
+
import { Bounds } from "../utils/projection-utils.js";
|
|
4
4
|
/**
|
|
5
5
|
* Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).
|
|
6
6
|
* One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-cover.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-cover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,EAAC,KAAK,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGnD,OAAO,EAAiD,MAAM,EAAC,qCAAkC;AAMjG;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,OAAO,EAAE,OAAO,CAAQ;IACxB,sDAAsD;IACtD,WAAW,EAAE,KAAK,CAAC;IACnB,6CAA6C;IAC7C,cAAc,EAAE,QAAQ,GAAG,IAAI,CAAQ;IACvC,8DAA8D;IAC9D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE7B,OAAO,CAAC,GAAG,CAAC,CAAc;IAC1B,OAAO,CAAC,UAAU,CAAC,CAAc;IACjC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,IAAI,CAAoB;IAChC,gDAAgD;IAChD,OAAO,CAAC,YAAY,CAAqC;IACzD,sCAAsC;IACtC,OAAO,CAAC,kBAAkB,CAAuB;gBAErC,WAAW,EAAE,KAAK;IAK9B,IAAI,EAAE,WAEL;IAED,4EAA4E;IAC5E,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,YAAY,CAAC,EACX,WAAW,EACX,QAAQ,EACR,MAAM,EACN,gBAAgB,EACjB,EAAE;QACD,WAAW,CAAC,EAAE,KAAK,CAAC;QACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;QACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC5C,GAAG,OAAO;IAqBX,wEAAwE;IACxE,OAAO,CAAC,aAAa;IAuBrB,4FAA4F;IAC5F,OAAO,CAAC,eAAe;IAsDvB,oBAAoB,IAAI,WAAW,GAAG,IAAI;IAU1C,qBAAqB,IAAI,WAAW,GAAG,IAAI;IAa3C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE;IAI5B,MAAM;CAWP"}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import { createRenderTarget } from "./utils.js";
|
|
2
|
+
import { joinLayerBounds, makeViewport, getRenderBounds } from "../utils/projection-utils.js";
|
|
3
|
+
/**
|
|
4
|
+
* Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).
|
|
5
|
+
* One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).
|
|
6
|
+
* It is updated when the terrain source layer's mesh changes or when any of the terrainDrawMode:drape
|
|
7
|
+
* layers requires redraw.
|
|
8
|
+
* During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.
|
|
9
|
+
*/
|
|
10
|
+
export class TerrainCover {
|
|
11
|
+
constructor(targetLayer) {
|
|
12
|
+
this.isDirty = true;
|
|
13
|
+
/** Viewport used to draw into the texture */
|
|
14
|
+
this.renderViewport = null;
|
|
15
|
+
/** Bounds of the terrain cover texture, in cartesian space */
|
|
16
|
+
this.bounds = null;
|
|
17
|
+
this.layers = [];
|
|
18
|
+
/** Cached version of targetLayer.getBounds() */
|
|
19
|
+
this.targetBounds = null;
|
|
20
|
+
/** targetBounds in cartesian space */
|
|
21
|
+
this.targetBoundsCommon = null;
|
|
22
|
+
this.targetLayer = targetLayer;
|
|
23
|
+
this.tile = getTile(targetLayer);
|
|
24
|
+
}
|
|
25
|
+
get id() {
|
|
26
|
+
return this.targetLayer.id;
|
|
27
|
+
}
|
|
28
|
+
/** returns true if the target layer is still in use (i.e. not finalized) */
|
|
29
|
+
get isActive() {
|
|
30
|
+
return Boolean(this.targetLayer.getCurrentLayer());
|
|
31
|
+
}
|
|
32
|
+
shouldUpdate({ targetLayer, viewport, layers, layerNeedsRedraw }) {
|
|
33
|
+
if (targetLayer) {
|
|
34
|
+
this.targetLayer = targetLayer;
|
|
35
|
+
}
|
|
36
|
+
const sizeChanged = viewport ? this._updateViewport(viewport) : false;
|
|
37
|
+
let layersChanged = layers ? this._updateLayers(layers) : false;
|
|
38
|
+
if (layerNeedsRedraw) {
|
|
39
|
+
for (const id of this.layers) {
|
|
40
|
+
if (layerNeedsRedraw[id]) {
|
|
41
|
+
layersChanged = true;
|
|
42
|
+
// console.log('layer needs redraw', id);
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return layersChanged || sizeChanged;
|
|
48
|
+
}
|
|
49
|
+
/** Compare layers with the last version. Only rerender if necessary. */
|
|
50
|
+
_updateLayers(layers) {
|
|
51
|
+
let needsRedraw = false;
|
|
52
|
+
layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;
|
|
53
|
+
if (layers.length !== this.layers.length) {
|
|
54
|
+
needsRedraw = true;
|
|
55
|
+
// console.log('layers count changed', this.layers.length, '>>', layers.length);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
for (let i = 0; i < layers.length; i++) {
|
|
59
|
+
const id = layers[i].id;
|
|
60
|
+
if (id !== this.layers[i]) {
|
|
61
|
+
needsRedraw = true;
|
|
62
|
+
// console.log('layer added/removed', id);
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
if (needsRedraw) {
|
|
68
|
+
this.layers = layers.map(layer => layer.id);
|
|
69
|
+
}
|
|
70
|
+
return needsRedraw;
|
|
71
|
+
}
|
|
72
|
+
/** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */
|
|
73
|
+
_updateViewport(viewport) {
|
|
74
|
+
const targetLayer = this.targetLayer;
|
|
75
|
+
let shouldRedraw = false;
|
|
76
|
+
if (this.tile && 'boundingBox' in this.tile) {
|
|
77
|
+
if (!this.targetBounds) {
|
|
78
|
+
shouldRedraw = true;
|
|
79
|
+
this.targetBounds = this.tile.boundingBox;
|
|
80
|
+
const bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);
|
|
81
|
+
const topRightCommon = viewport.projectPosition(this.targetBounds[1]);
|
|
82
|
+
this.targetBoundsCommon = [
|
|
83
|
+
bottomLeftCommon[0],
|
|
84
|
+
bottomLeftCommon[1],
|
|
85
|
+
topRightCommon[0],
|
|
86
|
+
topRightCommon[1]
|
|
87
|
+
];
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
else if (this.targetBounds !== targetLayer.getBounds()) {
|
|
91
|
+
// console.log('bounds changed', this.bounds, '>>', newBounds);
|
|
92
|
+
shouldRedraw = true;
|
|
93
|
+
this.targetBounds = targetLayer.getBounds();
|
|
94
|
+
this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);
|
|
95
|
+
}
|
|
96
|
+
if (!this.targetBoundsCommon) {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
const newZoom = Math.ceil(viewport.zoom + 0.5);
|
|
100
|
+
// If the terrain layer is bound to a tile, always render a texture that cover the whole tile.
|
|
101
|
+
// Otherwise, use the smaller of layer bounds and the viewport bounds.
|
|
102
|
+
if (this.tile) {
|
|
103
|
+
this.bounds = this.targetBoundsCommon;
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
const oldZoom = this.renderViewport?.zoom;
|
|
107
|
+
shouldRedraw = shouldRedraw || newZoom !== oldZoom;
|
|
108
|
+
const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);
|
|
109
|
+
const oldBounds = this.bounds;
|
|
110
|
+
shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);
|
|
111
|
+
this.bounds = newBounds;
|
|
112
|
+
}
|
|
113
|
+
if (shouldRedraw) {
|
|
114
|
+
this.renderViewport = makeViewport({
|
|
115
|
+
bounds: this.bounds,
|
|
116
|
+
zoom: newZoom,
|
|
117
|
+
viewport
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
return shouldRedraw;
|
|
121
|
+
}
|
|
122
|
+
getRenderFramebuffer() {
|
|
123
|
+
if (!this.renderViewport || this.layers.length === 0) {
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
126
|
+
if (!this.fbo) {
|
|
127
|
+
this.fbo = createRenderTarget(this.targetLayer.context.device, { id: this.id });
|
|
128
|
+
}
|
|
129
|
+
return this.fbo;
|
|
130
|
+
}
|
|
131
|
+
getPickingFramebuffer() {
|
|
132
|
+
if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {
|
|
133
|
+
return null;
|
|
134
|
+
}
|
|
135
|
+
if (!this.pickingFbo) {
|
|
136
|
+
this.pickingFbo = createRenderTarget(this.targetLayer.context.device, {
|
|
137
|
+
id: `${this.id}-picking`,
|
|
138
|
+
interpolate: false
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
return this.pickingFbo;
|
|
142
|
+
}
|
|
143
|
+
filterLayers(layers) {
|
|
144
|
+
return layers.filter(({ id }) => this.layers.includes(id));
|
|
145
|
+
}
|
|
146
|
+
delete() {
|
|
147
|
+
const { fbo, pickingFbo } = this;
|
|
148
|
+
if (fbo) {
|
|
149
|
+
fbo.colorAttachments[0].destroy();
|
|
150
|
+
fbo.destroy();
|
|
151
|
+
}
|
|
152
|
+
if (pickingFbo) {
|
|
153
|
+
pickingFbo.colorAttachments[0].destroy();
|
|
154
|
+
pickingFbo.destroy();
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
/**
|
|
159
|
+
* Remove layers that do not overlap with the current terrain cover.
|
|
160
|
+
* This implementation only has effect when a TileLayer is overlaid on top of a TileLayer
|
|
161
|
+
*/
|
|
162
|
+
function getIntersectingLayers(sourceTile, layers) {
|
|
163
|
+
return layers.filter(layer => {
|
|
164
|
+
const tile = getTile(layer);
|
|
165
|
+
if (tile) {
|
|
166
|
+
return intersect(sourceTile.boundingBox, tile.boundingBox);
|
|
167
|
+
}
|
|
168
|
+
return true;
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
/** If layer is the descendent of a TileLayer, return the corresponding tile. */
|
|
172
|
+
function getTile(layer) {
|
|
173
|
+
while (layer) {
|
|
174
|
+
// @ts-expect-error tile may not exist
|
|
175
|
+
const { tile } = layer.props;
|
|
176
|
+
if (tile) {
|
|
177
|
+
return tile;
|
|
178
|
+
}
|
|
179
|
+
layer = layer.parent;
|
|
180
|
+
}
|
|
181
|
+
return null;
|
|
182
|
+
}
|
|
183
|
+
function intersect(b1, b2) {
|
|
184
|
+
if (b1 && b2) {
|
|
185
|
+
return b1[0][0] < b2[1][0] && b2[0][0] < b1[1][0] && b1[0][1] < b2[1][1] && b2[0][1] < b1[1][1];
|
|
186
|
+
}
|
|
187
|
+
return false;
|
|
188
|
+
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import type { Effect, PreRenderOptions, Layer } from '@deck.gl/core';
|
|
1
|
+
import { TerrainModuleSettings } from "./shader-module.js";
|
|
2
|
+
import type { Effect, EffectContext, PreRenderOptions, Layer } from '@deck.gl/core';
|
|
4
3
|
/** Class to manage terrain effect */
|
|
5
4
|
export declare class TerrainEffect implements Effect {
|
|
6
5
|
id: string;
|
|
@@ -18,10 +17,10 @@ export declare class TerrainEffect implements Effect {
|
|
|
18
17
|
private terrainPickingPass;
|
|
19
18
|
/** One texture for each primitive terrain layer, into which the draped layers render */
|
|
20
19
|
private terrainCovers;
|
|
21
|
-
|
|
22
|
-
preRender(
|
|
23
|
-
getModuleParameters(layer: Layer): TerrainModuleSettings
|
|
24
|
-
cleanup(): void;
|
|
20
|
+
setup({ device, deck }: EffectContext): void;
|
|
21
|
+
preRender(opts: PreRenderOptions): void;
|
|
22
|
+
getModuleParameters(layer: Layer): Omit<TerrainModuleSettings, 'picking'>;
|
|
23
|
+
cleanup({ deck }: EffectContext): void;
|
|
25
24
|
private _updateHeightMap;
|
|
26
25
|
private _updateTerrainCovers;
|
|
27
26
|
private _updateTerrainCover;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terrain-effect.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,qBAAqB,EAAC,2BAAwB;AAMrE,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,KAAK,EAAW,MAAM,eAAe,CAAC;AAE5F,qCAAqC;AACrC,qBAAa,aAAc,YAAW,MAAM;IAC1C,EAAE,SAAoB;IACtB,KAAK,OAAQ;IACb,YAAY,UAAQ;IAEpB,0CAA0C;IAC1C,OAAO,CAAC,SAAS,CAAkB;IACnC,6CAA6C;IAC7C,OAAO,CAAC,gBAAgB,CAAkB;IAC1C,sCAAsC;IACtC,OAAO,CAAC,cAAc,CAAC,CAAU;IACjC,wGAAwG;IACxG,OAAO,CAAC,SAAS,CAAC,CAAmB;IACrC,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,kBAAkB,CAAsB;IAChD,wFAAwF;IACxF,OAAO,CAAC,aAAa,CAAwC;IAE7D,KAAK,CAAC,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,aAAa;IAkBnC,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAoCvC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;IAazE,OAAO,CAAC,EAAC,IAAI,EAAC,EAAE,aAAa,GAAG,IAAI;IAmBpC,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
import { log } from '@deck.gl/core';
|
|
2
|
+
import { terrainModule } from "./shader-module.js";
|
|
3
|
+
import { TerrainCover } from "./terrain-cover.js";
|
|
4
|
+
import { TerrainPass } from "./terrain-pass.js";
|
|
5
|
+
import { TerrainPickingPass } from "./terrain-picking-pass.js";
|
|
6
|
+
import { HeightMapBuilder } from "./height-map-builder.js";
|
|
7
|
+
/** Class to manage terrain effect */
|
|
8
|
+
export class TerrainEffect {
|
|
9
|
+
constructor() {
|
|
10
|
+
this.id = 'terrain-effect';
|
|
11
|
+
this.props = null;
|
|
12
|
+
this.useInPicking = true;
|
|
13
|
+
/** true if picking in the current pass */
|
|
14
|
+
this.isPicking = false;
|
|
15
|
+
/** true if should use in the current pass */
|
|
16
|
+
this.isDrapingEnabled = false;
|
|
17
|
+
/** One texture for each primitive terrain layer, into which the draped layers render */
|
|
18
|
+
this.terrainCovers = new Map();
|
|
19
|
+
}
|
|
20
|
+
setup({ device, deck }) {
|
|
21
|
+
this.dummyHeightMap = device.createTexture({
|
|
22
|
+
width: 1,
|
|
23
|
+
height: 1,
|
|
24
|
+
data: new Uint8Array([0, 0, 0, 0])
|
|
25
|
+
});
|
|
26
|
+
this.terrainPass = new TerrainPass(device, { id: 'terrain' });
|
|
27
|
+
this.terrainPickingPass = new TerrainPickingPass(device, { id: 'terrain-picking' });
|
|
28
|
+
if (HeightMapBuilder.isSupported(device)) {
|
|
29
|
+
this.heightMap = new HeightMapBuilder(device);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
log.warn('Terrain offset mode is not supported by this browser')();
|
|
33
|
+
}
|
|
34
|
+
deck._addDefaultShaderModule(terrainModule);
|
|
35
|
+
}
|
|
36
|
+
preRender(opts) {
|
|
37
|
+
// @ts-expect-error pickZ only defined in picking pass
|
|
38
|
+
if (opts.pickZ) {
|
|
39
|
+
// Do not update if picking attributes
|
|
40
|
+
this.isDrapingEnabled = false;
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const { viewports } = opts;
|
|
44
|
+
const isPicking = opts.pass.startsWith('picking');
|
|
45
|
+
this.isPicking = isPicking;
|
|
46
|
+
this.isDrapingEnabled = true;
|
|
47
|
+
// TODO - support multiple views?
|
|
48
|
+
const viewport = viewports[0];
|
|
49
|
+
const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(viewport, opts);
|
|
50
|
+
const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));
|
|
51
|
+
if (terrainLayers.length === 0) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
if (!isPicking) {
|
|
55
|
+
const offsetLayers = layers.filter(l => l.state.terrainDrawMode === 'offset');
|
|
56
|
+
if (offsetLayers.length > 0) {
|
|
57
|
+
this._updateHeightMap(terrainLayers, viewport, opts);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
const drapeLayers = layers.filter(l => l.state.terrainDrawMode === 'drape');
|
|
61
|
+
this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
|
|
62
|
+
}
|
|
63
|
+
getModuleParameters(layer) {
|
|
64
|
+
const { terrainDrawMode } = layer.state;
|
|
65
|
+
return {
|
|
66
|
+
heightMap: this.heightMap?.getRenderFramebuffer()?.colorAttachments[0].texture || null,
|
|
67
|
+
heightMapBounds: this.heightMap?.bounds,
|
|
68
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
69
|
+
terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
|
|
70
|
+
useTerrainHeightMap: terrainDrawMode === 'offset',
|
|
71
|
+
terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
cleanup({ deck }) {
|
|
75
|
+
if (this.dummyHeightMap) {
|
|
76
|
+
this.dummyHeightMap.delete();
|
|
77
|
+
this.dummyHeightMap = undefined;
|
|
78
|
+
}
|
|
79
|
+
if (this.heightMap) {
|
|
80
|
+
this.heightMap.delete();
|
|
81
|
+
this.heightMap = undefined;
|
|
82
|
+
}
|
|
83
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
84
|
+
terrainCover.delete();
|
|
85
|
+
}
|
|
86
|
+
this.terrainCovers.clear();
|
|
87
|
+
deck._removeDefaultShaderModule(terrainModule);
|
|
88
|
+
}
|
|
89
|
+
_updateHeightMap(terrainLayers, viewport, opts) {
|
|
90
|
+
if (!this.heightMap) {
|
|
91
|
+
// Not supported
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
const shouldUpdate = this.heightMap.shouldUpdate({ layers: terrainLayers, viewport });
|
|
95
|
+
if (!shouldUpdate) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
this.terrainPass.renderHeightMap(this.heightMap, {
|
|
99
|
+
...opts,
|
|
100
|
+
layers: terrainLayers,
|
|
101
|
+
moduleParameters: {
|
|
102
|
+
heightMapBounds: this.heightMap.bounds,
|
|
103
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
104
|
+
devicePixelRatio: 1,
|
|
105
|
+
drawToTerrainHeightMap: true
|
|
106
|
+
}
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
_updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts) {
|
|
110
|
+
// Mark a terrain cover as dirty if one of the drape layers needs redraw
|
|
111
|
+
const layerNeedsRedraw = {};
|
|
112
|
+
for (const layer of drapeLayers) {
|
|
113
|
+
if (layer.state.terrainCoverNeedsRedraw) {
|
|
114
|
+
layerNeedsRedraw[layer.id] = true;
|
|
115
|
+
layer.state.terrainCoverNeedsRedraw = false;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
119
|
+
terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({ layerNeedsRedraw });
|
|
120
|
+
}
|
|
121
|
+
for (const layer of terrainLayers) {
|
|
122
|
+
this._updateTerrainCover(layer, drapeLayers, viewport, opts);
|
|
123
|
+
}
|
|
124
|
+
if (!this.isPicking) {
|
|
125
|
+
this._pruneTerrainCovers();
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
_updateTerrainCover(terrainLayer, drapeLayers, viewport, opts) {
|
|
129
|
+
const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;
|
|
130
|
+
let terrainCover = this.terrainCovers.get(terrainLayer.id);
|
|
131
|
+
if (!terrainCover) {
|
|
132
|
+
terrainCover = new TerrainCover(terrainLayer);
|
|
133
|
+
this.terrainCovers.set(terrainLayer.id, terrainCover);
|
|
134
|
+
}
|
|
135
|
+
try {
|
|
136
|
+
const isDirty = terrainCover.shouldUpdate({
|
|
137
|
+
targetLayer: terrainLayer,
|
|
138
|
+
viewport,
|
|
139
|
+
layers: drapeLayers
|
|
140
|
+
});
|
|
141
|
+
if (this.isPicking || terrainCover.isDirty || isDirty) {
|
|
142
|
+
renderPass.renderTerrainCover(terrainCover, {
|
|
143
|
+
...opts,
|
|
144
|
+
layers: drapeLayers,
|
|
145
|
+
moduleParameters: {
|
|
146
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
147
|
+
terrainSkipRender: false,
|
|
148
|
+
devicePixelRatio: 1
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
if (!this.isPicking) {
|
|
152
|
+
// IsDirty refers to the normal fbo, not the picking fbo.
|
|
153
|
+
// Only mark it as not dirty if the normal fbo was updated.
|
|
154
|
+
terrainCover.isDirty = false;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
catch (err) {
|
|
159
|
+
terrainLayer.raiseError(err, `Error rendering terrain cover ${terrainCover.id}`);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
_pruneTerrainCovers() {
|
|
163
|
+
/** Prune the cache, remove textures for layers that have been removed */
|
|
164
|
+
const idsToRemove = [];
|
|
165
|
+
for (const [id, terrainCover] of this.terrainCovers) {
|
|
166
|
+
if (!terrainCover.isActive) {
|
|
167
|
+
idsToRemove.push(id);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
for (const id of idsToRemove) {
|
|
171
|
+
this.terrainCovers.delete(id);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
}
|