@deck.gl/extensions 9.0.0-alpha.7 → 9.0.0-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/brushing/brushing-extension.js +80 -0
- package/{typed → dist}/brushing/shader-module.d.ts +1 -1
- package/{typed → dist}/brushing/shader-module.d.ts.map +1 -1
- package/dist/brushing/shader-module.js +92 -0
- package/{typed → dist}/clip/clip-extension.d.ts.map +1 -1
- package/dist/clip/clip-extension.js +117 -0
- package/{typed → dist}/collision-filter/collision-filter-effect.d.ts.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 +4 -2
- package/{typed → dist}/collision-filter/collision-filter-pass.d.ts.map +1 -1
- package/dist/collision-filter/collision-filter-pass.js +25 -0
- package/{typed → dist}/collision-filter/shader-module.d.ts.map +1 -1
- package/dist/collision-filter/shader-module.js +87 -0
- package/dist/data-filter/aggregator.d.ts.map +1 -0
- package/dist/{esm/data-filter → data-filter}/aggregator.js +40 -41
- package/{typed → dist}/data-filter/data-filter-extension.d.ts +38 -6
- package/dist/data-filter/data-filter-extension.d.ts.map +1 -0
- package/dist/data-filter/data-filter-extension.js +249 -0
- package/{typed → dist}/data-filter/shader-module.d.ts +1 -1
- package/dist/data-filter/shader-module.d.ts.map +1 -0
- package/dist/data-filter/shader-module.js +179 -0
- package/dist/dist.dev.js +2079 -10477
- package/{typed → dist}/fill-style/fill-style-extension.d.ts +2 -30
- package/dist/fill-style/fill-style-extension.d.ts.map +1 -0
- package/dist/fill-style/fill-style-extension.js +116 -0
- package/{typed/fill-style/shaders.glsl.d.ts → dist/fill-style/shader-module.d.ts} +1 -1
- package/dist/fill-style/shader-module.d.ts.map +1 -0
- package/dist/fill-style/shader-module.js +96 -0
- package/dist/fp64/fp64-extension.js +35 -0
- package/dist/fp64/project64.glsl.js +81 -0
- package/dist/fp64/project64.js +50 -0
- package/dist/index.cjs +2756 -0
- package/dist/index.cjs.map +7 -0
- package/dist/index.d.ts +19 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +11 -0
- package/{typed → dist}/mask/mask-effect.d.ts +1 -1
- package/dist/mask/mask-effect.d.ts.map +1 -0
- 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/{typed → dist}/mask/shader-module.d.ts.map +1 -1
- package/dist/mask/shader-module.js +77 -0
- package/dist/path-style/path-style-extension.js +111 -0
- package/dist/path-style/shaders.glsl.js +86 -0
- package/{typed → dist}/terrain/height-map-builder.d.ts +1 -1
- package/dist/terrain/height-map-builder.d.ts.map +1 -0
- package/dist/terrain/height-map-builder.js +104 -0
- package/{typed → dist}/terrain/shader-module.d.ts +5 -3
- package/dist/terrain/shader-module.d.ts.map +1 -0
- package/dist/terrain/shader-module.js +137 -0
- package/{typed → dist}/terrain/terrain-cover.d.ts +1 -1
- package/dist/terrain/terrain-cover.d.ts.map +1 -0
- package/dist/terrain/terrain-cover.js +187 -0
- package/{typed → dist}/terrain/terrain-effect.d.ts +2 -2
- package/dist/terrain/terrain-effect.d.ts.map +1 -0
- package/dist/terrain/terrain-effect.js +184 -0
- package/dist/terrain/terrain-extension.js +44 -0
- package/{typed → dist}/terrain/terrain-pass.d.ts +2 -2
- package/dist/terrain/terrain-pass.d.ts.map +1 -0
- package/dist/terrain/terrain-pass.js +61 -0
- package/{typed → dist}/terrain/terrain-picking-pass.d.ts +1 -1
- package/dist/terrain/terrain-picking-pass.d.ts.map +1 -0
- package/dist/terrain/terrain-picking-pass.js +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/utils/syntax-tags.d.ts +6 -0
- package/dist/utils/syntax-tags.d.ts.map +1 -0
- package/dist/utils/syntax-tags.js +5 -0
- package/dist.min.js +898 -1257
- package/package.json +19 -16
- package/src/brushing/shader-module.ts +4 -3
- package/src/clip/clip-extension.ts +10 -9
- package/src/collision-filter/collision-filter-effect.ts +12 -8
- package/src/collision-filter/collision-filter-pass.ts +5 -5
- package/src/collision-filter/shader-module.ts +6 -4
- package/src/data-filter/aggregator.ts +8 -13
- package/src/data-filter/data-filter-extension.ts +147 -30
- package/src/data-filter/shader-module.ts +38 -9
- package/src/fill-style/fill-style-extension.ts +4 -5
- package/src/fill-style/{shaders.glsl.ts → shader-module.ts} +6 -5
- package/src/mask/mask-effect.ts +0 -1
- package/src/mask/mask-pass.ts +1 -3
- package/src/mask/shader-module.ts +7 -6
- package/src/terrain/shader-module.ts +16 -15
- package/src/terrain/terrain-effect.ts +12 -5
- package/src/terrain/terrain-pass.ts +2 -5
- package/src/terrain/terrain-picking-pass.ts +1 -3
- package/src/terrain/utils.ts +1 -1
- package/src/utils/debug.ts +1 -2
- package/src/utils/syntax-tags.ts +5 -0
- package/dist/es5/brushing/brushing-extension.js +0 -108
- package/dist/es5/brushing/brushing-extension.js.map +0 -1
- package/dist/es5/brushing/shader-module.js +0 -50
- package/dist/es5/brushing/shader-module.js.map +0 -1
- package/dist/es5/clip/clip-extension.js +0 -98
- package/dist/es5/clip/clip-extension.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-effect.js +0 -294
- package/dist/es5/collision-filter/collision-filter-effect.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-extension.js +0 -109
- package/dist/es5/collision-filter/collision-filter-extension.js.map +0 -1
- package/dist/es5/collision-filter/collision-filter-pass.js +0 -77
- 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 -84
- package/dist/es5/terrain/shader-module.js.map +0 -1
- package/dist/es5/terrain/terrain-cover.js +0 -256
- package/dist/es5/terrain/terrain-cover.js.map +0 -1
- package/dist/es5/terrain/terrain-effect.js +0 -326
- package/dist/es5/terrain/terrain-effect.js.map +0 -1
- package/dist/es5/terrain/terrain-extension.js +0 -94
- package/dist/es5/terrain/terrain-extension.js.map +0 -1
- package/dist/es5/terrain/terrain-pass.js +0 -121
- package/dist/es5/terrain/terrain-pass.js.map +0 -1
- package/dist/es5/terrain/terrain-picking-pass.js +0 -124
- package/dist/es5/terrain/terrain-picking-pass.js.map +0 -1
- package/dist/es5/terrain/utils.js +0 -35
- package/dist/es5/terrain/utils.js.map +0 -1
- package/dist/es5/utils/debug.js +0 -71
- package/dist/es5/utils/debug.js.map +0 -1
- package/dist/es5/utils/projection-utils.js +0 -168
- package/dist/es5/utils/projection-utils.js.map +0 -1
- package/dist/esm/brushing/brushing-extension.js +0 -68
- package/dist/esm/brushing/brushing-extension.js.map +0 -1
- package/dist/esm/brushing/shader-module.js +0 -103
- package/dist/esm/brushing/shader-module.js.map +0 -1
- package/dist/esm/clip/clip-extension.js +0 -86
- package/dist/esm/clip/clip-extension.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-effect.js +0 -246
- package/dist/esm/collision-filter/collision-filter-effect.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-extension.js +0 -75
- package/dist/esm/collision-filter/collision-filter-extension.js.map +0 -1
- package/dist/esm/collision-filter/collision-filter-pass.js +0 -30
- package/dist/esm/collision-filter/collision-filter-pass.js.map +0 -1
- package/dist/esm/collision-filter/shader-module.js +0 -104
- package/dist/esm/collision-filter/shader-module.js.map +0 -1
- package/dist/esm/data-filter/aggregator.js.map +0 -1
- package/dist/esm/data-filter/data-filter-extension.js +0 -189
- package/dist/esm/data-filter/data-filter-extension.js.map +0 -1
- package/dist/esm/data-filter/shader-module.js +0 -164
- package/dist/esm/data-filter/shader-module.js.map +0 -1
- package/dist/esm/fill-style/fill-style-extension.js +0 -156
- package/dist/esm/fill-style/fill-style-extension.js.map +0 -1
- package/dist/esm/fill-style/shaders.glsl.js +0 -108
- package/dist/esm/fill-style/shaders.glsl.js.map +0 -1
- package/dist/esm/fp64/fp64-extension.js +0 -20
- package/dist/esm/fp64/fp64-extension.js.map +0 -1
- package/dist/esm/fp64/project64.glsl.js +0 -82
- package/dist/esm/fp64/project64.glsl.js.map +0 -1
- package/dist/esm/fp64/project64.js +0 -43
- package/dist/esm/fp64/project64.js.map +0 -1
- package/dist/esm/index.js +0 -11
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/mask/mask-effect.js +0 -228
- package/dist/esm/mask/mask-effect.js.map +0 -1
- package/dist/esm/mask/mask-extension.js +0 -83
- package/dist/esm/mask/mask-extension.js.map +0 -1
- package/dist/esm/mask/mask-pass.js +0 -58
- package/dist/esm/mask/mask-pass.js.map +0 -1
- package/dist/esm/mask/shader-module.js +0 -84
- package/dist/esm/mask/shader-module.js.map +0 -1
- package/dist/esm/path-style/path-style-extension.js +0 -130
- package/dist/esm/path-style/path-style-extension.js.map +0 -1
- package/dist/esm/path-style/shaders.glsl.js +0 -84
- package/dist/esm/path-style/shaders.glsl.js.map +0 -1
- package/dist/esm/terrain/height-map-builder.js +0 -86
- package/dist/esm/terrain/height-map-builder.js.map +0 -1
- package/dist/esm/terrain/shader-module.js +0 -125
- 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/data-filter/aggregator.d.ts.map +0 -1
- package/typed/data-filter/data-filter-extension.d.ts.map +0 -1
- package/typed/data-filter/shader-module.d.ts.map +0 -1
- package/typed/fill-style/fill-style-extension.d.ts.map +0 -1
- package/typed/fill-style/shaders.glsl.d.ts.map +0 -1
- package/typed/index.d.ts +0 -19
- package/typed/index.d.ts.map +0 -1
- package/typed/mask/mask-effect.d.ts.map +0 -1
- package/typed/terrain/height-map-builder.d.ts.map +0 -1
- package/typed/terrain/shader-module.d.ts.map +0 -1
- package/typed/terrain/terrain-cover.d.ts.map +0 -1
- package/typed/terrain/terrain-effect.d.ts.map +0 -1
- package/typed/terrain/terrain-pass.d.ts.map +0 -1
- package/typed/terrain/terrain-picking-pass.d.ts.map +0 -1
- /package/{typed → dist}/brushing/brushing-extension.d.ts +0 -0
- /package/{typed → dist}/brushing/brushing-extension.d.ts.map +0 -0
- /package/{typed → dist}/clip/clip-extension.d.ts +0 -0
- /package/{typed → dist}/collision-filter/collision-filter-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/shader-module.d.ts +0 -0
- /package/{typed → dist}/data-filter/aggregator.d.ts +0 -0
- /package/{typed → dist}/fp64/fp64-extension.d.ts +0 -0
- /package/{typed → dist}/fp64/fp64-extension.d.ts.map +0 -0
- /package/{typed → dist}/fp64/project64.d.ts +0 -0
- /package/{typed → dist}/fp64/project64.d.ts.map +0 -0
- /package/{typed → dist}/fp64/project64.glsl.d.ts +0 -0
- /package/{typed → dist}/fp64/project64.glsl.d.ts.map +0 -0
- /package/{typed → dist}/mask/mask-extension.d.ts +0 -0
- /package/{typed → dist}/mask/mask-extension.d.ts.map +0 -0
- /package/{typed → dist}/mask/mask-pass.d.ts +0 -0
- /package/{typed → dist}/mask/shader-module.d.ts +0 -0
- /package/{typed → dist}/path-style/path-style-extension.d.ts +0 -0
- /package/{typed → dist}/path-style/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/terrain-extension.d.ts +0 -0
- /package/{typed → dist}/terrain/terrain-extension.d.ts.map +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,80 @@
|
|
|
1
|
+
// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
|
|
2
|
+
//
|
|
3
|
+
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
4
|
+
// of this software and associated documentation files (the "Software"), to deal
|
|
5
|
+
// in the Software without restriction, including without limitation the rights
|
|
6
|
+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
7
|
+
// copies of the Software, and to permit persons to whom the Software is
|
|
8
|
+
// furnished to do so, subject to the following conditions:
|
|
9
|
+
//
|
|
10
|
+
// The above copyright notice and this permission notice shall be included in
|
|
11
|
+
// all copies or substantial portions of the Software.
|
|
12
|
+
//
|
|
13
|
+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
14
|
+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
15
|
+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
16
|
+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
17
|
+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
18
|
+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
19
|
+
// THE SOFTWARE.
|
|
20
|
+
import { LayerExtension } from '@deck.gl/core';
|
|
21
|
+
import shaderModule from "./shader-module.js";
|
|
22
|
+
const defaultProps = {
|
|
23
|
+
getBrushingTarget: { type: 'accessor', value: [0, 0] },
|
|
24
|
+
brushingTarget: 'source',
|
|
25
|
+
brushingEnabled: true,
|
|
26
|
+
brushingRadius: 10000
|
|
27
|
+
};
|
|
28
|
+
/** Adds GPU-based data brushing functionalities to layers. It allows the layer to show/hide objects based on the current pointer position. */
|
|
29
|
+
export default class BrushingExtension extends LayerExtension {
|
|
30
|
+
static { this.defaultProps = defaultProps; }
|
|
31
|
+
static { this.extensionName = 'BrushingExtension'; }
|
|
32
|
+
getShaders() {
|
|
33
|
+
return {
|
|
34
|
+
modules: [shaderModule]
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
initializeState(context, extension) {
|
|
38
|
+
const attributeManager = this.getAttributeManager();
|
|
39
|
+
if (attributeManager) {
|
|
40
|
+
attributeManager.add({
|
|
41
|
+
brushingTargets: {
|
|
42
|
+
size: 2,
|
|
43
|
+
accessor: 'getBrushingTarget',
|
|
44
|
+
shaderAttributes: {
|
|
45
|
+
brushingTargets: {
|
|
46
|
+
divisor: 0
|
|
47
|
+
},
|
|
48
|
+
instanceBrushingTargets: {
|
|
49
|
+
divisor: 1
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
// Trigger redraw when mouse moves
|
|
56
|
+
const onMouseMove = () => {
|
|
57
|
+
this.getCurrentLayer()?.setNeedsRedraw();
|
|
58
|
+
};
|
|
59
|
+
// TODO - expose this in a better way
|
|
60
|
+
this.state.onMouseMove = onMouseMove;
|
|
61
|
+
if (context.deck) {
|
|
62
|
+
// @ts-expect-error (2446) accessing protected property
|
|
63
|
+
context.deck.eventManager.on({
|
|
64
|
+
pointermove: onMouseMove,
|
|
65
|
+
pointerleave: onMouseMove
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
finalizeState(context, extension) {
|
|
70
|
+
// Remove event listeners
|
|
71
|
+
if (context.deck) {
|
|
72
|
+
const onMouseMove = this.state.onMouseMove;
|
|
73
|
+
// @ts-expect-error (2446) accessing protected property
|
|
74
|
+
context.deck.eventManager.off({
|
|
75
|
+
pointermove: onMouseMove,
|
|
76
|
+
pointerleave: onMouseMove
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ShaderModule } from '@luma.gl/shadertools';
|
|
2
2
|
import type { Viewport } from '@deck.gl/core';
|
|
3
|
-
import type { BrushingExtensionProps } from
|
|
3
|
+
import type { BrushingExtensionProps } from "./brushing-extension.js";
|
|
4
4
|
type BrushingModuleSettings = {
|
|
5
5
|
viewport: Viewport;
|
|
6
6
|
mousePosition?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,
|
|
1
|
+
{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAGjE,KAAK,sBAAsB,GAAG;IAE5B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;;AAkF3B,wBA4B0C"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { project } from '@deck.gl/core';
|
|
2
|
+
import { glsl } from "../utils/syntax-tags.js";
|
|
3
|
+
const vs = `
|
|
4
|
+
uniform bool brushing_enabled;
|
|
5
|
+
uniform int brushing_target;
|
|
6
|
+
uniform vec2 brushing_mousePos;
|
|
7
|
+
uniform float brushing_radius;
|
|
8
|
+
#ifdef NON_INSTANCED_MODEL
|
|
9
|
+
in vec2 brushingTargets;
|
|
10
|
+
#else
|
|
11
|
+
in vec2 instanceBrushingTargets;
|
|
12
|
+
#endif
|
|
13
|
+
out float brushing_isVisible;
|
|
14
|
+
bool brushing_isPointInRange(vec2 position) {
|
|
15
|
+
if (!brushing_enabled) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
vec2 source_commonspace = project_position(position);
|
|
19
|
+
vec2 target_commonspace = project_position(brushing_mousePos);
|
|
20
|
+
float distance = length((target_commonspace - source_commonspace) / project_uCommonUnitsPerMeter.xy);
|
|
21
|
+
return distance <= brushing_radius;
|
|
22
|
+
}
|
|
23
|
+
bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {
|
|
24
|
+
return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);
|
|
25
|
+
}
|
|
26
|
+
void brushing_setVisible(bool visible) {
|
|
27
|
+
brushing_isVisible = float(visible);
|
|
28
|
+
}
|
|
29
|
+
`;
|
|
30
|
+
const fs = `
|
|
31
|
+
uniform bool brushing_enabled;
|
|
32
|
+
in float brushing_isVisible;
|
|
33
|
+
`;
|
|
34
|
+
const TARGET = {
|
|
35
|
+
source: 0,
|
|
36
|
+
target: 1,
|
|
37
|
+
custom: 2,
|
|
38
|
+
source_target: 3
|
|
39
|
+
};
|
|
40
|
+
const inject = {
|
|
41
|
+
'vs:DECKGL_FILTER_GL_POSITION': `
|
|
42
|
+
vec2 brushingTarget;
|
|
43
|
+
vec2 brushingSource;
|
|
44
|
+
if (brushing_target == 3) {
|
|
45
|
+
brushingTarget = geometry.worldPositionAlt.xy;
|
|
46
|
+
brushingSource = geometry.worldPosition.xy;
|
|
47
|
+
} else if (brushing_target == 0) {
|
|
48
|
+
brushingTarget = geometry.worldPosition.xy;
|
|
49
|
+
} else if (brushing_target == 1) {
|
|
50
|
+
brushingTarget = geometry.worldPositionAlt.xy;
|
|
51
|
+
} else {
|
|
52
|
+
#ifdef NON_INSTANCED_MODEL
|
|
53
|
+
brushingTarget = brushingTargets;
|
|
54
|
+
#else
|
|
55
|
+
brushingTarget = instanceBrushingTargets;
|
|
56
|
+
#endif
|
|
57
|
+
}
|
|
58
|
+
bool visible;
|
|
59
|
+
if (brushing_target == 3) {
|
|
60
|
+
visible = brushing_arePointsInRange(brushingSource, brushingTarget);
|
|
61
|
+
} else {
|
|
62
|
+
visible = brushing_isPointInRange(brushingTarget);
|
|
63
|
+
}
|
|
64
|
+
brushing_setVisible(visible);
|
|
65
|
+
`,
|
|
66
|
+
'fs:DECKGL_FILTER_COLOR': `
|
|
67
|
+
if (brushing_enabled && brushing_isVisible < 0.5) {
|
|
68
|
+
discard;
|
|
69
|
+
}
|
|
70
|
+
`
|
|
71
|
+
};
|
|
72
|
+
export default {
|
|
73
|
+
name: 'brushing',
|
|
74
|
+
dependencies: [project],
|
|
75
|
+
vs,
|
|
76
|
+
fs,
|
|
77
|
+
inject,
|
|
78
|
+
getUniforms: (opts) => {
|
|
79
|
+
if (!opts || !('viewport' in opts)) {
|
|
80
|
+
return {};
|
|
81
|
+
}
|
|
82
|
+
const { brushingEnabled = true, brushingRadius = 10000, brushingTarget = 'source', mousePosition, viewport } = opts;
|
|
83
|
+
return {
|
|
84
|
+
brushing_enabled: Boolean(brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)),
|
|
85
|
+
brushing_radius: brushingRadius,
|
|
86
|
+
brushing_target: TARGET[brushingTarget] || 0,
|
|
87
|
+
brushing_mousePos: mousePosition
|
|
88
|
+
? viewport.unproject([mousePosition.x - viewport.x, mousePosition.y - viewport.y])
|
|
89
|
+
: [0, 0]
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AAQzC,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AA0DF,uEAAuE;AACvE,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,cAAc;IACvD,MAAM,CAAC,YAAY;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAmB;IAEvC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,kBAAkB,CAAC;;;;;;;;;IAwB1C,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAC,EAAE,GAAG,GAAG,IAAI;CAgBvE"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
|
|
2
|
+
//
|
|
3
|
+
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
4
|
+
// of this software and associated documentation files (the "Software"), to deal
|
|
5
|
+
// in the Software without restriction, including without limitation the rights
|
|
6
|
+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
7
|
+
// copies of the Software, and to permit persons to whom the Software is
|
|
8
|
+
// furnished to do so, subject to the following conditions:
|
|
9
|
+
//
|
|
10
|
+
// The above copyright notice and this permission notice shall be included in
|
|
11
|
+
// all copies or substantial portions of the Software.
|
|
12
|
+
//
|
|
13
|
+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
14
|
+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
15
|
+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
16
|
+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
17
|
+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
18
|
+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
19
|
+
// THE SOFTWARE.
|
|
20
|
+
import { LayerExtension } from '@deck.gl/core';
|
|
21
|
+
import { glsl } from "../utils/syntax-tags.js";
|
|
22
|
+
const defaultProps = {
|
|
23
|
+
clipBounds: [0, 0, 1, 1],
|
|
24
|
+
clipByInstance: undefined
|
|
25
|
+
};
|
|
26
|
+
const shaderFunction = `
|
|
27
|
+
uniform vec4 clip_bounds;
|
|
28
|
+
bool clip_isInBounds(vec2 position) {
|
|
29
|
+
return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.x < clip_bounds[2] && position.y < clip_bounds[3];
|
|
30
|
+
}
|
|
31
|
+
`;
|
|
32
|
+
/*
|
|
33
|
+
* The vertex-shader version clips geometries by their anchor position
|
|
34
|
+
* e.g. ScatterplotLayer - show if the center of a circle is within bounds
|
|
35
|
+
*/
|
|
36
|
+
const shaderModuleVs = {
|
|
37
|
+
name: 'clip-vs',
|
|
38
|
+
vs: shaderFunction
|
|
39
|
+
};
|
|
40
|
+
const injectionVs = {
|
|
41
|
+
'vs:#decl': `
|
|
42
|
+
out float clip_isVisible;
|
|
43
|
+
`,
|
|
44
|
+
'vs:DECKGL_FILTER_GL_POSITION': `
|
|
45
|
+
clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
|
|
46
|
+
`,
|
|
47
|
+
'fs:#decl': `
|
|
48
|
+
in float clip_isVisible;
|
|
49
|
+
`,
|
|
50
|
+
'fs:DECKGL_FILTER_COLOR': `
|
|
51
|
+
if (clip_isVisible < 0.5) discard;
|
|
52
|
+
`
|
|
53
|
+
};
|
|
54
|
+
/*
|
|
55
|
+
* The fragment-shader version clips pixels at the bounds
|
|
56
|
+
* e.g. PolygonLayer - show the part of the polygon that intersect with the bounds
|
|
57
|
+
*/
|
|
58
|
+
const shaderModuleFs = {
|
|
59
|
+
name: 'clip-fs',
|
|
60
|
+
fs: shaderFunction
|
|
61
|
+
};
|
|
62
|
+
const injectionFs = {
|
|
63
|
+
'vs:#decl': `
|
|
64
|
+
out vec2 clip_commonPosition;
|
|
65
|
+
`,
|
|
66
|
+
'vs:DECKGL_FILTER_GL_POSITION': `
|
|
67
|
+
clip_commonPosition = geometry.position.xy;
|
|
68
|
+
`,
|
|
69
|
+
'fs:#decl': `
|
|
70
|
+
in vec2 clip_commonPosition;
|
|
71
|
+
`,
|
|
72
|
+
'fs:DECKGL_FILTER_COLOR': `
|
|
73
|
+
if (!clip_isInBounds(clip_commonPosition)) discard;
|
|
74
|
+
`
|
|
75
|
+
};
|
|
76
|
+
/** Adds support for clipping rendered layers by rectangular bounds. */
|
|
77
|
+
export default class ClipExtension extends LayerExtension {
|
|
78
|
+
static { this.defaultProps = defaultProps; }
|
|
79
|
+
static { this.extensionName = 'ClipExtension'; }
|
|
80
|
+
getShaders() {
|
|
81
|
+
// If `clipByInstance: true`, the entire object is shown/hidden based on its anchor position (done by vertex shader)
|
|
82
|
+
// Otherwise, the object is trimmed by the clip bounds (done by fragment shader)
|
|
83
|
+
// Default behavior: consider a layer instanced if it has attribute `instancePositions`
|
|
84
|
+
let clipByInstance = 'instancePositions' in this.getAttributeManager().attributes;
|
|
85
|
+
// Users can override by setting the `clipByInstance` prop
|
|
86
|
+
if (this.props.clipByInstance !== undefined) {
|
|
87
|
+
clipByInstance = Boolean(this.props.clipByInstance);
|
|
88
|
+
}
|
|
89
|
+
this.state.clipByInstance = clipByInstance;
|
|
90
|
+
return clipByInstance
|
|
91
|
+
? {
|
|
92
|
+
modules: [shaderModuleVs],
|
|
93
|
+
inject: injectionVs
|
|
94
|
+
}
|
|
95
|
+
: {
|
|
96
|
+
modules: [shaderModuleFs],
|
|
97
|
+
inject: injectionFs
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
/* eslint-disable camelcase */
|
|
101
|
+
draw({ uniforms }) {
|
|
102
|
+
const { clipBounds } = this.props;
|
|
103
|
+
if (this.state.clipByInstance) {
|
|
104
|
+
uniforms.clip_bounds = clipBounds;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
const corner0 = this.projectPosition([clipBounds[0], clipBounds[1], 0]);
|
|
108
|
+
const corner1 = this.projectPosition([clipBounds[2], clipBounds[3], 0]);
|
|
109
|
+
uniforms.clip_bounds = [
|
|
110
|
+
Math.min(corner0[0], corner1[0]),
|
|
111
|
+
Math.min(corner0[1], corner1[1]),
|
|
112
|
+
Math.max(corner0[0], corner1[0]),
|
|
113
|
+
Math.max(corner0[1], corner1[1])
|
|
114
|
+
];
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collision-filter-effect.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"collision-filter-effect.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAW,MAAM,eAAe,CAAC;AAoB7E,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,MAAM;IAC1D,EAAE,SAA6B;IAC/B,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,iBAAiB,CAAC,CAAU;IACpC,OAAO,CAAC,YAAY,CAAC,CAAW;IAEhC,SAAS,CACP,MAAM,EAAE,MAAM,EACd,EACE,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,cAAmB,EACpB,EAAE,gBAAgB,GAClB,IAAI;IAyDP,OAAO,CAAC,OAAO;IA+Df;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqC9B,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG;QACjC,YAAY,EAAE,WAAW,CAAC;QAC1B,iBAAiB,EAAE,OAAO,CAAC;KAC5B;IAMD,OAAO,IAAI,IAAI;IAaf,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAmChD,UAAU,CAAC,cAAc,EAAE,MAAM;CAOlC"}
|
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import { equals } from '@math.gl/core';
|
|
2
|
+
import { _deepEqual as deepEqual } from '@deck.gl/core';
|
|
3
|
+
import CollisionFilterPass from "./collision-filter-pass.js";
|
|
4
|
+
import MaskEffect from "../mask/mask-effect.js";
|
|
5
|
+
// Factor by which to downscale Collision FBO relative to canvas
|
|
6
|
+
const DOWNSCALE = 2;
|
|
7
|
+
export default class CollisionFilterEffect {
|
|
8
|
+
constructor() {
|
|
9
|
+
this.id = 'collision-filter-effect';
|
|
10
|
+
this.props = null;
|
|
11
|
+
this.useInPicking = true;
|
|
12
|
+
this.order = 1;
|
|
13
|
+
this.channels = {};
|
|
14
|
+
this.collisionFBOs = {};
|
|
15
|
+
}
|
|
16
|
+
preRender(device, { effects: allEffects, layers, layerFilter, viewports, onViewportActive, views, isPicking, preRenderStats = {} }) {
|
|
17
|
+
if (!this.dummyCollisionMap) {
|
|
18
|
+
this.dummyCollisionMap = device.createTexture({ width: 1, height: 1 });
|
|
19
|
+
}
|
|
20
|
+
if (isPicking) {
|
|
21
|
+
// Do not update on picking pass
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const collisionLayers = layers.filter(
|
|
25
|
+
// @ts-ignore
|
|
26
|
+
({ props: { visible, collisionEnabled } }) => visible && collisionEnabled);
|
|
27
|
+
if (collisionLayers.length === 0) {
|
|
28
|
+
this.channels = {};
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
if (!this.collisionFilterPass) {
|
|
32
|
+
this.collisionFilterPass = new CollisionFilterPass(device, { id: 'default-collision-filter' });
|
|
33
|
+
}
|
|
34
|
+
// Detect if mask has rendered. TODO: better dependency system for Effects
|
|
35
|
+
const effects = allEffects?.filter(e => e.constructor === MaskEffect);
|
|
36
|
+
const maskEffectRendered = preRenderStats['mask-effect']?.didRender;
|
|
37
|
+
// Collect layers to render
|
|
38
|
+
const channels = this._groupByCollisionGroup(device, collisionLayers);
|
|
39
|
+
const viewport = viewports[0];
|
|
40
|
+
const viewportChanged = !this.lastViewport || !this.lastViewport.equals(viewport) || maskEffectRendered;
|
|
41
|
+
// Resize framebuffers to match canvas
|
|
42
|
+
for (const collisionGroup in channels) {
|
|
43
|
+
const collisionFBO = this.collisionFBOs[collisionGroup];
|
|
44
|
+
const renderInfo = channels[collisionGroup];
|
|
45
|
+
// @ts-expect-error TODO - assuming WebGL context
|
|
46
|
+
const [width, height] = device.canvasContext.getPixelSize();
|
|
47
|
+
collisionFBO.resize({
|
|
48
|
+
width: width / DOWNSCALE,
|
|
49
|
+
height: height / DOWNSCALE
|
|
50
|
+
});
|
|
51
|
+
this._render(renderInfo, {
|
|
52
|
+
effects,
|
|
53
|
+
layerFilter,
|
|
54
|
+
onViewportActive,
|
|
55
|
+
views,
|
|
56
|
+
viewport,
|
|
57
|
+
viewportChanged
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
// debugFBO(this.collisionFBOs[Object.keys(channels)[0]], {minimap: true});
|
|
61
|
+
}
|
|
62
|
+
_render(renderInfo, { effects, layerFilter, onViewportActive, views, viewport, viewportChanged }) {
|
|
63
|
+
const { collisionGroup } = renderInfo;
|
|
64
|
+
const oldRenderInfo = this.channels[collisionGroup];
|
|
65
|
+
if (!oldRenderInfo) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const needsRender = viewportChanged ||
|
|
69
|
+
// If render info is new
|
|
70
|
+
renderInfo === oldRenderInfo ||
|
|
71
|
+
// If sublayers have changed
|
|
72
|
+
!deepEqual(oldRenderInfo.layers, renderInfo.layers, 1) ||
|
|
73
|
+
// If a sublayer's bounds have been updated
|
|
74
|
+
renderInfo.layerBounds.some((b, i) => !equals(b, oldRenderInfo.layerBounds[i])) ||
|
|
75
|
+
// If a sublayer's isLoaded state has been updated
|
|
76
|
+
renderInfo.allLayersLoaded !== oldRenderInfo.allLayersLoaded ||
|
|
77
|
+
// Some prop is in transition
|
|
78
|
+
renderInfo.layers.some(layer => layer.props.transitions);
|
|
79
|
+
this.channels[collisionGroup] = renderInfo;
|
|
80
|
+
if (needsRender) {
|
|
81
|
+
this.lastViewport = viewport;
|
|
82
|
+
const collisionFBO = this.collisionFBOs[collisionGroup];
|
|
83
|
+
// Rerender collision FBO
|
|
84
|
+
this.collisionFilterPass.renderCollisionMap(collisionFBO, {
|
|
85
|
+
pass: 'collision-filter',
|
|
86
|
+
isPicking: true,
|
|
87
|
+
layers: renderInfo.layers,
|
|
88
|
+
effects,
|
|
89
|
+
layerFilter,
|
|
90
|
+
viewports: viewport ? [viewport] : [],
|
|
91
|
+
onViewportActive,
|
|
92
|
+
views,
|
|
93
|
+
moduleParameters: {
|
|
94
|
+
// To avoid feedback loop forming between Framebuffer and active Texture.
|
|
95
|
+
dummyCollisionMap: this.dummyCollisionMap,
|
|
96
|
+
// @ts-expect-error TODO - assuming WebGL context
|
|
97
|
+
devicePixelRatio: collisionFBO.device.canvasContext.getDevicePixelRatio() / DOWNSCALE
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Group layers by collisionGroup
|
|
104
|
+
* Returns a map from collisionGroup to render info
|
|
105
|
+
*/
|
|
106
|
+
_groupByCollisionGroup(device, collisionLayers) {
|
|
107
|
+
const channelMap = {};
|
|
108
|
+
for (const layer of collisionLayers) {
|
|
109
|
+
const { collisionGroup } = layer.props;
|
|
110
|
+
let channelInfo = channelMap[collisionGroup];
|
|
111
|
+
if (!channelInfo) {
|
|
112
|
+
channelInfo = { collisionGroup, layers: [], layerBounds: [], allLayersLoaded: true };
|
|
113
|
+
channelMap[collisionGroup] = channelInfo;
|
|
114
|
+
}
|
|
115
|
+
channelInfo.layers.push(layer);
|
|
116
|
+
channelInfo.layerBounds.push(layer.getBounds());
|
|
117
|
+
if (!layer.isLoaded) {
|
|
118
|
+
channelInfo.allLayersLoaded = false;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
// Create any new passes and remove any old ones
|
|
122
|
+
for (const collisionGroup of Object.keys(channelMap)) {
|
|
123
|
+
if (!this.collisionFBOs[collisionGroup]) {
|
|
124
|
+
this.createFBO(device, collisionGroup);
|
|
125
|
+
}
|
|
126
|
+
if (!this.channels[collisionGroup]) {
|
|
127
|
+
this.channels[collisionGroup] = channelMap[collisionGroup];
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
for (const collisionGroup of Object.keys(this.collisionFBOs)) {
|
|
131
|
+
if (!channelMap[collisionGroup]) {
|
|
132
|
+
this.destroyFBO(collisionGroup);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return channelMap;
|
|
136
|
+
}
|
|
137
|
+
getModuleParameters(layer) {
|
|
138
|
+
const { collisionGroup } = layer.props;
|
|
139
|
+
const { collisionFBOs, dummyCollisionMap } = this;
|
|
140
|
+
return { collisionFBO: collisionFBOs[collisionGroup], dummyCollisionMap: dummyCollisionMap };
|
|
141
|
+
}
|
|
142
|
+
cleanup() {
|
|
143
|
+
if (this.dummyCollisionMap) {
|
|
144
|
+
this.dummyCollisionMap.delete();
|
|
145
|
+
this.dummyCollisionMap = undefined;
|
|
146
|
+
}
|
|
147
|
+
this.channels = {};
|
|
148
|
+
for (const collisionGroup of Object.keys(this.collisionFBOs)) {
|
|
149
|
+
this.destroyFBO(collisionGroup);
|
|
150
|
+
}
|
|
151
|
+
this.collisionFBOs = {};
|
|
152
|
+
this.lastViewport = undefined;
|
|
153
|
+
}
|
|
154
|
+
createFBO(device, collisionGroup) {
|
|
155
|
+
// @ts-expect-error
|
|
156
|
+
const { width, height } = device.gl.canvas;
|
|
157
|
+
const collisionMap = device.createTexture({
|
|
158
|
+
format: 'rgba8unorm',
|
|
159
|
+
width,
|
|
160
|
+
height,
|
|
161
|
+
sampler: {
|
|
162
|
+
minFilter: 'nearest',
|
|
163
|
+
magFilter: 'nearest',
|
|
164
|
+
addressModeU: 'clamp-to-edge',
|
|
165
|
+
addressModeV: 'clamp-to-edge'
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
// @ts-ignore
|
|
169
|
+
const depthStencilAttachment = device.createTexture({
|
|
170
|
+
format: 'depth16unorm',
|
|
171
|
+
width,
|
|
172
|
+
height,
|
|
173
|
+
mipmaps: false,
|
|
174
|
+
// TODO fix getWebGLTextureParameters() in luma to avoid passing deprecated parameters
|
|
175
|
+
dataFormat: 6402, // gl.DEPTH_COMPONENT
|
|
176
|
+
type: 5125 // gl.UNSIGNED_INT
|
|
177
|
+
});
|
|
178
|
+
this.collisionFBOs[collisionGroup] = device.createFramebuffer({
|
|
179
|
+
id: `collision-${collisionGroup}`,
|
|
180
|
+
width,
|
|
181
|
+
height,
|
|
182
|
+
colorAttachments: [collisionMap],
|
|
183
|
+
depthStencilAttachment
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
destroyFBO(collisionGroup) {
|
|
187
|
+
const fbo = this.collisionFBOs[collisionGroup];
|
|
188
|
+
fbo.colorAttachments[0]?.destroy();
|
|
189
|
+
fbo.depthStencilAttachment?.destroy();
|
|
190
|
+
fbo.destroy();
|
|
191
|
+
delete this.collisionFBOs[collisionGroup];
|
|
192
|
+
}
|
|
193
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { LayerExtension } from '@deck.gl/core';
|
|
2
|
+
import collision from "./shader-module.js";
|
|
3
|
+
import CollisionFilterEffect from "./collision-filter-effect.js";
|
|
4
|
+
const defaultProps = {
|
|
5
|
+
getCollisionPriority: { type: 'accessor', value: 0 },
|
|
6
|
+
collisionEnabled: true,
|
|
7
|
+
collisionGroup: { type: 'string', value: 'default' },
|
|
8
|
+
collisionTestProps: {}
|
|
9
|
+
};
|
|
10
|
+
/** Allows layers to hide overlapping objects. */
|
|
11
|
+
export default class CollisionFilterExtension extends LayerExtension {
|
|
12
|
+
static { this.defaultProps = defaultProps; }
|
|
13
|
+
static { this.extensionName = 'CollisionFilterExtension'; }
|
|
14
|
+
getShaders() {
|
|
15
|
+
return { modules: [collision] };
|
|
16
|
+
}
|
|
17
|
+
/* eslint-disable camelcase */
|
|
18
|
+
draw({ uniforms, context, moduleParameters }) {
|
|
19
|
+
const { collisionEnabled } = this.props;
|
|
20
|
+
const { collisionFBO, drawToCollisionMap } = moduleParameters;
|
|
21
|
+
const enabled = collisionEnabled && Boolean(collisionFBO);
|
|
22
|
+
uniforms.collision_enabled = enabled;
|
|
23
|
+
if (drawToCollisionMap) {
|
|
24
|
+
// Override any props with those defined in collisionTestProps
|
|
25
|
+
// @ts-ignore
|
|
26
|
+
this.props = this.clone(this.props.collisionTestProps).props;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
initializeState(context, extension) {
|
|
30
|
+
if (this.getAttributeManager() === null) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
this.context.deck?._addDefaultEffect(new CollisionFilterEffect());
|
|
34
|
+
const attributeManager = this.getAttributeManager();
|
|
35
|
+
attributeManager.add({
|
|
36
|
+
collisionPriorities: {
|
|
37
|
+
size: 1,
|
|
38
|
+
accessor: 'getCollisionPriority',
|
|
39
|
+
shaderAttributes: {
|
|
40
|
+
collisionPriorities: { divisor: 0 },
|
|
41
|
+
instanceCollisionPriorities: { divisor: 1 }
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
getNeedsPickingBuffer() {
|
|
47
|
+
return this.props.collisionEnabled;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
@@ -5,8 +5,10 @@ export default class CollisionFilterPass extends LayersPass {
|
|
|
5
5
|
renderCollisionMap(target: Framebuffer, options: CollisionFilterPassRenderOptions): any;
|
|
6
6
|
getModuleParameters(): {
|
|
7
7
|
drawToCollisionMap: boolean;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
picking: {
|
|
9
|
+
isActive: number;
|
|
10
|
+
isAttribute: boolean;
|
|
11
|
+
};
|
|
10
12
|
lightSources: {};
|
|
11
13
|
};
|
|
12
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collision-filter-pass.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"collision-filter-pass.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAC,MAAM,eAAe,CAAC;AAEjF,KAAK,gCAAgC,GAAG,uBAAuB,GAAG,EAAE,CAAC;AAErE,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU;IACzD,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,gCAAgC;IAgBjF,mBAAmB;;;;;;;;CAWpB"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { _LayersPass as LayersPass } from '@deck.gl/core';
|
|
2
|
+
export default class CollisionFilterPass extends LayersPass {
|
|
3
|
+
renderCollisionMap(target, options) {
|
|
4
|
+
const padding = 1;
|
|
5
|
+
const clearColor = [0, 0, 0, 0];
|
|
6
|
+
return this.device.withParametersWebGL({
|
|
7
|
+
scissorTest: true,
|
|
8
|
+
scissor: [padding, padding, target.width - 2 * padding, target.height - 2 * padding],
|
|
9
|
+
blend: false,
|
|
10
|
+
depthTest: true,
|
|
11
|
+
depthRange: [0, 1]
|
|
12
|
+
}, () => this.render({ ...options, clearColor, target, pass: 'collision' }));
|
|
13
|
+
}
|
|
14
|
+
getModuleParameters() {
|
|
15
|
+
// Draw picking colors into collision FBO
|
|
16
|
+
return {
|
|
17
|
+
drawToCollisionMap: true,
|
|
18
|
+
picking: {
|
|
19
|
+
isActive: 1,
|
|
20
|
+
isAttribute: false
|
|
21
|
+
},
|
|
22
|
+
lightSources: {}
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/collision-filter/shader-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAoFvD,KAAK,uBAAuB,GAAG;IAC7B,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;;AAsBF,wBAM2C"}
|