@deck.gl/extensions 9.0.0-beta.2 → 9.0.0-beta.3
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/dist/{esm/brushing → brushing}/shader-module.js +24 -30
- package/dist/clip/clip-extension.js +117 -0
- package/{typed → dist}/collision-filter/collision-filter-effect.d.ts.map +1 -1
- package/dist/collision-filter/collision-filter-effect.js +193 -0
- package/dist/collision-filter/collision-filter-extension.js +49 -0
- package/{typed → dist}/collision-filter/collision-filter-pass.d.ts.map +1 -1
- package/dist/collision-filter/collision-filter-pass.js +25 -0
- package/dist/{esm/collision-filter → collision-filter}/shader-module.js +17 -24
- package/dist/data-filter/aggregator.js +104 -0
- package/{typed → dist}/data-filter/data-filter-extension.d.ts.map +1 -1
- package/dist/data-filter/data-filter-extension.js +162 -0
- package/dist/data-filter/shader-module.js +159 -0
- package/dist/dist.dev.js +1762 -13033
- package/dist/fill-style/fill-style-extension.js +118 -0
- package/dist/{esm/fill-style → fill-style}/shaders.glsl.js +37 -43
- package/dist/fp64/fp64-extension.js +35 -0
- package/dist/{esm/fp64 → fp64}/project64.glsl.js +19 -1
- package/dist/fp64/project64.js +50 -0
- package/dist/index.cjs +2724 -0
- package/dist/index.cjs.map +7 -0
- package/dist/index.js +11 -0
- package/{typed → dist}/mask/mask-effect.d.ts.map +1 -1
- package/dist/mask/mask-effect.js +194 -0
- package/dist/mask/mask-extension.js +57 -0
- package/{typed → dist}/mask/mask-pass.d.ts.map +1 -1
- package/dist/mask/mask-pass.js +44 -0
- package/dist/{esm/mask → mask}/shader-module.js +18 -21
- package/dist/path-style/path-style-extension.js +111 -0
- package/dist/{esm/path-style → path-style}/shaders.glsl.js +20 -13
- package/dist/terrain/height-map-builder.js +104 -0
- package/dist/terrain/shader-module.js +139 -0
- package/dist/terrain/terrain-cover.js +187 -0
- package/{typed → dist}/terrain/terrain-effect.d.ts.map +1 -1
- package/dist/terrain/terrain-effect.js +184 -0
- package/dist/terrain/terrain-extension.js +44 -0
- package/{typed → dist}/terrain/terrain-pass.d.ts.map +1 -1
- package/dist/terrain/terrain-pass.js +61 -0
- package/{typed → dist}/terrain/terrain-picking-pass.d.ts.map +1 -1
- package/dist/terrain/terrain-picking-pass.js +66 -0
- package/dist/terrain/utils.js +21 -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.min.js +73 -205
- package/package.json +19 -12
- package/src/collision-filter/collision-filter-effect.ts +12 -8
- package/src/collision-filter/collision-filter-pass.ts +1 -3
- package/src/data-filter/data-filter-extension.ts +3 -5
- package/src/mask/mask-effect.ts +0 -1
- package/src/mask/mask-pass.ts +1 -3
- package/src/terrain/terrain-effect.ts +8 -2
- package/src/terrain/terrain-pass.ts +2 -5
- package/src/terrain/terrain-picking-pass.ts +1 -3
- package/src/utils/debug.ts +1 -2
- 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.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.map +0 -1
- package/dist/esm/data-filter/aggregator.js +0 -102
- 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.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.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.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.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 → dist}/brushing/brushing-extension.d.ts +0 -0
- /package/{typed → dist}/brushing/brushing-extension.d.ts.map +0 -0
- /package/{typed → dist}/brushing/shader-module.d.ts +0 -0
- /package/{typed → dist}/brushing/shader-module.d.ts.map +0 -0
- /package/{typed → dist}/clip/clip-extension.d.ts +0 -0
- /package/{typed → dist}/clip/clip-extension.d.ts.map +0 -0
- /package/{typed → dist}/collision-filter/collision-filter-effect.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/collision-filter-pass.d.ts +0 -0
- /package/{typed → dist}/collision-filter/shader-module.d.ts +0 -0
- /package/{typed → dist}/collision-filter/shader-module.d.ts.map +0 -0
- /package/{typed → dist}/data-filter/aggregator.d.ts +0 -0
- /package/{typed → dist}/data-filter/aggregator.d.ts.map +0 -0
- /package/{typed → dist}/data-filter/data-filter-extension.d.ts +0 -0
- /package/{typed → dist}/data-filter/shader-module.d.ts +0 -0
- /package/{typed → dist}/data-filter/shader-module.d.ts.map +0 -0
- /package/{typed → dist}/fill-style/fill-style-extension.d.ts +0 -0
- /package/{typed → dist}/fill-style/fill-style-extension.d.ts.map +0 -0
- /package/{typed → dist}/fill-style/shaders.glsl.d.ts +0 -0
- /package/{typed → dist}/fill-style/shaders.glsl.d.ts.map +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}/index.d.ts +0 -0
- /package/{typed → dist}/index.d.ts.map +0 -0
- /package/{typed → dist}/mask/mask-effect.d.ts +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/mask-pass.d.ts +0 -0
- /package/{typed → dist}/mask/shader-module.d.ts +0 -0
- /package/{typed → dist}/mask/shader-module.d.ts.map +0 -0
- /package/{typed → dist}/path-style/path-style-extension.d.ts +0 -0
- /package/{typed → dist}/path-style/path-style-extension.d.ts.map +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/height-map-builder.d.ts +0 -0
- /package/{typed → dist}/terrain/height-map-builder.d.ts.map +0 -0
- /package/{typed → dist}/terrain/shader-module.d.ts +0 -0
- /package/{typed → dist}/terrain/shader-module.d.ts.map +0 -0
- /package/{typed → dist}/terrain/terrain-cover.d.ts +0 -0
- /package/{typed → dist}/terrain/terrain-cover.d.ts.map +0 -0
- /package/{typed → dist}/terrain/terrain-effect.d.ts +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}/terrain/terrain-pass.d.ts +0 -0
- /package/{typed → dist}/terrain/terrain-picking-pass.d.ts +0 -0
- /package/{typed → dist}/terrain/utils.d.ts +0 -0
- /package/{typed → dist}/terrain/utils.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,187 @@
|
|
|
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
|
+
});
|
|
139
|
+
}
|
|
140
|
+
return this.pickingFbo;
|
|
141
|
+
}
|
|
142
|
+
filterLayers(layers) {
|
|
143
|
+
return layers.filter(({ id }) => this.layers.includes(id));
|
|
144
|
+
}
|
|
145
|
+
delete() {
|
|
146
|
+
const { fbo, pickingFbo } = this;
|
|
147
|
+
if (fbo) {
|
|
148
|
+
fbo.colorAttachments[0].destroy();
|
|
149
|
+
fbo.destroy();
|
|
150
|
+
}
|
|
151
|
+
if (pickingFbo) {
|
|
152
|
+
pickingFbo.colorAttachments[0].destroy();
|
|
153
|
+
pickingFbo.destroy();
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
/**
|
|
158
|
+
* Remove layers that do not overlap with the current terrain cover.
|
|
159
|
+
* This implementation only has effect when a TileLayer is overlaid on top of a TileLayer
|
|
160
|
+
*/
|
|
161
|
+
function getIntersectingLayers(sourceTile, layers) {
|
|
162
|
+
return layers.filter(layer => {
|
|
163
|
+
const tile = getTile(layer);
|
|
164
|
+
if (tile) {
|
|
165
|
+
return intersect(sourceTile.boundingBox, tile.boundingBox);
|
|
166
|
+
}
|
|
167
|
+
return true;
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
/** If layer is the descendent of a TileLayer, return the corresponding tile. */
|
|
171
|
+
function getTile(layer) {
|
|
172
|
+
while (layer) {
|
|
173
|
+
// @ts-expect-error tile may not exist
|
|
174
|
+
const { tile } = layer.props;
|
|
175
|
+
if (tile) {
|
|
176
|
+
return tile;
|
|
177
|
+
}
|
|
178
|
+
layer = layer.parent;
|
|
179
|
+
}
|
|
180
|
+
return null;
|
|
181
|
+
}
|
|
182
|
+
function intersect(b1, b2) {
|
|
183
|
+
if (b1 && b2) {
|
|
184
|
+
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];
|
|
185
|
+
}
|
|
186
|
+
return false;
|
|
187
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrain-effect.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAU,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAgB,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAMrE,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAW,MAAM,eAAe,CAAC;AAE7E,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,UAAU,CAAC,MAAM,EAAE,MAAM;IAkBzB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"terrain-effect.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAU,MAAM,eAAe,CAAC;AAG9C,OAAO,EAAgB,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAMrE,OAAO,KAAK,EAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAW,MAAM,eAAe,CAAC;AAE7E,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,UAAU,CAAC,MAAM,EAAE,MAAM;IAkBzB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA+CvD,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,qBAAqB;IAcxD,OAAO,IAAI,IAAI;IAiBf,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,oBAAoB;IA2B5B,OAAO,CAAC,mBAAmB;IAwC3B,OAAO,CAAC,mBAAmB;CAY5B"}
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
import { log, getShaderAssembler } 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
|
+
initialize(device) {
|
|
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
|
+
getShaderAssembler().addDefaultModule(terrainModule);
|
|
35
|
+
}
|
|
36
|
+
preRender(device, opts) {
|
|
37
|
+
if (!this.dummyHeightMap) {
|
|
38
|
+
// First time this effect is in use, initialize resources and register the shader module
|
|
39
|
+
this.initialize(device);
|
|
40
|
+
for (const layer of opts.layers) {
|
|
41
|
+
// Force the terrain layer (and its descendents) to rebuild their models with the new shader
|
|
42
|
+
if (layer.props.operation.includes('terrain')) {
|
|
43
|
+
layer.setChangeFlags({ extensionsChanged: true });
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
// @ts-expect-error pickZ only defined in picking pass
|
|
48
|
+
if (opts.pickZ) {
|
|
49
|
+
// Do not update if picking attributes
|
|
50
|
+
this.isDrapingEnabled = false;
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const { viewports } = opts;
|
|
54
|
+
const isPicking = opts.pass.startsWith('picking');
|
|
55
|
+
this.isPicking = isPicking;
|
|
56
|
+
this.isDrapingEnabled = true;
|
|
57
|
+
// TODO - support multiple views?
|
|
58
|
+
const viewport = viewports[0];
|
|
59
|
+
const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(viewport, opts);
|
|
60
|
+
const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));
|
|
61
|
+
if (terrainLayers.length === 0) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (!isPicking) {
|
|
65
|
+
const offsetLayers = layers.filter(l => l.state.terrainDrawMode === 'offset');
|
|
66
|
+
if (offsetLayers.length > 0) {
|
|
67
|
+
this._updateHeightMap(terrainLayers, viewport, opts);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
const drapeLayers = layers.filter(l => l.state.terrainDrawMode === 'drape');
|
|
71
|
+
this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
|
|
72
|
+
}
|
|
73
|
+
getModuleParameters(layer) {
|
|
74
|
+
const { terrainDrawMode } = layer.state;
|
|
75
|
+
return {
|
|
76
|
+
// @ts-expect-error
|
|
77
|
+
heightMap: this.heightMap?.getRenderFramebuffer(),
|
|
78
|
+
heightMapBounds: this.heightMap?.bounds,
|
|
79
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
80
|
+
terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
|
|
81
|
+
useTerrainHeightMap: terrainDrawMode === 'offset',
|
|
82
|
+
terrainSkipRender: terrainDrawMode === 'drape' || !layer.props.operation.includes('draw')
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
cleanup() {
|
|
86
|
+
if (this.dummyHeightMap) {
|
|
87
|
+
this.dummyHeightMap.delete();
|
|
88
|
+
this.dummyHeightMap = undefined;
|
|
89
|
+
}
|
|
90
|
+
if (this.heightMap) {
|
|
91
|
+
this.heightMap.delete();
|
|
92
|
+
this.heightMap = undefined;
|
|
93
|
+
}
|
|
94
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
95
|
+
terrainCover.delete();
|
|
96
|
+
}
|
|
97
|
+
this.terrainCovers.clear();
|
|
98
|
+
}
|
|
99
|
+
_updateHeightMap(terrainLayers, viewport, opts) {
|
|
100
|
+
if (!this.heightMap) {
|
|
101
|
+
// Not supported
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const shouldUpdate = this.heightMap.shouldUpdate({ layers: terrainLayers, viewport });
|
|
105
|
+
if (!shouldUpdate) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
this.terrainPass.renderHeightMap(this.heightMap, {
|
|
109
|
+
...opts,
|
|
110
|
+
layers: terrainLayers,
|
|
111
|
+
moduleParameters: {
|
|
112
|
+
heightMapBounds: this.heightMap.bounds,
|
|
113
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
114
|
+
devicePixelRatio: 1,
|
|
115
|
+
drawToTerrainHeightMap: true
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
_updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts) {
|
|
120
|
+
// Mark a terrain cover as dirty if one of the drape layers needs redraw
|
|
121
|
+
const layerNeedsRedraw = {};
|
|
122
|
+
for (const layer of drapeLayers) {
|
|
123
|
+
if (layer.state.terrainCoverNeedsRedraw) {
|
|
124
|
+
layerNeedsRedraw[layer.id] = true;
|
|
125
|
+
layer.state.terrainCoverNeedsRedraw = false;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
129
|
+
terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({ layerNeedsRedraw });
|
|
130
|
+
}
|
|
131
|
+
for (const layer of terrainLayers) {
|
|
132
|
+
this._updateTerrainCover(layer, drapeLayers, viewport, opts);
|
|
133
|
+
}
|
|
134
|
+
if (!this.isPicking) {
|
|
135
|
+
this._pruneTerrainCovers();
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
_updateTerrainCover(terrainLayer, drapeLayers, viewport, opts) {
|
|
139
|
+
const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;
|
|
140
|
+
let terrainCover = this.terrainCovers.get(terrainLayer.id);
|
|
141
|
+
if (!terrainCover) {
|
|
142
|
+
terrainCover = new TerrainCover(terrainLayer);
|
|
143
|
+
this.terrainCovers.set(terrainLayer.id, terrainCover);
|
|
144
|
+
}
|
|
145
|
+
try {
|
|
146
|
+
const isDirty = terrainCover.shouldUpdate({
|
|
147
|
+
targetLayer: terrainLayer,
|
|
148
|
+
viewport,
|
|
149
|
+
layers: drapeLayers
|
|
150
|
+
});
|
|
151
|
+
if (this.isPicking || terrainCover.isDirty || isDirty) {
|
|
152
|
+
renderPass.renderTerrainCover(terrainCover, {
|
|
153
|
+
...opts,
|
|
154
|
+
layers: drapeLayers,
|
|
155
|
+
moduleParameters: {
|
|
156
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
157
|
+
terrainSkipRender: false,
|
|
158
|
+
devicePixelRatio: 1
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
if (!this.isPicking) {
|
|
162
|
+
// IsDirty refers to the normal fbo, not the picking fbo.
|
|
163
|
+
// Only mark it as not dirty if the normal fbo was updated.
|
|
164
|
+
terrainCover.isDirty = false;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
catch (err) {
|
|
169
|
+
terrainLayer.raiseError(err, `Error rendering terrain cover ${terrainCover.id}`);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
_pruneTerrainCovers() {
|
|
173
|
+
/** Prune the cache, remove textures for layers that have been removed */
|
|
174
|
+
const idsToRemove = [];
|
|
175
|
+
for (const [id, terrainCover] of this.terrainCovers) {
|
|
176
|
+
if (!terrainCover.isActive) {
|
|
177
|
+
idsToRemove.push(id);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
for (const id of idsToRemove) {
|
|
181
|
+
this.terrainCovers.delete(id);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { LayerExtension } from '@deck.gl/core';
|
|
2
|
+
import { TerrainEffect } from "./terrain-effect.js";
|
|
3
|
+
import { terrainModule } from "./shader-module.js";
|
|
4
|
+
const defaultProps = {
|
|
5
|
+
terrainDrawMode: undefined
|
|
6
|
+
};
|
|
7
|
+
/** Allows layers to show/hide objects by a geofence. */
|
|
8
|
+
export default class TerrainExtension extends LayerExtension {
|
|
9
|
+
static { this.defaultProps = defaultProps; }
|
|
10
|
+
static { this.extensionName = 'TerrainExtension'; }
|
|
11
|
+
getShaders() {
|
|
12
|
+
return {
|
|
13
|
+
modules: [terrainModule]
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
initializeState() {
|
|
17
|
+
this.context.deck?._addDefaultEffect(new TerrainEffect());
|
|
18
|
+
}
|
|
19
|
+
updateState(params) {
|
|
20
|
+
const { props, oldProps } = params;
|
|
21
|
+
if (this.state.terrainDrawMode &&
|
|
22
|
+
props.terrainDrawMode === oldProps.terrainDrawMode &&
|
|
23
|
+
// @ts-ignore `extruded` may not exist in props
|
|
24
|
+
props.extruded === oldProps.extruded) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
let { terrainDrawMode } = props;
|
|
28
|
+
if (!terrainDrawMode) {
|
|
29
|
+
// props.extruded is used as an indication that the layer is 2.5D
|
|
30
|
+
// @ts-ignore `extruded` may not exist in props
|
|
31
|
+
const is3d = this.props.extruded;
|
|
32
|
+
const attributes = this.getAttributeManager()?.attributes;
|
|
33
|
+
const hasAnchor = attributes && 'instancePositions' in attributes;
|
|
34
|
+
terrainDrawMode = is3d || hasAnchor ? 'offset' : 'drape';
|
|
35
|
+
}
|
|
36
|
+
this.setState({ terrainDrawMode });
|
|
37
|
+
}
|
|
38
|
+
onNeedsRedraw() {
|
|
39
|
+
const state = this.state;
|
|
40
|
+
if (state.terrainDrawMode === 'drape') {
|
|
41
|
+
state.terrainCoverNeedsRedraw = true;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrain-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-pass.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terrain-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-pass.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAClG,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,wBAAwB,GAAG,uBAAuB,CAAC;AAE/D,6DAA6D;AAC7D,qBAAa,WAAY,SAAQ,UAAU;IACzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,wBAAwB,GAAG,KAAK,EAAE;IAchF,eAAe,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;IA+BpF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,wBAAwB,CAAC;CA4BvF"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { GL } from '@luma.gl/constants';
|
|
2
|
+
import { _LayersPass as LayersPass } from '@deck.gl/core';
|
|
3
|
+
/** Renders textures used by the TerrainEffect render pass */
|
|
4
|
+
export class TerrainPass extends LayersPass {
|
|
5
|
+
getRenderableLayers(viewport, opts) {
|
|
6
|
+
const { layers } = opts;
|
|
7
|
+
const result = [];
|
|
8
|
+
const drawParamsByIndex = this._getDrawLayerParams(viewport, opts, true);
|
|
9
|
+
for (let i = 0; i < layers.length; i++) {
|
|
10
|
+
const layer = layers[i];
|
|
11
|
+
if (!layer.isComposite && drawParamsByIndex[i].shouldDrawLayer) {
|
|
12
|
+
result.push(layer);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
return result;
|
|
16
|
+
}
|
|
17
|
+
renderHeightMap(heightMap, opts) {
|
|
18
|
+
// console.log('Updating height map')
|
|
19
|
+
const target = heightMap.getRenderFramebuffer();
|
|
20
|
+
const viewport = heightMap.renderViewport;
|
|
21
|
+
if (!target || !viewport) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
target.resize(viewport);
|
|
25
|
+
this.device.withParametersWebGL({
|
|
26
|
+
clearColor: [0, 0, 0, 0],
|
|
27
|
+
blend: true,
|
|
28
|
+
blendFunc: [GL.ONE, GL.ONE],
|
|
29
|
+
blendEquation: GL.MAX,
|
|
30
|
+
depthTest: false
|
|
31
|
+
}, () => this.render({
|
|
32
|
+
...opts,
|
|
33
|
+
target,
|
|
34
|
+
pass: 'terrain-height-map',
|
|
35
|
+
layers: opts.layers,
|
|
36
|
+
viewports: [viewport],
|
|
37
|
+
effects: []
|
|
38
|
+
}));
|
|
39
|
+
}
|
|
40
|
+
renderTerrainCover(terrainCover, opts) {
|
|
41
|
+
// console.log('Updating terrain cover ' + terrainCover.id)
|
|
42
|
+
const target = terrainCover.getRenderFramebuffer();
|
|
43
|
+
const viewport = terrainCover.renderViewport;
|
|
44
|
+
if (!target || !viewport) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const layers = terrainCover.filterLayers(opts.layers);
|
|
48
|
+
target.resize(viewport);
|
|
49
|
+
this.device.withParametersWebGL({
|
|
50
|
+
clearColor: [0, 0, 0, 0],
|
|
51
|
+
depthTest: false
|
|
52
|
+
}, () => this.render({
|
|
53
|
+
...opts,
|
|
54
|
+
target,
|
|
55
|
+
pass: `terrain-cover-${terrainCover.id}`,
|
|
56
|
+
layers,
|
|
57
|
+
effects: [],
|
|
58
|
+
viewports: [viewport]
|
|
59
|
+
}));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terrain-picking-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-picking-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,QAAQ,EACR,uBAAuB,EACvB,eAAe,IAAI,cAAc,EAClC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"terrain-picking-pass.d.ts","sourceRoot":"","sources":["../../src/terrain/terrain-picking-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,QAAQ,EACR,uBAAuB,EACvB,eAAe,IAAI,cAAc,EAClC,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAElD,MAAM,MAAM,+BAA+B,GAAG,uBAAuB,GAAG;IACtE,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,8DAA8D;AAC9D,qBAAa,kBAAmB,SAAQ,cAAc;IACpD;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEzC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,+BAA+B,GAAG,KAAK,EAAE;IAiBvF,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,+BAA+B,CAAC;IAqC7F,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;CAQxF"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { _PickLayersPass as PickLayersPass } from '@deck.gl/core';
|
|
2
|
+
/** Renders textures used by the TerrainEffect picking pass */
|
|
3
|
+
export class TerrainPickingPass extends PickLayersPass {
|
|
4
|
+
constructor() {
|
|
5
|
+
super(...arguments);
|
|
6
|
+
/** Save layer index for use when drawing to terrain cover.
|
|
7
|
+
* When a terrain cover's picking buffer is rendered,
|
|
8
|
+
* we need to make sure each layer receives a consistent index (encoded in the alpha channel)
|
|
9
|
+
* so that a picked color can be decoded back to the correct layer.
|
|
10
|
+
* Updated in getRenderableLayers which is called in TerrainEffect.preRender
|
|
11
|
+
*/
|
|
12
|
+
this.drawParameters = {};
|
|
13
|
+
}
|
|
14
|
+
getRenderableLayers(viewport, opts) {
|
|
15
|
+
const { layers } = opts;
|
|
16
|
+
const result = [];
|
|
17
|
+
this.drawParameters = {};
|
|
18
|
+
this._resetColorEncoder(opts.pickZ);
|
|
19
|
+
const drawParamsByIndex = this._getDrawLayerParams(viewport, opts);
|
|
20
|
+
for (let i = 0; i < layers.length; i++) {
|
|
21
|
+
const layer = layers[i];
|
|
22
|
+
if (!layer.isComposite && drawParamsByIndex[i].shouldDrawLayer) {
|
|
23
|
+
result.push(layer);
|
|
24
|
+
this.drawParameters[layer.id] = drawParamsByIndex[i].layerParameters;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return result;
|
|
28
|
+
}
|
|
29
|
+
renderTerrainCover(terrainCover, opts) {
|
|
30
|
+
// console.log('Updating terrain cover for picking ' + terrainCover.id)
|
|
31
|
+
const target = terrainCover.getPickingFramebuffer();
|
|
32
|
+
const viewport = terrainCover.renderViewport;
|
|
33
|
+
if (!target || !viewport) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const layers = terrainCover.filterLayers(opts.layers);
|
|
37
|
+
const terrainLayer = terrainCover.targetLayer;
|
|
38
|
+
if (terrainLayer.props.pickable) {
|
|
39
|
+
layers.unshift(terrainLayer);
|
|
40
|
+
}
|
|
41
|
+
target.resize(viewport);
|
|
42
|
+
this.device.withParametersWebGL({
|
|
43
|
+
depthTest: false
|
|
44
|
+
}, () => this.render({
|
|
45
|
+
...opts,
|
|
46
|
+
pickingFBO: target,
|
|
47
|
+
pass: `terrain-cover-picking-${terrainCover.id}`,
|
|
48
|
+
layers,
|
|
49
|
+
effects: [],
|
|
50
|
+
viewports: [viewport],
|
|
51
|
+
// Disable the default culling because TileLayer would cull sublayers based on the screen viewport,
|
|
52
|
+
// not the viewport of the terrain cover. Culling is already done by `terrainCover.filterLayers`
|
|
53
|
+
cullRect: undefined,
|
|
54
|
+
deviceRect: viewport,
|
|
55
|
+
pickZ: false
|
|
56
|
+
}));
|
|
57
|
+
}
|
|
58
|
+
getLayerParameters(layer, layerIndex, viewport) {
|
|
59
|
+
if (this.drawParameters[layer.id]) {
|
|
60
|
+
return this.drawParameters[layer.id];
|
|
61
|
+
}
|
|
62
|
+
const parameters = super.getLayerParameters(layer, layerIndex, viewport);
|
|
63
|
+
parameters.blend = true;
|
|
64
|
+
return parameters;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { GL } from '@luma.gl/constants';
|
|
2
|
+
export function createRenderTarget(device, opts) {
|
|
3
|
+
return device.createFramebuffer({
|
|
4
|
+
id: opts.id,
|
|
5
|
+
colorAttachments: [
|
|
6
|
+
device.createTexture({
|
|
7
|
+
...(opts.float && {
|
|
8
|
+
format: device.info.type === 'webgl2' ? 'rgba32float' : 'rgba8unorm',
|
|
9
|
+
type: GL.FLOAT
|
|
10
|
+
}),
|
|
11
|
+
mipmaps: false,
|
|
12
|
+
sampler: {
|
|
13
|
+
minFilter: 'linear',
|
|
14
|
+
magFilter: 'linear',
|
|
15
|
+
addressModeU: 'clamp-to-edge',
|
|
16
|
+
addressModeV: 'clamp-to-edge'
|
|
17
|
+
}
|
|
18
|
+
})
|
|
19
|
+
]
|
|
20
|
+
});
|
|
21
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../src/utils/debug.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../src/utils/debug.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,qDAAqD;AAErD,eAAO,MAAM,QAAQ,QACd,WAAW;;;UAmDjB,CAAC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/* global document */
|
|
2
|
+
/** Debug utility to draw FBO contents onto screen */
|
|
3
|
+
// eslint-disable-next-line
|
|
4
|
+
export const debugFBO = function (fbo, { minimap, opaque } = {}) {
|
|
5
|
+
const color = fbo.device.readPixelsToArrayWebGL(fbo);
|
|
6
|
+
let canvas = document.getElementById('fbo-canvas');
|
|
7
|
+
const canvasHeight = (minimap ? 2 : 1) * fbo.height;
|
|
8
|
+
if (!canvas) {
|
|
9
|
+
canvas = document.createElement('canvas');
|
|
10
|
+
canvas.id = 'fbo-canvas';
|
|
11
|
+
canvas.style.zIndex = '100';
|
|
12
|
+
canvas.style.position = 'absolute';
|
|
13
|
+
canvas.style.top = '0';
|
|
14
|
+
canvas.style.right = '0';
|
|
15
|
+
canvas.style.border = 'blue 1px solid';
|
|
16
|
+
canvas.style.transform = 'scaleY(-1)';
|
|
17
|
+
document.body.appendChild(canvas);
|
|
18
|
+
}
|
|
19
|
+
if (canvas.width !== fbo.width || canvas.height !== canvasHeight) {
|
|
20
|
+
canvas.width = fbo.width;
|
|
21
|
+
canvas.height = canvasHeight;
|
|
22
|
+
canvas.style.width = '400px';
|
|
23
|
+
}
|
|
24
|
+
const ctx = canvas.getContext('2d');
|
|
25
|
+
const imageData = ctx.createImageData(canvas.width, canvas.height);
|
|
26
|
+
// Minimap
|
|
27
|
+
if (minimap) {
|
|
28
|
+
const zoom = 8; // Zoom factor for minimap
|
|
29
|
+
const { width, height } = canvas;
|
|
30
|
+
for (let y = 0; y < height; y++) {
|
|
31
|
+
for (let x = 0; x < width; x++) {
|
|
32
|
+
const d = 4 * (x + y * width); // destination pixel
|
|
33
|
+
const s = 4 * (Math.floor(x / zoom) + Math.floor(y / zoom) * width); // source
|
|
34
|
+
imageData.data[d + 0] = color[s + 0];
|
|
35
|
+
imageData.data[d + 1] = color[s + 1];
|
|
36
|
+
imageData.data[d + 2] = color[s + 2];
|
|
37
|
+
imageData.data[d + 3] = opaque ? 255 : color[s + 3];
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
// Full map
|
|
42
|
+
const offset = minimap ? color.length : 0;
|
|
43
|
+
for (let i = 0; i < color.length; i += 4) {
|
|
44
|
+
imageData.data[offset + i + 0] = color[i + 0];
|
|
45
|
+
imageData.data[offset + i + 1] = color[i + 1];
|
|
46
|
+
imageData.data[offset + i + 2] = color[i + 2];
|
|
47
|
+
imageData.data[offset + i + 3] = opaque ? 255 : color[i + 3];
|
|
48
|
+
}
|
|
49
|
+
ctx.putImageData(imageData, 0, 0);
|
|
50
|
+
};
|