@deck.gl/extensions 8.9.0-alpha.5 → 8.9.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 +3688 -14538
- package/dist/es5/brushing/brushing.js +0 -8
- package/dist/es5/brushing/brushing.js.map +1 -1
- package/dist/es5/clip/clip.js +5 -5
- package/dist/es5/clip/clip.js.map +1 -1
- package/dist/es5/collide/collide-effect.js +285 -0
- package/dist/es5/collide/collide-effect.js.map +1 -0
- package/dist/es5/collide/collide-pass.js +80 -0
- package/dist/es5/collide/collide-pass.js.map +1 -0
- package/dist/es5/collide/collide.js +116 -0
- package/dist/es5/collide/collide.js.map +1 -0
- package/dist/es5/collide/shader-module.js +39 -0
- package/dist/es5/collide/shader-module.js.map +1 -0
- package/dist/es5/common/projection-utils.js +164 -0
- package/dist/es5/common/projection-utils.js.map +1 -0
- package/dist/es5/data-filter/shader-module.js +1 -0
- package/dist/es5/data-filter/shader-module.js.map +1 -1
- package/dist/es5/fill-style/fill-style.js +16 -125
- package/dist/es5/fill-style/fill-style.js.map +1 -1
- package/dist/es5/fill-style/shaders.glsl.js +6 -8
- package/dist/es5/fill-style/shaders.glsl.js.map +1 -1
- package/dist/es5/fp64/project64.glsl.js +1 -1
- package/dist/es5/index.js +16 -0
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/mask/mask-effect.js +280 -0
- package/dist/es5/mask/mask-effect.js.map +1 -0
- package/dist/es5/mask/mask-pass.js +106 -0
- package/dist/es5/mask/mask-pass.js.map +1 -0
- package/dist/es5/mask/mask.js +17 -4
- package/dist/es5/mask/mask.js.map +1 -1
- package/dist/es5/mask/shader-module.js +1 -1
- package/dist/es5/mask/shader-module.js.map +1 -1
- package/dist/es5/mask/utils.js +136 -0
- package/dist/es5/mask/utils.js.map +1 -0
- package/dist/es5/path-style/shaders.glsl.js +1 -1
- package/dist/es5/terrain/height-map-builder.js +116 -0
- package/dist/es5/terrain/height-map-builder.js.map +1 -0
- package/dist/es5/terrain/shader-module.js +84 -0
- package/dist/es5/terrain/shader-module.js.map +1 -0
- package/dist/es5/terrain/terrain-cover.js +259 -0
- package/dist/es5/terrain/terrain-cover.js.map +1 -0
- package/dist/es5/terrain/terrain-effect.js +337 -0
- package/dist/es5/terrain/terrain-effect.js.map +1 -0
- package/dist/es5/terrain/terrain-pass.js +122 -0
- package/dist/es5/terrain/terrain-pass.js.map +1 -0
- package/dist/es5/terrain/terrain-picking-pass.js +130 -0
- package/dist/es5/terrain/terrain-picking-pass.js.map +1 -0
- package/dist/es5/terrain/terrain.js +101 -0
- package/dist/es5/terrain/terrain.js.map +1 -0
- package/dist/es5/terrain/utils.js +32 -0
- package/dist/es5/terrain/utils.js.map +1 -0
- package/dist/es5/utils/debug.js +71 -0
- package/dist/es5/utils/debug.js.map +1 -0
- package/dist/esm/brushing/brushing.js +0 -7
- package/dist/esm/brushing/brushing.js.map +1 -1
- package/dist/esm/clip/clip.js +5 -4
- package/dist/esm/clip/clip.js.map +1 -1
- package/dist/esm/collide/collide-effect.js +250 -0
- package/dist/esm/collide/collide-effect.js.map +1 -0
- package/dist/esm/collide/collide-pass.js +30 -0
- package/dist/esm/collide/collide-pass.js.map +1 -0
- package/dist/esm/collide/collide.js +78 -0
- package/dist/esm/collide/collide.js.map +1 -0
- package/dist/esm/collide/shader-module.js +32 -0
- package/dist/esm/collide/shader-module.js.map +1 -0
- package/dist/esm/common/projection-utils.js +130 -0
- package/dist/esm/common/projection-utils.js.map +1 -0
- package/dist/esm/data-filter/shader-module.js +1 -0
- package/dist/esm/data-filter/shader-module.js.map +1 -1
- package/dist/esm/fill-style/fill-style.js +20 -72
- package/dist/esm/fill-style/fill-style.js.map +1 -1
- package/dist/esm/fill-style/shaders.glsl.js +5 -7
- package/dist/esm/fill-style/shaders.glsl.js.map +1 -1
- package/dist/esm/fp64/project64.glsl.js +1 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mask/mask-effect.js +233 -0
- package/dist/esm/mask/mask-effect.js.map +1 -0
- package/dist/esm/mask/mask-pass.js +62 -0
- package/dist/esm/mask/mask-pass.js.map +1 -0
- package/dist/esm/mask/mask.js +14 -3
- package/dist/esm/mask/mask.js.map +1 -1
- package/dist/esm/mask/shader-module.js +1 -1
- package/dist/esm/mask/shader-module.js.map +1 -1
- package/dist/esm/mask/utils.js +109 -0
- package/dist/esm/mask/utils.js.map +1 -0
- package/dist/esm/path-style/shaders.glsl.js +1 -1
- package/dist/esm/terrain/height-map-builder.js +92 -0
- package/dist/esm/terrain/height-map-builder.js.map +1 -0
- package/dist/esm/terrain/shader-module.js +73 -0
- package/dist/esm/terrain/shader-module.js.map +1 -0
- package/dist/esm/terrain/terrain-cover.js +219 -0
- package/dist/esm/terrain/terrain-cover.js.map +1 -0
- package/dist/esm/terrain/terrain-effect.js +231 -0
- package/dist/esm/terrain/terrain-effect.js.map +1 -0
- package/dist/esm/terrain/terrain-pass.js +69 -0
- package/dist/esm/terrain/terrain-pass.js.map +1 -0
- package/dist/esm/terrain/terrain-picking-pass.js +75 -0
- package/dist/esm/terrain/terrain-picking-pass.js.map +1 -0
- package/dist/esm/terrain/terrain.js +62 -0
- package/dist/esm/terrain/terrain.js.map +1 -0
- package/dist/esm/terrain/utils.js +21 -0
- package/dist/esm/terrain/utils.js.map +1 -0
- package/dist/esm/utils/debug.js +61 -0
- package/dist/esm/utils/debug.js.map +1 -0
- package/dist.min.js +1359 -1
- package/package.json +6 -4
- package/src/brushing/brushing.ts +0 -11
- package/src/clip/clip.ts +6 -5
- package/src/collide/collide-effect.ts +257 -0
- package/src/collide/collide-pass.ts +35 -0
- package/src/collide/collide.ts +79 -0
- package/src/collide/shader-module.ts +113 -0
- package/src/common/projection-utils.ts +187 -0
- package/src/data-filter/shader-module.ts +6 -0
- package/src/fill-style/fill-style.ts +15 -53
- package/src/fill-style/shaders.glsl.ts +6 -7
- package/src/index.ts +4 -0
- package/src/mask/mask-effect.ts +255 -0
- package/src/mask/mask-pass.ts +67 -0
- package/src/mask/mask.ts +17 -7
- package/src/mask/shader-module.ts +7 -1
- package/src/mask/utils.ts +148 -0
- package/src/terrain/height-map-builder.ts +120 -0
- package/src/terrain/shader-module.ts +161 -0
- package/src/terrain/terrain-cover.ts +225 -0
- package/src/terrain/terrain-effect.ts +223 -0
- package/src/terrain/terrain-pass.ts +86 -0
- package/src/terrain/terrain-picking-pass.ts +87 -0
- package/src/terrain/terrain.ts +74 -0
- package/src/terrain/utils.ts +29 -0
- package/src/utils/debug.ts +59 -0
- package/typed/brushing/brushing.d.ts +0 -1
- package/typed/brushing/brushing.d.ts.map +1 -1
- package/typed/brushing/brushing.js +83 -0
- package/typed/brushing/shader-module.js +116 -0
- package/typed/clip/clip.d.ts +1 -1
- package/typed/clip/clip.d.ts.map +1 -1
- package/typed/clip/clip.js +114 -0
- package/typed/collide/collide-effect.d.ts +28 -0
- package/typed/collide/collide-effect.d.ts.map +1 -0
- package/typed/collide/collide-pass.d.ts +14 -0
- package/typed/collide/collide-pass.d.ts.map +1 -0
- package/typed/collide/collide.d.ts +41 -0
- package/typed/collide/collide.d.ts.map +1 -0
- package/typed/collide/shader-module.d.ts +4 -0
- package/typed/collide/shader-module.d.ts.map +1 -0
- package/typed/common/projection-utils.d.ts +27 -0
- package/typed/common/projection-utils.d.ts.map +1 -0
- package/typed/data-filter/aggregator.js +98 -0
- package/typed/data-filter/data-filter.js +159 -0
- package/typed/data-filter/shader-module.d.ts.map +1 -1
- package/typed/data-filter/shader-module.js +152 -0
- package/typed/fill-style/fill-style.d.ts +14 -5
- package/typed/fill-style/fill-style.d.ts.map +1 -1
- package/typed/fill-style/fill-style.js +152 -0
- package/typed/fill-style/shaders.glsl.d.ts.map +1 -1
- package/typed/fill-style/shaders.glsl.js +95 -0
- package/typed/fp64/fp64.js +34 -0
- package/typed/fp64/project64.glsl.js +100 -0
- package/typed/fp64/project64.js +50 -0
- package/typed/index.d.ts +4 -0
- package/typed/index.d.ts.map +1 -1
- package/typed/index.js +9 -0
- package/typed/mask/mask-effect.d.ts +42 -0
- package/typed/mask/mask-effect.d.ts.map +1 -0
- package/typed/mask/mask-pass.d.ts +19 -0
- package/typed/mask/mask-pass.d.ts.map +1 -0
- package/typed/mask/mask.d.ts +9 -3
- package/typed/mask/mask.d.ts.map +1 -1
- package/typed/mask/mask.js +48 -0
- package/typed/mask/shader-module.d.ts.map +1 -1
- package/typed/mask/shader-module.js +73 -0
- package/typed/mask/utils.d.ts +13 -0
- package/typed/mask/utils.d.ts.map +1 -0
- package/typed/path-style/path-style.js +107 -0
- package/typed/path-style/shaders.glsl.js +93 -0
- package/typed/terrain/height-map-builder.d.ts +38 -0
- package/typed/terrain/height-map-builder.d.ts.map +1 -0
- package/typed/terrain/height-map.d.ts +27 -0
- package/typed/terrain/height-map.d.ts.map +1 -0
- package/typed/terrain/shader-module-offset.d.ts +4 -0
- package/typed/terrain/shader-module-offset.d.ts.map +1 -0
- package/typed/terrain/shader-module-source.d.ts +4 -0
- package/typed/terrain/shader-module-source.d.ts.map +1 -0
- package/typed/terrain/shader-module.d.ts +31 -0
- package/typed/terrain/shader-module.d.ts.map +1 -0
- package/typed/terrain/terrain-cover.d.ts +46 -0
- package/typed/terrain/terrain-cover.d.ts.map +1 -0
- package/typed/terrain/terrain-effect.d.ts +29 -0
- package/typed/terrain/terrain-effect.d.ts.map +1 -0
- package/typed/terrain/terrain-pass.d.ts +11 -0
- package/typed/terrain/terrain-pass.d.ts.map +1 -0
- package/typed/terrain/terrain-picking-pass.d.ts +19 -0
- package/typed/terrain/terrain-picking-pass.d.ts.map +1 -0
- package/typed/terrain/terrain.d.ts +21 -0
- package/typed/terrain/terrain.d.ts.map +1 -0
- package/typed/terrain/utils.d.ts +5 -0
- package/typed/terrain/utils.d.ts.map +1 -0
- package/typed/utils/debug.d.ts +6 -0
- package/typed/utils/debug.d.ts.map +1 -0
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import { createRenderTarget } from './utils';
|
|
3
|
+
import { joinLayerBounds, makeViewport, getRenderBounds } from '../common/projection-utils';
|
|
4
|
+
export class TerrainCover {
|
|
5
|
+
constructor(targetLayer) {
|
|
6
|
+
_defineProperty(this, "isDirty", true);
|
|
7
|
+
|
|
8
|
+
_defineProperty(this, "targetLayer", void 0);
|
|
9
|
+
|
|
10
|
+
_defineProperty(this, "renderViewport", null);
|
|
11
|
+
|
|
12
|
+
_defineProperty(this, "bounds", null);
|
|
13
|
+
|
|
14
|
+
_defineProperty(this, "fbo", void 0);
|
|
15
|
+
|
|
16
|
+
_defineProperty(this, "pickingFbo", void 0);
|
|
17
|
+
|
|
18
|
+
_defineProperty(this, "layers", []);
|
|
19
|
+
|
|
20
|
+
_defineProperty(this, "tile", void 0);
|
|
21
|
+
|
|
22
|
+
_defineProperty(this, "targetBounds", null);
|
|
23
|
+
|
|
24
|
+
_defineProperty(this, "targetBoundsCommon", null);
|
|
25
|
+
|
|
26
|
+
this.targetLayer = targetLayer;
|
|
27
|
+
this.tile = getTile(targetLayer);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
get id() {
|
|
31
|
+
return this.targetLayer.id;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
get isActive() {
|
|
35
|
+
return Boolean(this.targetLayer.getCurrentLayer());
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
shouldUpdate({
|
|
39
|
+
targetLayer,
|
|
40
|
+
viewport,
|
|
41
|
+
layers,
|
|
42
|
+
layerNeedsRedraw
|
|
43
|
+
}) {
|
|
44
|
+
if (targetLayer) {
|
|
45
|
+
this.targetLayer = targetLayer;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const sizeChanged = viewport ? this._updateViewport(viewport) : false;
|
|
49
|
+
let layersChanged = layers ? this._updateLayers(layers) : false;
|
|
50
|
+
|
|
51
|
+
if (layerNeedsRedraw) {
|
|
52
|
+
for (const id of this.layers) {
|
|
53
|
+
if (layerNeedsRedraw[id]) {
|
|
54
|
+
layersChanged = true;
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return layersChanged || sizeChanged;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
_updateLayers(layers) {
|
|
64
|
+
let needsRedraw = false;
|
|
65
|
+
layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;
|
|
66
|
+
|
|
67
|
+
if (layers.length !== this.layers.length) {
|
|
68
|
+
needsRedraw = true;
|
|
69
|
+
} else {
|
|
70
|
+
for (let i = 0; i < layers.length; i++) {
|
|
71
|
+
const id = layers[i].id;
|
|
72
|
+
|
|
73
|
+
if (id !== this.layers[i]) {
|
|
74
|
+
needsRedraw = true;
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
if (needsRedraw) {
|
|
81
|
+
this.layers = layers.map(layer => layer.id);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
return needsRedraw;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
_updateViewport(viewport) {
|
|
88
|
+
const targetLayer = this.targetLayer;
|
|
89
|
+
let shouldRedraw = false;
|
|
90
|
+
|
|
91
|
+
if (this.targetBounds !== targetLayer.getBounds()) {
|
|
92
|
+
shouldRedraw = true;
|
|
93
|
+
this.targetBounds = targetLayer.getBounds();
|
|
94
|
+
this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
if (!this.targetBoundsCommon) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
const newZoom = Math.ceil(viewport.zoom + 0.5);
|
|
102
|
+
|
|
103
|
+
if (this.tile) {
|
|
104
|
+
this.bounds = this.targetBoundsCommon;
|
|
105
|
+
} else {
|
|
106
|
+
var _this$renderViewport;
|
|
107
|
+
|
|
108
|
+
const oldZoom = (_this$renderViewport = this.renderViewport) === null || _this$renderViewport === void 0 ? void 0 : _this$renderViewport.zoom;
|
|
109
|
+
shouldRedraw = shouldRedraw || newZoom !== oldZoom;
|
|
110
|
+
const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);
|
|
111
|
+
const oldBounds = this.bounds;
|
|
112
|
+
shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);
|
|
113
|
+
this.bounds = newBounds;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
if (shouldRedraw) {
|
|
117
|
+
this.renderViewport = makeViewport({
|
|
118
|
+
bounds: this.bounds,
|
|
119
|
+
zoom: newZoom,
|
|
120
|
+
viewport
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
return shouldRedraw;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
getRenderFramebuffer() {
|
|
128
|
+
if (!this.renderViewport || this.layers.length === 0) {
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
if (!this.fbo) {
|
|
133
|
+
this.fbo = createRenderTarget(this.targetLayer.context.gl, {
|
|
134
|
+
id: this.id
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
return this.fbo;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
getPickingFramebuffer() {
|
|
142
|
+
if (!this.renderViewport || this.layers.length === 0 && !this.targetLayer.props.pickable) {
|
|
143
|
+
return null;
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
if (!this.pickingFbo) {
|
|
147
|
+
this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {
|
|
148
|
+
id: "".concat(this.id, "-picking")
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
return this.pickingFbo;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
filterLayers(layers) {
|
|
156
|
+
return layers.filter(({
|
|
157
|
+
id
|
|
158
|
+
}) => this.layers.includes(id));
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
delete() {
|
|
162
|
+
const {
|
|
163
|
+
fbo,
|
|
164
|
+
pickingFbo
|
|
165
|
+
} = this;
|
|
166
|
+
|
|
167
|
+
if (fbo) {
|
|
168
|
+
fbo.texture.delete();
|
|
169
|
+
fbo.delete();
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
if (pickingFbo) {
|
|
173
|
+
pickingFbo.texture.delete();
|
|
174
|
+
pickingFbo.delete();
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
function getIntersectingLayers(sourceTile, layers) {
|
|
181
|
+
return layers.filter(layer => {
|
|
182
|
+
const tile = getTile(layer);
|
|
183
|
+
|
|
184
|
+
if (tile) {
|
|
185
|
+
return intersect(sourceTile.bbox, tile.bbox);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
return true;
|
|
189
|
+
});
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
function getTile(layer) {
|
|
193
|
+
while (layer) {
|
|
194
|
+
const {
|
|
195
|
+
tile
|
|
196
|
+
} = layer.props;
|
|
197
|
+
|
|
198
|
+
if (tile) {
|
|
199
|
+
return tile;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
layer = layer.parent;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
return null;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
function intersect(b1, b2) {
|
|
209
|
+
if ('west' in b1 && 'west' in b2) {
|
|
210
|
+
return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
if ('left' in b1 && 'left' in b2) {
|
|
214
|
+
return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
//# sourceMappingURL=terrain-cover.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/terrain-cover.ts"],"names":["createRenderTarget","joinLayerBounds","makeViewport","getRenderBounds","TerrainCover","constructor","targetLayer","tile","getTile","id","isActive","Boolean","getCurrentLayer","shouldUpdate","viewport","layers","layerNeedsRedraw","sizeChanged","_updateViewport","layersChanged","_updateLayers","needsRedraw","getIntersectingLayers","length","i","map","layer","shouldRedraw","targetBounds","getBounds","targetBoundsCommon","newZoom","Math","ceil","zoom","bounds","oldZoom","renderViewport","newBounds","oldBounds","some","x","getRenderFramebuffer","fbo","context","gl","getPickingFramebuffer","props","pickable","pickingFbo","filterLayers","filter","includes","delete","texture","sourceTile","intersect","bbox","parent","b1","b2","west","east","south","north","left","right","top","bottom"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\n\nimport type {Layer, Viewport} from '@deck.gl/core';\n\nimport {createRenderTarget} from './utils';\nimport {joinLayerBounds, makeViewport, getRenderBounds, Bounds} from '../common/projection-utils';\n\n// TODO - import from loaders when Tileset2D is split out\ntype GeoBoundingBox = {west: number; north: number; east: number; south: number};\ntype NonGeoBoundingBox = {left: number; top: number; right: number; bottom: number};\ntype Tile2DHeader = {\n bbox: GeoBoundingBox | NonGeoBoundingBox;\n};\n\n/**\n * Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).\n * One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).\n * It is updated when the terrain source layer's mesh changes or when any of the terrainFittingMode:drape\n * layers requires redraw.\n * During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.\n */\nexport class TerrainCover {\n isDirty: boolean = true;\n /** The terrain layer that this instance belongs to */\n targetLayer: Layer;\n /** Viewport used to draw into the texture */\n renderViewport: Viewport | null = null;\n /** Bounds of the terrain cover texture, in cartesian space */\n bounds: Bounds | null = null;\n\n private fbo?: Framebuffer;\n private pickingFbo?: Framebuffer;\n private layers: string[] = [];\n private tile: Tile2DHeader | null;\n /** Cached version of targetLayer.getBounds() */\n private targetBounds: [number[], number[]] | null = null;\n /** targetBounds in cartesian space */\n private targetBoundsCommon: Bounds | null = null;\n\n constructor(targetLayer: Layer) {\n this.targetLayer = targetLayer;\n this.tile = getTile(targetLayer);\n }\n\n get id() {\n return this.targetLayer.id;\n }\n\n /** returns true if the target layer is still in use (i.e. not finalized) */\n get isActive(): boolean {\n return Boolean(this.targetLayer.getCurrentLayer());\n }\n\n shouldUpdate({\n targetLayer,\n viewport,\n layers,\n layerNeedsRedraw\n }: {\n targetLayer?: Layer;\n viewport?: Viewport;\n layers?: Layer[];\n layerNeedsRedraw?: Record<string, boolean>;\n }): boolean {\n if (targetLayer) {\n this.targetLayer = targetLayer;\n }\n const sizeChanged = viewport ? this._updateViewport(viewport) : false;\n\n let layersChanged = layers ? this._updateLayers(layers) : false;\n\n if (layerNeedsRedraw) {\n for (const id of this.layers) {\n if (layerNeedsRedraw[id]) {\n layersChanged = true;\n // console.log('layer needs redraw', id);\n break;\n }\n }\n }\n\n return layersChanged || sizeChanged;\n }\n\n /** Compare layers with the last version. Only rerender if necessary. */\n private _updateLayers(layers: Layer[]): boolean {\n let needsRedraw = false;\n layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;\n\n if (layers.length !== this.layers.length) {\n needsRedraw = true;\n // console.log('layers count changed', this.layers.length, '>>', layers.length);\n } else {\n for (let i = 0; i < layers.length; i++) {\n const id = layers[i].id;\n if (id !== this.layers[i]) {\n needsRedraw = true;\n // console.log('layer added/removed', id);\n break;\n }\n }\n }\n if (needsRedraw) {\n this.layers = layers.map(layer => layer.id);\n }\n return needsRedraw;\n }\n\n /** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */\n private _updateViewport(viewport: Viewport): boolean {\n const targetLayer = this.targetLayer;\n let shouldRedraw = false;\n\n if (this.targetBounds !== targetLayer.getBounds()) {\n // console.log('bounds changed', this.bounds, '>>', newBounds);\n shouldRedraw = true;\n this.targetBounds = targetLayer.getBounds();\n this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);\n }\n\n if (!this.targetBoundsCommon) {\n return false;\n }\n\n const newZoom = Math.ceil(viewport.zoom + 0.5);\n // If the terrain layer is bound to a tile, always render a texture that cover the whole tile.\n // Otherwise, use the smaller of layer bounds and the viewport bounds.\n if (this.tile) {\n this.bounds = this.targetBoundsCommon;\n } else {\n const oldZoom = this.renderViewport?.zoom;\n shouldRedraw = shouldRedraw || newZoom !== oldZoom;\n const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);\n const oldBounds = this.bounds;\n shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);\n this.bounds = newBounds;\n }\n\n if (shouldRedraw) {\n this.renderViewport = makeViewport({\n bounds: this.bounds,\n zoom: newZoom,\n viewport\n });\n }\n\n return shouldRedraw;\n }\n\n getRenderFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || this.layers.length === 0) {\n return null;\n }\n if (!this.fbo) {\n this.fbo = createRenderTarget(this.targetLayer.context.gl, {id: this.id});\n }\n return this.fbo;\n }\n\n getPickingFramebuffer(): Framebuffer | null {\n if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {\n return null;\n }\n if (!this.pickingFbo) {\n this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {id: `${this.id}-picking`});\n }\n return this.pickingFbo;\n }\n\n filterLayers(layers: Layer[]) {\n return layers.filter(({id}) => this.layers.includes(id));\n }\n\n delete() {\n const {fbo, pickingFbo} = this;\n if (fbo) {\n fbo.texture.delete();\n fbo.delete();\n }\n if (pickingFbo) {\n pickingFbo.texture.delete();\n pickingFbo.delete();\n }\n }\n}\n\n/**\n * Remove layers that do not overlap with the current terrain cover.\n * This implementation only has effect when a TileLayer is overlaid on top of a TileLayer\n */\nfunction getIntersectingLayers(sourceTile: Tile2DHeader, layers: Layer[]): Layer[] {\n return layers.filter(layer => {\n const tile = getTile(layer);\n if (tile) {\n return intersect(sourceTile.bbox, tile.bbox);\n }\n return true;\n });\n}\n\n/** If layer is the descendent of a TileLayer, return the corresponding tile. */\nfunction getTile(layer: Layer): Tile2DHeader | null {\n while (layer) {\n // @ts-expect-error tile may not exist\n const {tile} = layer.props;\n if (tile) {\n return tile;\n }\n layer = layer.parent as Layer;\n }\n return null;\n}\n\nfunction intersect(\n b1: GeoBoundingBox | NonGeoBoundingBox,\n b2: GeoBoundingBox | NonGeoBoundingBox\n): boolean {\n if ('west' in b1 && 'west' in b2) {\n return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;\n }\n if ('left' in b1 && 'left' in b2) {\n return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;\n }\n return false;\n}\n"],"file":"terrain-cover.js"}
|
|
@@ -0,0 +1,231 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import { Texture2D, ProgramManager } from '@luma.gl/core';
|
|
3
|
+
import { log } from '@deck.gl/core';
|
|
4
|
+
import { terrainModule } from './shader-module';
|
|
5
|
+
import { TerrainCover } from './terrain-cover';
|
|
6
|
+
import { TerrainPass } from './terrain-pass';
|
|
7
|
+
import { TerrainPickingPass } from './terrain-picking-pass';
|
|
8
|
+
import { HeightMapBuilder } from './height-map-builder';
|
|
9
|
+
export class TerrainEffect {
|
|
10
|
+
constructor() {
|
|
11
|
+
_defineProperty(this, "id", 'terrain-effect');
|
|
12
|
+
|
|
13
|
+
_defineProperty(this, "props", null);
|
|
14
|
+
|
|
15
|
+
_defineProperty(this, "useInPicking", true);
|
|
16
|
+
|
|
17
|
+
_defineProperty(this, "isPicking", false);
|
|
18
|
+
|
|
19
|
+
_defineProperty(this, "isDrapingEnabled", false);
|
|
20
|
+
|
|
21
|
+
_defineProperty(this, "dummyHeightMap", void 0);
|
|
22
|
+
|
|
23
|
+
_defineProperty(this, "heightMap", void 0);
|
|
24
|
+
|
|
25
|
+
_defineProperty(this, "terrainPass", void 0);
|
|
26
|
+
|
|
27
|
+
_defineProperty(this, "terrainPickingPass", void 0);
|
|
28
|
+
|
|
29
|
+
_defineProperty(this, "terrainCovers", new Map());
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
initialize(gl) {
|
|
33
|
+
this.dummyHeightMap = new Texture2D(gl, {
|
|
34
|
+
width: 1,
|
|
35
|
+
height: 1,
|
|
36
|
+
data: new Uint8Array([0, 0, 0, 0])
|
|
37
|
+
});
|
|
38
|
+
this.terrainPass = new TerrainPass(gl, {
|
|
39
|
+
id: 'terrain'
|
|
40
|
+
});
|
|
41
|
+
this.terrainPickingPass = new TerrainPickingPass(gl, {
|
|
42
|
+
id: 'terrain-picking'
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
if (HeightMapBuilder.isSupported(gl)) {
|
|
46
|
+
this.heightMap = new HeightMapBuilder(gl);
|
|
47
|
+
} else {
|
|
48
|
+
log.warn('Terrain offset mode is not supported by this browser')();
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
ProgramManager.getDefaultProgramManager(gl).addDefaultModule(terrainModule);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
preRender(gl, opts) {
|
|
55
|
+
if (!this.dummyHeightMap) {
|
|
56
|
+
this.initialize(gl);
|
|
57
|
+
|
|
58
|
+
for (const layer of opts.layers) {
|
|
59
|
+
if (layer.props.operation.includes('terrain')) {
|
|
60
|
+
layer.setChangeFlags({
|
|
61
|
+
extensionsChanged: true
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (opts.pickZ) {
|
|
68
|
+
this.isDrapingEnabled = false;
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const {
|
|
73
|
+
viewports,
|
|
74
|
+
pass
|
|
75
|
+
} = opts;
|
|
76
|
+
const isPicking = pass.startsWith('picking');
|
|
77
|
+
this.isPicking = isPicking;
|
|
78
|
+
this.isDrapingEnabled = true;
|
|
79
|
+
const viewport = viewports[0];
|
|
80
|
+
const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(viewport, opts);
|
|
81
|
+
const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));
|
|
82
|
+
|
|
83
|
+
if (terrainLayers.length === 0) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (!isPicking) {
|
|
88
|
+
const offsetLayers = layers.filter(l => l.state.terrainFittingMode === 'offset');
|
|
89
|
+
|
|
90
|
+
if (offsetLayers.length > 0) {
|
|
91
|
+
this._updateHeightMap(terrainLayers, viewport, opts);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
const drapeLayers = layers.filter(l => l.state.terrainFittingMode === 'drape');
|
|
96
|
+
|
|
97
|
+
this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
getModuleParameters(layer) {
|
|
101
|
+
var _this$heightMap, _this$heightMap2;
|
|
102
|
+
|
|
103
|
+
const {
|
|
104
|
+
terrainFittingMode
|
|
105
|
+
} = layer.state;
|
|
106
|
+
return {
|
|
107
|
+
heightMap: (_this$heightMap = this.heightMap) === null || _this$heightMap === void 0 ? void 0 : _this$heightMap.getRenderFramebuffer(),
|
|
108
|
+
heightMapBounds: (_this$heightMap2 = this.heightMap) === null || _this$heightMap2 === void 0 ? void 0 : _this$heightMap2.bounds,
|
|
109
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
110
|
+
terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,
|
|
111
|
+
useTerrainHeightMap: terrainFittingMode === 'offset',
|
|
112
|
+
terrainSkipRender: terrainFittingMode === 'drape' || !layer.props.operation.includes('draw')
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
cleanup() {
|
|
117
|
+
if (this.dummyHeightMap) {
|
|
118
|
+
this.dummyHeightMap.delete();
|
|
119
|
+
this.dummyHeightMap = undefined;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
if (this.heightMap) {
|
|
123
|
+
this.heightMap.delete();
|
|
124
|
+
this.heightMap = undefined;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
128
|
+
terrainCover.delete();
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
this.terrainCovers.clear();
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
_updateHeightMap(terrainLayers, viewport, opts) {
|
|
135
|
+
if (!this.heightMap) {
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
const shouldUpdate = this.heightMap.shouldUpdate({
|
|
140
|
+
layers: terrainLayers,
|
|
141
|
+
viewport
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
if (!shouldUpdate) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
this.terrainPass.renderHeightMap(this.heightMap, { ...opts,
|
|
149
|
+
layers: terrainLayers,
|
|
150
|
+
moduleParameters: {
|
|
151
|
+
heightMapBounds: this.heightMap.bounds,
|
|
152
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
153
|
+
devicePixelRatio: 1,
|
|
154
|
+
drawToTerrainHeightMap: true
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
_updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts) {
|
|
160
|
+
const layerNeedsRedraw = {};
|
|
161
|
+
|
|
162
|
+
for (const layer of drapeLayers) {
|
|
163
|
+
if (layer.state.terrainCoverNeedsRedraw) {
|
|
164
|
+
layerNeedsRedraw[layer.id] = true;
|
|
165
|
+
layer.state.terrainCoverNeedsRedraw = false;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
for (const terrainCover of this.terrainCovers.values()) {
|
|
170
|
+
terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({
|
|
171
|
+
layerNeedsRedraw
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
for (const layer of terrainLayers) {
|
|
176
|
+
this._updateTerrainCover(layer, drapeLayers, viewport, opts);
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
if (!this.isPicking) {
|
|
180
|
+
this._pruneTerrainCovers();
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
_updateTerrainCover(terrainLayer, drapeLayers, viewport, opts) {
|
|
185
|
+
const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;
|
|
186
|
+
let terrainCover = this.terrainCovers.get(terrainLayer.id);
|
|
187
|
+
|
|
188
|
+
if (!terrainCover) {
|
|
189
|
+
terrainCover = new TerrainCover(terrainLayer);
|
|
190
|
+
this.terrainCovers.set(terrainLayer.id, terrainCover);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
try {
|
|
194
|
+
const isDirty = terrainCover.shouldUpdate({
|
|
195
|
+
targetLayer: terrainLayer,
|
|
196
|
+
viewport,
|
|
197
|
+
layers: drapeLayers
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
if (this.isPicking || terrainCover.isDirty || isDirty) {
|
|
201
|
+
renderPass.renderTerrainCover(terrainCover, { ...opts,
|
|
202
|
+
layers: drapeLayers,
|
|
203
|
+
moduleParameters: {
|
|
204
|
+
dummyHeightMap: this.dummyHeightMap,
|
|
205
|
+
terrainSkipRender: false,
|
|
206
|
+
devicePixelRatio: 1
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
terrainCover.isDirty = false;
|
|
210
|
+
}
|
|
211
|
+
} catch (err) {
|
|
212
|
+
terrainLayer.raiseError(err, "Error rendering terrain cover ".concat(terrainCover.id));
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
_pruneTerrainCovers() {
|
|
217
|
+
const idsToRemove = [];
|
|
218
|
+
|
|
219
|
+
for (const [id, terrainCover] of this.terrainCovers) {
|
|
220
|
+
if (!terrainCover.isActive) {
|
|
221
|
+
idsToRemove.push(id);
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
for (const id of idsToRemove) {
|
|
226
|
+
this.terrainCovers.delete(id);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
}
|
|
231
|
+
//# sourceMappingURL=terrain-effect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/terrain-effect.ts"],"names":["Texture2D","ProgramManager","log","terrainModule","TerrainCover","TerrainPass","TerrainPickingPass","HeightMapBuilder","TerrainEffect","Map","initialize","gl","dummyHeightMap","width","height","data","Uint8Array","terrainPass","id","terrainPickingPass","isSupported","heightMap","warn","getDefaultProgramManager","addDefaultModule","preRender","opts","layer","layers","props","operation","includes","setChangeFlags","extensionsChanged","pickZ","isDrapingEnabled","viewports","pass","isPicking","startsWith","viewport","getRenderableLayers","terrainLayers","filter","l","length","offsetLayers","state","terrainFittingMode","_updateHeightMap","drapeLayers","_updateTerrainCovers","getModuleParameters","getRenderFramebuffer","heightMapBounds","bounds","terrainCover","terrainCovers","get","useTerrainHeightMap","terrainSkipRender","cleanup","delete","undefined","values","clear","shouldUpdate","renderHeightMap","moduleParameters","devicePixelRatio","drawToTerrainHeightMap","layerNeedsRedraw","terrainCoverNeedsRedraw","isDirty","_updateTerrainCover","_pruneTerrainCovers","terrainLayer","renderPass","set","targetLayer","renderTerrainCover","err","raiseError","idsToRemove","isActive","push"],"mappings":";AAAA,SAAQA,SAAR,EAAmBC,cAAnB,QAAwC,eAAxC;AACA,SAAQC,GAAR,QAAkB,eAAlB;AAEA,SAAQC,aAAR,QAAmD,iBAAnD;AACA,SAAQC,YAAR,QAA2B,iBAA3B;AACA,SAAQC,WAAR,QAA0B,gBAA1B;AACA,SAAQC,kBAAR,QAAkE,wBAAlE;AACA,SAAQC,gBAAR,QAA+B,sBAA/B;AAKA,OAAO,MAAMC,aAAN,CAAsC;AAAA;AAAA,gCACtC,gBADsC;;AAAA,mCAEnC,IAFmC;;AAAA,0CAG5B,IAH4B;;AAAA,uCAMd,KANc;;AAAA,8CAQP,KARO;;AAAA;;AAAA;;AAAA;;AAAA;;AAAA,2CAgBQ,IAAIC,GAAJ,EAhBR;AAAA;;AAkB3CC,EAAAA,UAAU,CAACC,EAAD,EAA4B;AACpC,SAAKC,cAAL,GAAsB,IAAIZ,SAAJ,CAAcW,EAAd,EAAkB;AACtCE,MAAAA,KAAK,EAAE,CAD+B;AAEtCC,MAAAA,MAAM,EAAE,CAF8B;AAGtCC,MAAAA,IAAI,EAAE,IAAIC,UAAJ,CAAe,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAAf;AAHgC,KAAlB,CAAtB;AAKA,SAAKC,WAAL,GAAmB,IAAIZ,WAAJ,CAAgBM,EAAhB,EAAoB;AAACO,MAAAA,EAAE,EAAE;AAAL,KAApB,CAAnB;AACA,SAAKC,kBAAL,GAA0B,IAAIb,kBAAJ,CAAuBK,EAAvB,EAA2B;AAACO,MAAAA,EAAE,EAAE;AAAL,KAA3B,CAA1B;;AAEA,QAAIX,gBAAgB,CAACa,WAAjB,CAA6BT,EAA7B,CAAJ,EAAsC;AACpC,WAAKU,SAAL,GAAiB,IAAId,gBAAJ,CAAqBI,EAArB,CAAjB;AACD,KAFD,MAEO;AACLT,MAAAA,GAAG,CAACoB,IAAJ,CAAS,sDAAT;AACD;;AAEDrB,IAAAA,cAAc,CAACsB,wBAAf,CAAwCZ,EAAxC,EAA4Ca,gBAA5C,CAA6DrB,aAA7D;AACD;;AAEDsB,EAAAA,SAAS,CAACd,EAAD,EAA4Be,IAA5B,EAA0D;AACjE,QAAI,CAAC,KAAKd,cAAV,EAA0B;AAExB,WAAKF,UAAL,CAAgBC,EAAhB;;AACA,WAAK,MAAMgB,KAAX,IAAoBD,IAAI,CAACE,MAAzB,EAAiC;AAE/B,YAAID,KAAK,CAACE,KAAN,CAAYC,SAAZ,CAAsBC,QAAtB,CAA+B,SAA/B,CAAJ,EAA+C;AAC7CJ,UAAAA,KAAK,CAACK,cAAN,CAAqB;AAACC,YAAAA,iBAAiB,EAAE;AAApB,WAArB;AACD;AACF;AACF;;AAGD,QAAIP,IAAI,CAACQ,KAAT,EAAgB;AAEd,WAAKC,gBAAL,GAAwB,KAAxB;AACA;AACD;;AAED,UAAM;AAACC,MAAAA,SAAD;AAAYC,MAAAA;AAAZ,QAAoBX,IAA1B;AACA,UAAMY,SAAS,GAAGD,IAAI,CAACE,UAAL,CAAgB,SAAhB,CAAlB;AACA,SAAKD,SAAL,GAAiBA,SAAjB;AACA,SAAKH,gBAAL,GAAwB,IAAxB;AAGA,UAAMK,QAAQ,GAAGJ,SAAS,CAAC,CAAD,CAA1B;AACA,UAAMR,MAAM,GAAG,CAACU,SAAS,GAAG,KAAKnB,kBAAR,GAA6B,KAAKF,WAA5C,EAAyDwB,mBAAzD,CACbD,QADa,EAEbd,IAFa,CAAf;AAKA,UAAMgB,aAAa,GAAGd,MAAM,CAACe,MAAP,CAAcC,CAAC,IAAIA,CAAC,CAACf,KAAF,CAAQC,SAAR,CAAkBC,QAAlB,CAA2B,SAA3B,CAAnB,CAAtB;;AACA,QAAIW,aAAa,CAACG,MAAd,KAAyB,CAA7B,EAAgC;AAC9B;AACD;;AAED,QAAI,CAACP,SAAL,EAAgB;AACd,YAAMQ,YAAY,GAAGlB,MAAM,CAACe,MAAP,CAAcC,CAAC,IAAIA,CAAC,CAACG,KAAF,CAAQC,kBAAR,KAA+B,QAAlD,CAArB;;AACA,UAAIF,YAAY,CAACD,MAAb,GAAsB,CAA1B,EAA6B;AAC3B,aAAKI,gBAAL,CAAsBP,aAAtB,EAAqCF,QAArC,EAA+Cd,IAA/C;AACD;AACF;;AAED,UAAMwB,WAAW,GAAGtB,MAAM,CAACe,MAAP,CAAcC,CAAC,IAAIA,CAAC,CAACG,KAAF,CAAQC,kBAAR,KAA+B,OAAlD,CAApB;;AACA,SAAKG,oBAAL,CAA0BT,aAA1B,EAAyCQ,WAAzC,EAAsDV,QAAtD,EAAgEd,IAAhE;AACD;;AAED0B,EAAAA,mBAAmB,CAACzB,KAAD,EAAsC;AAAA;;AACvD,UAAM;AAACqB,MAAAA;AAAD,QAAuBrB,KAAK,CAACoB,KAAnC;AAEA,WAAO;AACL1B,MAAAA,SAAS,qBAAE,KAAKA,SAAP,oDAAE,gBAAgBgC,oBAAhB,EADN;AAELC,MAAAA,eAAe,sBAAE,KAAKjC,SAAP,qDAAE,iBAAgBkC,MAF5B;AAGL3C,MAAAA,cAAc,EAAE,KAAKA,cAHhB;AAIL4C,MAAAA,YAAY,EAAE,KAAKrB,gBAAL,GAAwB,KAAKsB,aAAL,CAAmBC,GAAnB,CAAuB/B,KAAK,CAACT,EAA7B,CAAxB,GAA2D,IAJpE;AAKLyC,MAAAA,mBAAmB,EAAEX,kBAAkB,KAAK,QALvC;AAMLY,MAAAA,iBAAiB,EAAEZ,kBAAkB,KAAK,OAAvB,IAAkC,CAACrB,KAAK,CAACE,KAAN,CAAYC,SAAZ,CAAsBC,QAAtB,CAA+B,MAA/B;AANjD,KAAP;AAQD;;AAED8B,EAAAA,OAAO,GAAS;AACd,QAAI,KAAKjD,cAAT,EAAyB;AACvB,WAAKA,cAAL,CAAoBkD,MAApB;AACA,WAAKlD,cAAL,GAAsBmD,SAAtB;AACD;;AAED,QAAI,KAAK1C,SAAT,EAAoB;AAClB,WAAKA,SAAL,CAAeyC,MAAf;AACA,WAAKzC,SAAL,GAAiB0C,SAAjB;AACD;;AAED,SAAK,MAAMP,YAAX,IAA2B,KAAKC,aAAL,CAAmBO,MAAnB,EAA3B,EAAwD;AACtDR,MAAAA,YAAY,CAACM,MAAb;AACD;;AACD,SAAKL,aAAL,CAAmBQ,KAAnB;AACD;;AAEOhB,EAAAA,gBAAgB,CAACP,aAAD,EAAyBF,QAAzB,EAA6Cd,IAA7C,EAAqE;AAC3F,QAAI,CAAC,KAAKL,SAAV,EAAqB;AAEnB;AACD;;AAED,UAAM6C,YAAY,GAAG,KAAK7C,SAAL,CAAe6C,YAAf,CAA4B;AAACtC,MAAAA,MAAM,EAAEc,aAAT;AAAwBF,MAAAA;AAAxB,KAA5B,CAArB;;AACA,QAAI,CAAC0B,YAAL,EAAmB;AACjB;AACD;;AAED,SAAKjD,WAAL,CAAiBkD,eAAjB,CAAiC,KAAK9C,SAAtC,EAAiD,EAC/C,GAAGK,IAD4C;AAE/CE,MAAAA,MAAM,EAAEc,aAFuC;AAG/C0B,MAAAA,gBAAgB,EAAE;AAChBd,QAAAA,eAAe,EAAE,KAAKjC,SAAL,CAAekC,MADhB;AAEhB3C,QAAAA,cAAc,EAAE,KAAKA,cAFL;AAGhByD,QAAAA,gBAAgB,EAAE,CAHF;AAIhBC,QAAAA,sBAAsB,EAAE;AAJR;AAH6B,KAAjD;AAUD;;AAEOnB,EAAAA,oBAAoB,CAC1BT,aAD0B,EAE1BQ,WAF0B,EAG1BV,QAH0B,EAI1Bd,IAJ0B,EAK1B;AAEA,UAAM6C,gBAAyC,GAAG,EAAlD;;AACA,SAAK,MAAM5C,KAAX,IAAoBuB,WAApB,EAAiC;AAC/B,UAAIvB,KAAK,CAACoB,KAAN,CAAYyB,uBAAhB,EAAyC;AACvCD,QAAAA,gBAAgB,CAAC5C,KAAK,CAACT,EAAP,CAAhB,GAA6B,IAA7B;AACAS,QAAAA,KAAK,CAACoB,KAAN,CAAYyB,uBAAZ,GAAsC,KAAtC;AACD;AACF;;AACD,SAAK,MAAMhB,YAAX,IAA2B,KAAKC,aAAL,CAAmBO,MAAnB,EAA3B,EAAwD;AACtDR,MAAAA,YAAY,CAACiB,OAAb,GAAuBjB,YAAY,CAACiB,OAAb,IAAwBjB,YAAY,CAACU,YAAb,CAA0B;AAACK,QAAAA;AAAD,OAA1B,CAA/C;AACD;;AAED,SAAK,MAAM5C,KAAX,IAAoBe,aAApB,EAAmC;AACjC,WAAKgC,mBAAL,CAAyB/C,KAAzB,EAAgCuB,WAAhC,EAA6CV,QAA7C,EAAuDd,IAAvD;AACD;;AAED,QAAI,CAAC,KAAKY,SAAV,EAAqB;AACnB,WAAKqC,mBAAL;AACD;AACF;;AAEOD,EAAAA,mBAAmB,CACzBE,YADyB,EAEzB1B,WAFyB,EAGzBV,QAHyB,EAIzBd,IAJyB,EAKzB;AACA,UAAMmD,UAAU,GAAG,KAAKvC,SAAL,GAAiB,KAAKnB,kBAAtB,GAA2C,KAAKF,WAAnE;AACA,QAAIuC,YAAY,GAAG,KAAKC,aAAL,CAAmBC,GAAnB,CAAuBkB,YAAY,CAAC1D,EAApC,CAAnB;;AACA,QAAI,CAACsC,YAAL,EAAmB;AACjBA,MAAAA,YAAY,GAAG,IAAIpD,YAAJ,CAAiBwE,YAAjB,CAAf;AACA,WAAKnB,aAAL,CAAmBqB,GAAnB,CAAuBF,YAAY,CAAC1D,EAApC,EAAwCsC,YAAxC;AACD;;AACD,QAAI;AACF,YAAMiB,OAAO,GAAGjB,YAAY,CAACU,YAAb,CAA0B;AACxCa,QAAAA,WAAW,EAAEH,YAD2B;AAExCpC,QAAAA,QAFwC;AAGxCZ,QAAAA,MAAM,EAAEsB;AAHgC,OAA1B,CAAhB;;AAKA,UAAI,KAAKZ,SAAL,IAAkBkB,YAAY,CAACiB,OAA/B,IAA0CA,OAA9C,EAAuD;AACrDI,QAAAA,UAAU,CAACG,kBAAX,CAA8BxB,YAA9B,EAA4C,EAC1C,GAAG9B,IADuC;AAE1CE,UAAAA,MAAM,EAAEsB,WAFkC;AAG1CkB,UAAAA,gBAAgB,EAAE;AAChBxD,YAAAA,cAAc,EAAE,KAAKA,cADL;AAEhBgD,YAAAA,iBAAiB,EAAE,KAFH;AAGhBS,YAAAA,gBAAgB,EAAE;AAHF;AAHwB,SAA5C;AASAb,QAAAA,YAAY,CAACiB,OAAb,GAAuB,KAAvB;AACD;AACF,KAlBD,CAkBE,OAAOQ,GAAP,EAAY;AACZL,MAAAA,YAAY,CAACM,UAAb,CAAwBD,GAAxB,0CAAuEzB,YAAY,CAACtC,EAApF;AACD;AACF;;AAEOyD,EAAAA,mBAAmB,GAAG;AAE5B,UAAMQ,WAAqB,GAAG,EAA9B;;AACA,SAAK,MAAM,CAACjE,EAAD,EAAKsC,YAAL,CAAX,IAAiC,KAAKC,aAAtC,EAAqD;AACnD,UAAI,CAACD,YAAY,CAAC4B,QAAlB,EAA4B;AAC1BD,QAAAA,WAAW,CAACE,IAAZ,CAAiBnE,EAAjB;AACD;AACF;;AACD,SAAK,MAAMA,EAAX,IAAiBiE,WAAjB,EAA8B;AAC5B,WAAK1B,aAAL,CAAmBK,MAAnB,CAA0B5C,EAA1B;AACD;AACF;;AAjN0C","sourcesContent":["import {Texture2D, ProgramManager} from '@luma.gl/core';\nimport {log} from '@deck.gl/core';\n\nimport {terrainModule, TerrainModuleSettings} from './shader-module';\nimport {TerrainCover} from './terrain-cover';\nimport {TerrainPass} from './terrain-pass';\nimport {TerrainPickingPass, TerrainPickingPassRenderOptions} from './terrain-picking-pass';\nimport {HeightMapBuilder} from './height-map-builder';\n\nimport type {Effect, PreRenderOptions, Layer, Viewport} from '@deck.gl/core';\n\n/** Class to manage terrain effect */\nexport class TerrainEffect implements Effect {\n id = 'terrain-effect';\n props = null;\n useInPicking = true;\n\n /** true if picking in the current pass */\n private isPicking: boolean = false;\n /** true if should use in the current pass */\n private isDrapingEnabled: boolean = false;\n /** An empty texture as placeholder */\n private dummyHeightMap: Texture2D;\n /** A texture encoding the ground elevation, updated once per redraw. Used by layers with offset mode */\n private heightMap?: HeightMapBuilder;\n private terrainPass!: TerrainPass;\n private terrainPickingPass!: TerrainPickingPass;\n /** One texture for each primitive terrain layer, into which the draped layers render */\n private terrainCovers: Map<string, TerrainCover> = new Map();\n\n initialize(gl: WebGLRenderingContext) {\n this.dummyHeightMap = new Texture2D(gl, {\n width: 1,\n height: 1,\n data: new Uint8Array([0, 0, 0, 0])\n });\n this.terrainPass = new TerrainPass(gl, {id: 'terrain'});\n this.terrainPickingPass = new TerrainPickingPass(gl, {id: 'terrain-picking'});\n\n if (HeightMapBuilder.isSupported(gl)) {\n this.heightMap = new HeightMapBuilder(gl);\n } else {\n log.warn('Terrain offset mode is not supported by this browser')();\n }\n\n ProgramManager.getDefaultProgramManager(gl).addDefaultModule(terrainModule);\n }\n\n preRender(gl: WebGLRenderingContext, opts: PreRenderOptions): void {\n if (!this.dummyHeightMap) {\n // First time this effect is in use, initialize resources and register the shader module\n this.initialize(gl);\n for (const layer of opts.layers) {\n // Force the terrain layer (and its descendents) to rebuild their models with the new shader\n if (layer.props.operation.includes('terrain')) {\n layer.setChangeFlags({extensionsChanged: true});\n }\n }\n }\n\n // @ts-expect-error pickZ only defined in picking pass\n if (opts.pickZ) {\n // Do not update if picking attributes\n this.isDrapingEnabled = false;\n return;\n }\n\n const {viewports, pass} = opts;\n const isPicking = pass.startsWith('picking');\n this.isPicking = isPicking;\n this.isDrapingEnabled = true;\n\n // TODO - support multiple views?\n const viewport = viewports[0];\n const layers = (isPicking ? this.terrainPickingPass : this.terrainPass).getRenderableLayers(\n viewport,\n opts as TerrainPickingPassRenderOptions\n );\n\n const terrainLayers = layers.filter(l => l.props.operation.includes('terrain'));\n if (terrainLayers.length === 0) {\n return;\n }\n\n if (!isPicking) {\n const offsetLayers = layers.filter(l => l.state.terrainFittingMode === 'offset');\n if (offsetLayers.length > 0) {\n this._updateHeightMap(terrainLayers, viewport, opts);\n }\n }\n\n const drapeLayers = layers.filter(l => l.state.terrainFittingMode === 'drape');\n this._updateTerrainCovers(terrainLayers, drapeLayers, viewport, opts);\n }\n\n getModuleParameters(layer: Layer): TerrainModuleSettings {\n const {terrainFittingMode} = layer.state;\n\n return {\n heightMap: this.heightMap?.getRenderFramebuffer(),\n heightMapBounds: this.heightMap?.bounds,\n dummyHeightMap: this.dummyHeightMap,\n terrainCover: this.isDrapingEnabled ? this.terrainCovers.get(layer.id) : null,\n useTerrainHeightMap: terrainFittingMode === 'offset',\n terrainSkipRender: terrainFittingMode === 'drape' || !layer.props.operation.includes('draw')\n };\n }\n\n cleanup(): void {\n if (this.dummyHeightMap) {\n this.dummyHeightMap.delete();\n this.dummyHeightMap = undefined;\n }\n\n if (this.heightMap) {\n this.heightMap.delete();\n this.heightMap = undefined;\n }\n\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.delete();\n }\n this.terrainCovers.clear();\n }\n\n private _updateHeightMap(terrainLayers: Layer[], viewport: Viewport, opts: PreRenderOptions) {\n if (!this.heightMap) {\n // Not supported\n return;\n }\n\n const shouldUpdate = this.heightMap.shouldUpdate({layers: terrainLayers, viewport});\n if (!shouldUpdate) {\n return;\n }\n\n this.terrainPass.renderHeightMap(this.heightMap, {\n ...opts,\n layers: terrainLayers,\n moduleParameters: {\n heightMapBounds: this.heightMap.bounds,\n dummyHeightMap: this.dummyHeightMap,\n devicePixelRatio: 1,\n drawToTerrainHeightMap: true\n }\n });\n }\n\n private _updateTerrainCovers(\n terrainLayers: Layer[],\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n // Mark a terrain cover as dirty if one of the drape layers needs redraw\n const layerNeedsRedraw: Record<string, boolean> = {};\n for (const layer of drapeLayers) {\n if (layer.state.terrainCoverNeedsRedraw) {\n layerNeedsRedraw[layer.id] = true;\n layer.state.terrainCoverNeedsRedraw = false;\n }\n }\n for (const terrainCover of this.terrainCovers.values()) {\n terrainCover.isDirty = terrainCover.isDirty || terrainCover.shouldUpdate({layerNeedsRedraw});\n }\n\n for (const layer of terrainLayers) {\n this._updateTerrainCover(layer, drapeLayers, viewport, opts);\n }\n\n if (!this.isPicking) {\n this._pruneTerrainCovers();\n }\n }\n\n private _updateTerrainCover(\n terrainLayer: Layer,\n drapeLayers: Layer[],\n viewport: Viewport,\n opts: PreRenderOptions\n ) {\n const renderPass = this.isPicking ? this.terrainPickingPass : this.terrainPass;\n let terrainCover = this.terrainCovers.get(terrainLayer.id);\n if (!terrainCover) {\n terrainCover = new TerrainCover(terrainLayer);\n this.terrainCovers.set(terrainLayer.id, terrainCover);\n }\n try {\n const isDirty = terrainCover.shouldUpdate({\n targetLayer: terrainLayer,\n viewport,\n layers: drapeLayers\n });\n if (this.isPicking || terrainCover.isDirty || isDirty) {\n renderPass.renderTerrainCover(terrainCover, {\n ...opts,\n layers: drapeLayers,\n moduleParameters: {\n dummyHeightMap: this.dummyHeightMap,\n terrainSkipRender: false,\n devicePixelRatio: 1\n }\n });\n terrainCover.isDirty = false;\n }\n } catch (err) {\n terrainLayer.raiseError(err as Error, `Error rendering terrain cover ${terrainCover.id}`);\n }\n }\n\n private _pruneTerrainCovers() {\n /** Prune the cache, remove textures for layers that have been removed */\n const idsToRemove: string[] = [];\n for (const [id, terrainCover] of this.terrainCovers) {\n if (!terrainCover.isActive) {\n idsToRemove.push(id);\n }\n }\n for (const id of idsToRemove) {\n this.terrainCovers.delete(id);\n }\n }\n}\n"],"file":"terrain-effect.js"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { withParameters } from '@luma.gl/core';
|
|
2
|
+
import { _LayersPass as LayersPass } from '@deck.gl/core';
|
|
3
|
+
export class TerrainPass extends LayersPass {
|
|
4
|
+
getRenderableLayers(viewport, opts) {
|
|
5
|
+
const {
|
|
6
|
+
layers
|
|
7
|
+
} = opts;
|
|
8
|
+
const result = [];
|
|
9
|
+
|
|
10
|
+
const drawParamsByIndex = this._getDrawLayerParams(viewport, opts, true);
|
|
11
|
+
|
|
12
|
+
for (let i = 0; i < layers.length; i++) {
|
|
13
|
+
const layer = layers[i];
|
|
14
|
+
|
|
15
|
+
if (!layer.isComposite && drawParamsByIndex[i].shouldDrawLayer) {
|
|
16
|
+
result.push(layer);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
return result;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
renderHeightMap(heightMap, opts) {
|
|
24
|
+
const target = heightMap.getRenderFramebuffer();
|
|
25
|
+
const viewport = heightMap.renderViewport;
|
|
26
|
+
|
|
27
|
+
if (!target || !viewport) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
target.resize(viewport);
|
|
32
|
+
withParameters(this.gl, {
|
|
33
|
+
clearColor: [0, 0, 0, 0],
|
|
34
|
+
blend: true,
|
|
35
|
+
blendFunc: [1, 1],
|
|
36
|
+
blendEquation: 32776,
|
|
37
|
+
depthTest: false
|
|
38
|
+
}, () => this.render({ ...opts,
|
|
39
|
+
target,
|
|
40
|
+
pass: 'terrain-height-map',
|
|
41
|
+
layers: opts.layers,
|
|
42
|
+
viewports: [viewport],
|
|
43
|
+
effects: []
|
|
44
|
+
}));
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
renderTerrainCover(terrainCover, opts) {
|
|
48
|
+
const target = terrainCover.getRenderFramebuffer();
|
|
49
|
+
const viewport = terrainCover.renderViewport;
|
|
50
|
+
|
|
51
|
+
if (!target || !viewport) {
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
const layers = terrainCover.filterLayers(opts.layers);
|
|
56
|
+
target.resize(viewport);
|
|
57
|
+
withParameters(this.gl, {
|
|
58
|
+
depthTest: false
|
|
59
|
+
}, () => this.render({ ...opts,
|
|
60
|
+
target,
|
|
61
|
+
pass: "terrain-cover-".concat(terrainCover.id),
|
|
62
|
+
layers,
|
|
63
|
+
effects: [],
|
|
64
|
+
viewports: [viewport]
|
|
65
|
+
}));
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=terrain-pass.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/terrain/terrain-pass.ts"],"names":["withParameters","_LayersPass","LayersPass","TerrainPass","getRenderableLayers","viewport","opts","layers","result","drawParamsByIndex","_getDrawLayerParams","i","length","layer","isComposite","shouldDrawLayer","push","renderHeightMap","heightMap","target","getRenderFramebuffer","renderViewport","resize","gl","clearColor","blend","blendFunc","blendEquation","depthTest","render","pass","viewports","effects","renderTerrainCover","terrainCover","filterLayers","id"],"mappings":"AAAA,SAAQA,cAAR,QAA6B,eAA7B;AACA,SAAyBC,WAAW,IAAIC,UAAxC,QAAkF,eAAlF;AASA,OAAO,MAAMC,WAAN,SAA0BD,UAA1B,CAAqC;AAC1CE,EAAAA,mBAAmB,CAACC,QAAD,EAAqBC,IAArB,EAA8D;AAC/E,UAAM;AAACC,MAAAA;AAAD,QAAWD,IAAjB;AACA,UAAME,MAAe,GAAG,EAAxB;;AACA,UAAMC,iBAAiB,GAAG,KAAKC,mBAAL,CAAyBL,QAAzB,EAAmCC,IAAnC,EAAyC,IAAzC,CAA1B;;AACA,SAAK,IAAIK,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGJ,MAAM,CAACK,MAA3B,EAAmCD,CAAC,EAApC,EAAwC;AACtC,YAAME,KAAK,GAAGN,MAAM,CAACI,CAAD,CAApB;;AACA,UAAI,CAACE,KAAK,CAACC,WAAP,IAAsBL,iBAAiB,CAACE,CAAD,CAAjB,CAAqBI,eAA/C,EAAgE;AAC9DP,QAAAA,MAAM,CAACQ,IAAP,CAAYH,KAAZ;AACD;AACF;;AAED,WAAOL,MAAP;AACD;;AAEDS,EAAAA,eAAe,CAACC,SAAD,EAA8BZ,IAA9B,EAAuE;AAEpF,UAAMa,MAAM,GAAGD,SAAS,CAACE,oBAAV,EAAf;AACA,UAAMf,QAAQ,GAAGa,SAAS,CAACG,cAA3B;;AAEA,QAAI,CAACF,MAAD,IAAW,CAACd,QAAhB,EAA0B;AACxB;AACD;;AAEDc,IAAAA,MAAM,CAACG,MAAP,CAAcjB,QAAd;AAEAL,IAAAA,cAAc,CACZ,KAAKuB,EADO,EAEZ;AACEC,MAAAA,UAAU,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CADd;AAEEC,MAAAA,KAAK,EAAE,IAFT;AAGEC,MAAAA,SAAS,EAAE,MAHb;AAIEC,MAAAA,aAAa,OAJf;AAKEC,MAAAA,SAAS,EAAE;AALb,KAFY,EASZ,MACE,KAAKC,MAAL,CAAY,EACV,GAAGvB,IADO;AAEVa,MAAAA,MAFU;AAGVW,MAAAA,IAAI,EAAE,oBAHI;AAIVvB,MAAAA,MAAM,EAAED,IAAI,CAACC,MAJH;AAKVwB,MAAAA,SAAS,EAAE,CAAC1B,QAAD,CALD;AAMV2B,MAAAA,OAAO,EAAE;AANC,KAAZ,CAVU,CAAd;AAmBD;;AAEDC,EAAAA,kBAAkB,CAACC,YAAD,EAA6B5B,IAA7B,EAAsE;AAEtF,UAAMa,MAAM,GAAGe,YAAY,CAACd,oBAAb,EAAf;AACA,UAAMf,QAAQ,GAAG6B,YAAY,CAACb,cAA9B;;AAEA,QAAI,CAACF,MAAD,IAAW,CAACd,QAAhB,EAA0B;AACxB;AACD;;AAED,UAAME,MAAM,GAAG2B,YAAY,CAACC,YAAb,CAA0B7B,IAAI,CAACC,MAA/B,CAAf;AACAY,IAAAA,MAAM,CAACG,MAAP,CAAcjB,QAAd;AAEAL,IAAAA,cAAc,CACZ,KAAKuB,EADO,EAEZ;AACEK,MAAAA,SAAS,EAAE;AADb,KAFY,EAKZ,MACE,KAAKC,MAAL,CAAY,EACV,GAAGvB,IADO;AAEVa,MAAAA,MAFU;AAGVW,MAAAA,IAAI,0BAAmBI,YAAY,CAACE,EAAhC,CAHM;AAIV7B,MAAAA,MAJU;AAKVyB,MAAAA,OAAO,EAAE,EALC;AAMVD,MAAAA,SAAS,EAAE,CAAC1B,QAAD;AAND,KAAZ,CANU,CAAd;AAeD;;AA1EyC","sourcesContent":["import {withParameters} from '@luma.gl/core';\nimport {Layer, Viewport, _LayersPass as LayersPass, LayersPassRenderOptions} from '@deck.gl/core';\nimport type {HeightMapBuilder} from './height-map-builder';\nimport type {TerrainCover} from './terrain-cover';\n\nimport GL from '@luma.gl/constants';\n\nexport type TerrainPassRenderOptions = LayersPassRenderOptions;\n\n/** Renders textures used by the TerrainEffect render pass */\nexport class TerrainPass extends LayersPass {\n getRenderableLayers(viewport: Viewport, opts: TerrainPassRenderOptions): Layer[] {\n const {layers} = opts;\n const result: Layer[] = [];\n const drawParamsByIndex = this._getDrawLayerParams(viewport, opts, true);\n for (let i = 0; i < layers.length; i++) {\n const layer = layers[i];\n if (!layer.isComposite && drawParamsByIndex[i].shouldDrawLayer) {\n result.push(layer);\n }\n }\n\n return result;\n }\n\n renderHeightMap(heightMap: HeightMapBuilder, opts: Partial<TerrainPassRenderOptions>) {\n // console.log('Updating height map')\n const target = heightMap.getRenderFramebuffer();\n const viewport = heightMap.renderViewport;\n\n if (!target || !viewport) {\n return;\n }\n\n target.resize(viewport);\n\n withParameters(\n this.gl,\n {\n clearColor: [0, 0, 0, 0],\n blend: true,\n blendFunc: [GL.ONE, GL.ONE],\n blendEquation: GL.MAX,\n depthTest: false\n },\n () =>\n this.render({\n ...opts,\n target,\n pass: 'terrain-height-map',\n layers: opts.layers!,\n viewports: [viewport],\n effects: []\n })\n );\n }\n\n renderTerrainCover(terrainCover: TerrainCover, opts: Partial<TerrainPassRenderOptions>) {\n // console.log('Updating terrain cover ' + terrainCover.id)\n const target = terrainCover.getRenderFramebuffer();\n const viewport = terrainCover.renderViewport;\n\n if (!target || !viewport) {\n return;\n }\n\n const layers = terrainCover.filterLayers(opts.layers!);\n target.resize(viewport);\n\n withParameters(\n this.gl,\n {\n depthTest: false\n },\n () =>\n this.render({\n ...opts,\n target,\n pass: `terrain-cover-${terrainCover.id}`,\n layers,\n effects: [],\n viewports: [viewport]\n })\n );\n }\n}\n"],"file":"terrain-pass.js"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import { _PickLayersPass as PickLayersPass } from '@deck.gl/core';
|
|
3
|
+
import { withParameters } from '@luma.gl/core';
|
|
4
|
+
export class TerrainPickingPass extends PickLayersPass {
|
|
5
|
+
constructor(...args) {
|
|
6
|
+
super(...args);
|
|
7
|
+
|
|
8
|
+
_defineProperty(this, "drawParameters", {});
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
getRenderableLayers(viewport, opts) {
|
|
12
|
+
const {
|
|
13
|
+
layers
|
|
14
|
+
} = opts;
|
|
15
|
+
const result = [];
|
|
16
|
+
this.drawParameters = {};
|
|
17
|
+
|
|
18
|
+
this._resetColorEncoder(opts.pickZ);
|
|
19
|
+
|
|
20
|
+
const drawParamsByIndex = this._getDrawLayerParams(viewport, opts);
|
|
21
|
+
|
|
22
|
+
for (let i = 0; i < layers.length; i++) {
|
|
23
|
+
const layer = layers[i];
|
|
24
|
+
|
|
25
|
+
if (!layer.isComposite && drawParamsByIndex[i].shouldDrawLayer) {
|
|
26
|
+
result.push(layer);
|
|
27
|
+
this.drawParameters[layer.id] = drawParamsByIndex[i].layerParameters;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return result;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
renderTerrainCover(terrainCover, opts) {
|
|
35
|
+
const target = terrainCover.getPickingFramebuffer();
|
|
36
|
+
const viewport = terrainCover.renderViewport;
|
|
37
|
+
|
|
38
|
+
if (!target || !viewport) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const layers = terrainCover.filterLayers(opts.layers);
|
|
43
|
+
const terrainLayer = terrainCover.targetLayer;
|
|
44
|
+
|
|
45
|
+
if (terrainLayer.props.pickable) {
|
|
46
|
+
layers.unshift(terrainLayer);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
target.resize(viewport);
|
|
50
|
+
withParameters(this.gl, {
|
|
51
|
+
depthTest: false
|
|
52
|
+
}, () => this.render({ ...opts,
|
|
53
|
+
pickingFBO: target,
|
|
54
|
+
pass: "terrain-cover-picking-".concat(terrainCover.id),
|
|
55
|
+
layers,
|
|
56
|
+
effects: [],
|
|
57
|
+
viewports: [viewport],
|
|
58
|
+
cullRect: undefined,
|
|
59
|
+
deviceRect: viewport,
|
|
60
|
+
pickZ: false
|
|
61
|
+
}));
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
getLayerParameters(layer, layerIndex, viewport) {
|
|
65
|
+
if (this.drawParameters[layer.id]) {
|
|
66
|
+
return this.drawParameters[layer.id];
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
const parameters = super.getLayerParameters(layer, layerIndex, viewport);
|
|
70
|
+
parameters.blend = true;
|
|
71
|
+
return parameters;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=terrain-picking-pass.js.map
|