@deck.gl/extensions 8.8.0-alpha.6 → 8.8.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 +480 -1335
- package/dist/es5/brushing/brushing.js +19 -15
- package/dist/es5/brushing/brushing.js.map +1 -1
- package/dist/es5/brushing/shader-module.js +1 -1
- package/dist/es5/brushing/shader-module.js.map +1 -1
- package/dist/es5/clip/clip.js +4 -2
- package/dist/es5/clip/clip.js.map +1 -1
- package/dist/es5/data-filter/aggregator.js +1 -1
- package/dist/es5/data-filter/aggregator.js.map +1 -1
- package/dist/es5/data-filter/data-filter.js +9 -9
- package/dist/es5/data-filter/data-filter.js.map +1 -1
- package/dist/es5/data-filter/shader-module.js +22 -13
- package/dist/es5/data-filter/shader-module.js.map +1 -1
- package/dist/es5/fill-style/fill-style.js +13 -11
- package/dist/es5/fill-style/fill-style.js.map +1 -1
- package/dist/es5/fill-style/shaders.glsl.js +8 -6
- package/dist/es5/fill-style/shaders.glsl.js.map +1 -1
- package/dist/es5/fp64/fp64.js +4 -2
- package/dist/es5/fp64/fp64.js.map +1 -1
- package/dist/es5/fp64/project64.glsl.js +1 -1
- package/dist/es5/fp64/project64.js +2 -5
- package/dist/es5/fp64/project64.js.map +1 -1
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/mask/mask.js +7 -4
- package/dist/es5/mask/mask.js.map +1 -1
- package/dist/es5/mask/shader-module.js +6 -7
- package/dist/es5/mask/shader-module.js.map +1 -1
- package/dist/es5/path-style/path-style.js +5 -5
- package/dist/es5/path-style/path-style.js.map +1 -1
- package/dist/es5/path-style/shaders.glsl.js +1 -1
- package/dist/es5/path-style/shaders.glsl.js.map +1 -1
- package/dist/esm/brushing/brushing.js +20 -15
- package/dist/esm/brushing/brushing.js.map +1 -1
- package/dist/esm/brushing/shader-module.js +1 -1
- package/dist/esm/brushing/shader-module.js.map +1 -1
- package/dist/esm/clip/clip.js +5 -2
- package/dist/esm/clip/clip.js.map +1 -1
- package/dist/esm/data-filter/aggregator.js +1 -1
- package/dist/esm/data-filter/aggregator.js.map +1 -1
- package/dist/esm/data-filter/data-filter.js +6 -3
- package/dist/esm/data-filter/data-filter.js.map +1 -1
- package/dist/esm/data-filter/shader-module.js +21 -21
- package/dist/esm/data-filter/shader-module.js.map +1 -1
- package/dist/esm/fill-style/fill-style.js +18 -13
- package/dist/esm/fill-style/fill-style.js.map +1 -1
- package/dist/esm/fill-style/shaders.glsl.js +6 -2
- package/dist/esm/fill-style/shaders.glsl.js.map +1 -1
- package/dist/esm/fp64/fp64.js +4 -2
- package/dist/esm/fp64/fp64.js.map +1 -1
- package/dist/esm/fp64/project64.glsl.js +1 -1
- package/dist/esm/fp64/project64.glsl.js.map +1 -1
- package/dist/esm/fp64/project64.js +2 -3
- package/dist/esm/fp64/project64.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mask/mask.js +7 -4
- package/dist/esm/mask/mask.js.map +1 -1
- package/dist/esm/mask/shader-module.js +6 -6
- package/dist/esm/mask/shader-module.js.map +1 -1
- package/dist/esm/path-style/path-style.js +6 -5
- package/dist/esm/path-style/path-style.js.map +1 -1
- package/dist/esm/path-style/shaders.glsl.js +1 -1
- package/dist/esm/path-style/shaders.glsl.js.map +1 -1
- package/dist.min.js +1 -1
- package/package.json +5 -3
- package/src/brushing/{brushing.js → brushing.ts} +45 -17
- package/src/brushing/{shader-module.js → shader-module.ts} +13 -3
- package/src/clip/{clip.js → clip.ts} +26 -9
- package/src/data-filter/{aggregator.js → aggregator.ts} +12 -8
- package/src/data-filter/{data-filter.js → data-filter.ts} +90 -13
- package/src/data-filter/{shader-module.js → shader-module.ts} +36 -27
- package/src/fill-style/{fill-style.js → fill-style.ts} +83 -19
- package/src/fill-style/{shaders.glsl.js → shaders.glsl.ts} +24 -4
- package/src/fp64/{fp64.js → fp64.ts} +6 -3
- package/src/fp64/{project64.glsl.js → project64.glsl.ts} +0 -0
- package/src/fp64/{project64.js → project64.ts} +16 -5
- package/src/index.ts +8 -0
- package/src/mask/{mask.js → mask.ts} +25 -8
- package/src/mask/shader-module.ts +86 -0
- package/src/path-style/{path-style.js → path-style.ts} +65 -14
- package/src/path-style/{shaders.glsl.js → shaders.glsl.ts} +0 -0
- package/typed/brushing/brushing.d.ts +37 -16
- package/typed/brushing/brushing.d.ts.map +1 -1
- package/typed/brushing/brushing.js +83 -0
- package/typed/brushing/shader-module.d.ts +9 -24
- package/typed/brushing/shader-module.d.ts.map +1 -1
- package/typed/brushing/shader-module.js +116 -0
- package/typed/clip/clip.d.ts +27 -10
- package/typed/clip/clip.d.ts.map +1 -1
- package/typed/clip/clip.js +114 -0
- package/typed/data-filter/aggregator.d.ts +10 -9
- package/typed/data-filter/aggregator.d.ts.map +1 -1
- package/typed/data-filter/aggregator.js +98 -0
- package/typed/data-filter/data-filter.d.ts +87 -29
- package/typed/data-filter/data-filter.d.ts.map +1 -1
- package/typed/data-filter/data-filter.js +159 -0
- package/typed/data-filter/shader-module.d.ts +7 -24
- 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 +74 -41
- 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 +8 -33
- package/typed/fill-style/shaders.glsl.d.ts.map +1 -1
- package/typed/fill-style/shaders.glsl.js +95 -0
- package/typed/fp64/fp64.d.ts +6 -6
- package/typed/fp64/fp64.d.ts.map +1 -1
- package/typed/fp64/fp64.js +34 -0
- package/typed/fp64/project64.d.ts +5 -9
- package/typed/fp64/project64.d.ts.map +1 -1
- package/typed/fp64/project64.glsl.d.ts +1 -1
- package/typed/fp64/project64.glsl.d.ts.map +1 -1
- package/typed/fp64/project64.glsl.js +100 -0
- package/typed/fp64/project64.js +50 -0
- package/typed/index.d.ts +6 -0
- package/typed/index.d.ts.map +1 -1
- package/typed/index.js +9 -0
- package/typed/mask/mask.d.ts +21 -9
- package/typed/mask/mask.d.ts.map +1 -1
- package/typed/mask/mask.js +48 -0
- package/typed/mask/shader-module.d.ts +6 -20
- package/typed/mask/shader-module.d.ts.map +1 -1
- package/{src → typed}/mask/shader-module.js +16 -21
- package/typed/path-style/path-style.d.ts +63 -27
- package/typed/path-style/path-style.d.ts.map +1 -1
- package/typed/path-style/path-style.js +107 -0
- package/typed/path-style/shaders.glsl.d.ts +6 -7
- package/typed/path-style/shaders.glsl.d.ts.map +1 -1
- package/typed/path-style/shaders.glsl.js +93 -0
|
@@ -17,6 +17,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
17
17
|
|
|
18
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
19
|
|
|
20
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
21
|
+
|
|
20
22
|
var _core = require("@deck.gl/core");
|
|
21
23
|
|
|
22
24
|
var _shaderModule = _interopRequireDefault(require("./shader-module"));
|
|
@@ -47,7 +49,7 @@ var BrushingExtension = function (_LayerExtension) {
|
|
|
47
49
|
|
|
48
50
|
(0, _createClass2.default)(BrushingExtension, [{
|
|
49
51
|
key: "getShaders",
|
|
50
|
-
value: function getShaders(
|
|
52
|
+
value: function getShaders() {
|
|
51
53
|
return {
|
|
52
54
|
modules: [_shaderModule.default]
|
|
53
55
|
};
|
|
@@ -64,7 +66,7 @@ var BrushingExtension = function (_LayerExtension) {
|
|
|
64
66
|
brushingTargets: {
|
|
65
67
|
size: 2,
|
|
66
68
|
accessor: 'getBrushingTarget',
|
|
67
|
-
update:
|
|
69
|
+
update: this.props.getBrushingTarget ? undefined : extension.useConstantTargetPositions,
|
|
68
70
|
shaderAttributes: {
|
|
69
71
|
brushingTargets: {
|
|
70
72
|
divisor: 0
|
|
@@ -77,24 +79,26 @@ var BrushingExtension = function (_LayerExtension) {
|
|
|
77
79
|
});
|
|
78
80
|
}
|
|
79
81
|
|
|
80
|
-
|
|
81
|
-
_this
|
|
82
|
+
this.state.onMouseMove = function () {
|
|
83
|
+
var _this$getCurrentLayer;
|
|
84
|
+
|
|
85
|
+
(_this$getCurrentLayer = _this.getCurrentLayer()) === null || _this$getCurrentLayer === void 0 ? void 0 : _this$getCurrentLayer.setNeedsRedraw();
|
|
82
86
|
};
|
|
83
87
|
|
|
84
|
-
if (
|
|
85
|
-
|
|
86
|
-
pointermove:
|
|
87
|
-
pointerleave:
|
|
88
|
+
if (context.deck) {
|
|
89
|
+
context.deck.eventManager.on({
|
|
90
|
+
pointermove: this.state.onMouseMove,
|
|
91
|
+
pointerleave: this.state.onMouseMove
|
|
88
92
|
});
|
|
89
93
|
}
|
|
90
94
|
}
|
|
91
95
|
}, {
|
|
92
96
|
key: "finalizeState",
|
|
93
|
-
value: function finalizeState(extension) {
|
|
94
|
-
if (
|
|
95
|
-
|
|
96
|
-
pointermove:
|
|
97
|
-
pointerleave:
|
|
97
|
+
value: function finalizeState(context, extension) {
|
|
98
|
+
if (context.deck) {
|
|
99
|
+
context.deck.eventManager.off({
|
|
100
|
+
pointermove: this.state.onMouseMove,
|
|
101
|
+
pointerleave: this.state.onMouseMove
|
|
98
102
|
});
|
|
99
103
|
}
|
|
100
104
|
}
|
|
@@ -110,6 +114,6 @@ var BrushingExtension = function (_LayerExtension) {
|
|
|
110
114
|
}(_core.LayerExtension);
|
|
111
115
|
|
|
112
116
|
exports.default = BrushingExtension;
|
|
113
|
-
BrushingExtension
|
|
114
|
-
BrushingExtension
|
|
117
|
+
(0, _defineProperty2.default)(BrushingExtension, "defaultProps", defaultProps);
|
|
118
|
+
(0, _defineProperty2.default)(BrushingExtension, "extensionName", 'BrushingExtension');
|
|
115
119
|
//# sourceMappingURL=brushing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/brushing/brushing.
|
|
1
|
+
{"version":3,"sources":["../../../src/brushing/brushing.ts"],"names":["defaultProps","getBrushingTarget","type","value","brushingTarget","brushingEnabled","brushingRadius","BrushingExtension","modules","shaderModule","context","extension","attributeManager","getAttributeManager","add","brushingTargets","size","accessor","update","props","undefined","useConstantTargetPositions","shaderAttributes","divisor","instanceBrushingTargets","state","onMouseMove","getCurrentLayer","setNeedsRedraw","deck","eventManager","on","pointermove","pointerleave","off","attribute","constant","Float32Array","LayerExtension"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAoBA;;AACA;;;;;;AAIA,IAAMA,YAAY,GAAG;AACnBC,EAAAA,iBAAiB,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAE,CAAC,CAAD,EAAI,CAAJ;AAA1B,GADA;AAGnBC,EAAAA,cAAc,EAAE,QAHG;AAInBC,EAAAA,eAAe,EAAE,IAJE;AAKnBC,EAAAA,cAAc,EAAE;AALG,CAArB;;IA8BqBC,iB;;;;;;;;;;;;WAInB,sBAAkB;AAChB,aAAO;AACLC,QAAAA,OAAO,EAAE,CAACC,qBAAD;AADJ,OAAP;AAGD;;;WAED,yBAAqDC,OAArD,EAA4EC,SAA5E,EAA6F;AAAA;;AAC3F,UAAMC,gBAAgB,GAAG,KAAKC,mBAAL,EAAzB;;AACA,UAAID,gBAAJ,EAAsB;AACpBA,QAAAA,gBAAgB,CAACE,GAAjB,CAAqB;AACnBC,UAAAA,eAAe,EAAE;AACfC,YAAAA,IAAI,EAAE,CADS;AAEfC,YAAAA,QAAQ,EAAE,mBAFK;AAOfC,YAAAA,MAAM,EAAE,KAAKC,KAAL,CAAWlB,iBAAX,GAA+BmB,SAA/B,GAA2CT,SAAS,CAACU,0BAP9C;AAQfC,YAAAA,gBAAgB,EAAE;AAChBP,cAAAA,eAAe,EAAE;AACfQ,gBAAAA,OAAO,EAAE;AADM,eADD;AAIhBC,cAAAA,uBAAuB,EAAE;AACvBD,gBAAAA,OAAO,EAAE;AADc;AAJT;AARH;AADE,SAArB;AAmBD;;AAID,WAAKE,KAAL,CAAWC,WAAX,GAAyB,YAAM;AAAA;;AAC7B,iCAAA,KAAI,CAACC,eAAL,kFAAwBC,cAAxB;AACD,OAFD;;AAGA,UAAIlB,OAAO,CAACmB,IAAZ,EAAkB;AAEhBnB,QAAAA,OAAO,CAACmB,IAAR,CAAaC,YAAb,CAA0BC,EAA1B,CAA6B;AAC3BC,UAAAA,WAAW,EAAE,KAAKP,KAAL,CAAWC,WADG;AAE3BO,UAAAA,YAAY,EAAE,KAAKR,KAAL,CAAWC;AAFE,SAA7B;AAID;AACF;;;WAED,uBAAmDhB,OAAnD,EAA0EC,SAA1E,EAA2F;AAEzF,UAAID,OAAO,CAACmB,IAAZ,EAAkB;AAEhBnB,QAAAA,OAAO,CAACmB,IAAR,CAAaC,YAAb,CAA0BI,GAA1B,CAA8B;AAC5BF,UAAAA,WAAW,EAAE,KAAKP,KAAL,CAAWC,WADI;AAE5BO,UAAAA,YAAY,EAAE,KAAKR,KAAL,CAAWC;AAFG,SAA9B;AAID;AACF;;;WAED,oCAA2BS,SAA3B,EAAsC;AACpCA,MAAAA,SAAS,CAACC,QAAV,GAAqB,IAArB;AACAD,MAAAA,SAAS,CAAChC,KAAV,GAAkB,IAAIkC,YAAJ,CAAiB,CAAjB,CAAlB;AACA;AACD;;;EA/D4CC,oB;;;8BAA1B/B,iB,kBACGP,Y;8BADHO,iB,mBAEI,mB","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {LayerExtension} from '@deck.gl/core';\nimport shaderModule from './shader-module';\n\nimport type {Layer, LayerContext, Accessor} from '@deck.gl/core';\n\nconst defaultProps = {\n getBrushingTarget: {type: 'accessor', value: [0, 0]},\n\n brushingTarget: 'source',\n brushingEnabled: true,\n brushingRadius: 10000\n};\n\nexport type BrushingExtensionProps<DataT = any> = {\n /**\n * Called to retrieve an arbitrary position for each object that it will be filtered by.\n * Only effective if `brushingTarget` is set to `custom`.\n */\n getBrushingTarget?: Accessor<DataT, [number, number]>;\n /**\n * Enable/disable brushing. If brushing is disabled, all objects are rendered.\n * @default true\n */\n brushingEnabled?: boolean;\n /**\n * The position used to filter each object by.\n */\n brushingTarget?: 'source' | 'target' | 'source_target' | 'custom';\n /** The brushing radius centered at the pointer, in meters. If a data object is within this circle, it is rendered; otherwise it is hidden.\n * @default 10000\n */\n brushingRadius?: number;\n};\n\n/** Adds GPU-based data brushing functionalities to layers. It allows the layer to show/hide objects based on the current pointer position. */\nexport default class BrushingExtension extends LayerExtension {\n static defaultProps = defaultProps;\n static extensionName = 'BrushingExtension';\n\n getShaders(): any {\n return {\n modules: [shaderModule]\n };\n }\n\n initializeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this) {\n const attributeManager = this.getAttributeManager();\n if (attributeManager) {\n attributeManager.add({\n brushingTargets: {\n size: 2,\n accessor: 'getBrushingTarget',\n // Hack: extension's defaultProps is not merged with the layer's defaultProps,\n // So we can't use the standard accessor when the prop is undefined\n // TODO - move to an option\n // eslint-disable-next-line @typescript-eslint/unbound-method\n update: this.props.getBrushingTarget ? undefined : extension.useConstantTargetPositions,\n shaderAttributes: {\n brushingTargets: {\n divisor: 0\n },\n instanceBrushingTargets: {\n divisor: 1\n }\n }\n }\n });\n }\n\n // Trigger redraw when mouse moves\n // TODO - expose this in a better way\n this.state.onMouseMove = () => {\n this.getCurrentLayer()?.setNeedsRedraw();\n };\n if (context.deck) {\n // @ts-expect-error (2446) accessing protected property\n context.deck.eventManager.on({\n pointermove: this.state.onMouseMove,\n pointerleave: this.state.onMouseMove\n });\n }\n }\n\n finalizeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this) {\n // Remove event listeners\n if (context.deck) {\n // @ts-expect-error (2446) accessing protected property\n context.deck.eventManager.off({\n pointermove: this.state.onMouseMove,\n pointerleave: this.state.onMouseMove\n });\n }\n }\n\n useConstantTargetPositions(attribute) {\n attribute.constant = true;\n attribute.value = new Float32Array(2);\n return;\n }\n}\n"],"file":"brushing.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/brushing/shader-module.
|
|
1
|
+
{"version":3,"sources":["../../../src/brushing/shader-module.ts"],"names":["vs","fs","TARGET","source","target","custom","source_target","inject","name","dependencies","project","getUniforms","opts","brushingEnabled","brushingRadius","brushingTarget","mousePosition","viewport","brushing_enabled","Boolean","containsPixel","brushing_radius","brushing_target","brushing_mousePos","unproject","x","y"],"mappings":";;;;;;;AAoBA;;AAWA,IAAMA,EAAE,07BAAR;AAkCA,IAAMC,EAAE,8EAAR;AAKA,IAAMC,MAAM,GAAG;AACbC,EAAAA,MAAM,EAAE,CADK;AAEbC,EAAAA,MAAM,EAAE,CAFK;AAGbC,EAAAA,MAAM,EAAE,CAHK;AAIbC,EAAAA,aAAa,EAAE;AAJF,CAAf;AAOA,IAAMC,MAAM,GAAG;AACb,6zBADa;AA2Bb;AA3Ba,CAAf;eAkCe;AACbC,EAAAA,IAAI,EAAE,UADO;AAEbC,EAAAA,YAAY,EAAE,CAACC,aAAD,CAFD;AAGbV,EAAAA,EAAE,EAAFA,EAHa;AAIbC,EAAAA,EAAE,EAAFA,EAJa;AAKbM,EAAAA,MAAM,EAANA,MALa;AAMbI,EAAAA,WAAW,EAAE,qBAACC,IAAD,EAA6D;AACxE,QAAI,CAACA,IAAD,IAAS,EAAE,cAAcA,IAAhB,CAAb,EAAoC;AAClC,aAAO,EAAP;AACD;;AACD,gCAMIA,IANJ,CACEC,eADF;AAAA,QACEA,eADF,sCACoB,IADpB;AAAA,+BAMID,IANJ,CAEEE,cAFF;AAAA,QAEEA,cAFF,qCAEmB,KAFnB;AAAA,+BAMIF,IANJ,CAGEG,cAHF;AAAA,QAGEA,cAHF,qCAGmB,QAHnB;AAAA,QAIEC,aAJF,GAMIJ,IANJ,CAIEI,aAJF;AAAA,QAKEC,QALF,GAMIL,IANJ,CAKEK,QALF;AAOA,WAAO;AACLC,MAAAA,gBAAgB,EAAEC,OAAO,CACvBN,eAAe,IAAIG,aAAnB,IAAoCC,QAAQ,CAACG,aAAT,CAAuBJ,aAAvB,CADb,CADpB;AAILK,MAAAA,eAAe,EAAEP,cAJZ;AAKLQ,MAAAA,eAAe,EAAEpB,MAAM,CAACa,cAAD,CAAN,IAA0B,CALtC;AAMLQ,MAAAA,iBAAiB,EAAEP,aAAa,GAC5BC,QAAQ,CAACO,SAAT,CAAmB,CAACR,aAAa,CAACS,CAAd,GAAkBR,QAAQ,CAACQ,CAA5B,EAA+BT,aAAa,CAACU,CAAd,GAAkBT,QAAQ,CAACS,CAA1D,CAAnB,CAD4B,GAE5B,CAAC,CAAD,EAAI,CAAJ;AARC,KAAP;AAUD;AA3BY,C","sourcesContent":["// Copyright (c) 2015-2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n/* eslint-disable camelcase */\nimport {project} from '@deck.gl/core';\nimport type {Viewport, _ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {BrushingExtensionProps} from './brushing';\n\ntype BrushingModuleSettings = {\n // From layer context\n viewport: Viewport;\n mousePosition?: {x: number; y: number};\n} & BrushingExtensionProps;\n\nconst vs = `\n uniform bool brushing_enabled;\n uniform int brushing_target;\n uniform vec2 brushing_mousePos;\n uniform float brushing_radius;\n\n #ifdef NON_INSTANCED_MODEL\n attribute vec2 brushingTargets;\n #else\n attribute vec2 instanceBrushingTargets;\n #endif\n\n varying float brushing_isVisible;\n\n bool brushing_isPointInRange(vec2 position) {\n if (!brushing_enabled) {\n return true;\n }\n vec2 source_commonspace = project_position(position);\n vec2 target_commonspace = project_position(brushing_mousePos);\n float distance = length((target_commonspace - source_commonspace) / project_uCommonUnitsPerMeter.xy);\n\n return distance <= brushing_radius;\n }\n\n bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {\n return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);\n }\n\n void brushing_setVisible(bool visible) {\n brushing_isVisible = float(visible);\n }\n`;\n\nconst fs = `\n uniform bool brushing_enabled;\n varying float brushing_isVisible;\n`;\n\nconst TARGET = {\n source: 0,\n target: 1,\n custom: 2,\n source_target: 3\n};\n\nconst inject = {\n 'vs:DECKGL_FILTER_GL_POSITION': `\n vec2 brushingTarget;\n vec2 brushingSource;\n if (brushing_target == 3) {\n brushingTarget = geometry.worldPositionAlt.xy;\n brushingSource = geometry.worldPosition.xy;\n } else if (brushing_target == 0) {\n brushingTarget = geometry.worldPosition.xy;\n } else if (brushing_target == 1) {\n brushingTarget = geometry.worldPositionAlt.xy;\n } else {\n #ifdef NON_INSTANCED_MODEL\n brushingTarget = brushingTargets;\n #else\n brushingTarget = instanceBrushingTargets;\n #endif\n }\n bool visible;\n if (brushing_target == 3) {\n visible = brushing_arePointsInRange(brushingSource, brushingTarget);\n } else {\n visible = brushing_isPointInRange(brushingTarget);\n }\n brushing_setVisible(visible);\n `,\n\n 'fs:DECKGL_FILTER_COLOR': `\n if (brushing_enabled && brushing_isVisible < 0.5) {\n discard;\n }\n `\n};\n\nexport default {\n name: 'brushing',\n dependencies: [project],\n vs,\n fs,\n inject,\n getUniforms: (opts?: BrushingModuleSettings | {}): Record<string, any> => {\n if (!opts || !('viewport' in opts)) {\n return {};\n }\n const {\n brushingEnabled = true,\n brushingRadius = 10000,\n brushingTarget = 'source',\n mousePosition,\n viewport\n } = opts;\n return {\n brushing_enabled: Boolean(\n brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)\n ),\n brushing_radius: brushingRadius,\n brushing_target: TARGET[brushingTarget] || 0,\n brushing_mousePos: mousePosition\n ? viewport.unproject([mousePosition.x - viewport.x, mousePosition.y - viewport.y])\n : [0, 0]\n };\n }\n} as ShaderModule<BrushingModuleSettings>;\n"],"file":"shader-module.js"}
|
package/dist/es5/clip/clip.js
CHANGED
|
@@ -17,6 +17,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
17
17
|
|
|
18
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
19
|
|
|
20
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
21
|
+
|
|
20
22
|
var _core = require("@deck.gl/core");
|
|
21
23
|
|
|
22
24
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
@@ -96,6 +98,6 @@ var ClipExtension = function (_LayerExtension) {
|
|
|
96
98
|
}(_core.LayerExtension);
|
|
97
99
|
|
|
98
100
|
exports.default = ClipExtension;
|
|
99
|
-
ClipExtension
|
|
100
|
-
ClipExtension
|
|
101
|
+
(0, _defineProperty2.default)(ClipExtension, "defaultProps", defaultProps);
|
|
102
|
+
(0, _defineProperty2.default)(ClipExtension, "extensionName", 'ClipExtension');
|
|
101
103
|
//# sourceMappingURL=clip.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/clip/clip.
|
|
1
|
+
{"version":3,"sources":["../../../src/clip/clip.ts"],"names":["defaultProps","clipBounds","shaderFunction","shaderModuleVs","name","vs","injectionVs","shaderModuleFs","fs","injectionFs","ClipExtension","clipByInstance","getAttributeManager","attributes","props","state","modules","inject","uniforms","clip_bounds","corner0","projectPosition","corner1","Math","min","max","LayerExtension"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAoBA;;;;;;AAIA,IAAMA,YAAY,GAAG;AACnBC,EAAAA,UAAU,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV;AADO,CAArB;AAgBA,IAAMC,cAAc,oNAApB;AAYA,IAAMC,cAA4B,GAAG;AACnCC,EAAAA,IAAI,EAAE,SAD6B;AAEnCC,EAAAA,EAAE,EAAEH;AAF+B,CAArC;AAKA,IAAMI,WAAW,GAAG;AAClB,iDADkB;AAIlB,6GAJkB;AAOlB,iDAPkB;AAUlB;AAVkB,CAApB;AAmBA,IAAMC,cAA4B,GAAG;AACnCH,EAAAA,IAAI,EAAE,SAD6B;AAEnCI,EAAAA,EAAE,EAAEN;AAF+B,CAArC;AAKA,IAAMO,WAAW,GAAG;AAClB,qDADkB;AAIlB,qFAJkB;AAOlB,qDAPkB;AAUlB;AAVkB,CAApB;;IAgBqBC,a;;;;;;;;;;;;WAInB,sBAA4C;AAM1C,UAAIC,cAAc,IAAG,uBAAuB,KAAKC,mBAAL,GAA2BC,UAArD,CAAlB;;AAEA,UAAI,oBAAoB,KAAKC,KAA7B,EAAoC;AAClCH,QAAAA,cAAc,GAAG,KAAKG,KAAL,CAAWH,cAA5B;AACD;;AACD,WAAKI,KAAL,CAAWJ,cAAX,GAA4BA,cAA5B;AAEA,aAAOA,cAAc,GACjB;AACEK,QAAAA,OAAO,EAAE,CAACb,cAAD,CADX;AAEEc,QAAAA,MAAM,EAAEX;AAFV,OADiB,GAKjB;AACEU,QAAAA,OAAO,EAAE,CAACT,cAAD,CADX;AAEEU,QAAAA,MAAM,EAAER;AAFV,OALJ;AASD;;;WAGD,oBAA6D;AAAA,UAAtBS,QAAsB,QAAtBA,QAAsB;AAC3D,kCAA+C,KAAKJ,KAApD,CAAOb,UAAP;AAAA,UAAOA,UAAP,sCAAoBD,YAAY,CAACC,UAAjC;;AACA,UAAI,KAAKc,KAAL,CAAWJ,cAAf,EAA+B;AAC7BO,QAAAA,QAAQ,CAACC,WAAT,GAAuBlB,UAAvB;AACD,OAFD,MAEO;AACL,YAAMmB,OAAO,GAAG,KAAKC,eAAL,CAAqB,CAACpB,UAAU,CAAC,CAAD,CAAX,EAAgBA,UAAU,CAAC,CAAD,CAA1B,EAA+B,CAA/B,CAArB,CAAhB;AACA,YAAMqB,OAAO,GAAG,KAAKD,eAAL,CAAqB,CAACpB,UAAU,CAAC,CAAD,CAAX,EAAgBA,UAAU,CAAC,CAAD,CAA1B,EAA+B,CAA/B,CAArB,CAAhB;AAEAiB,QAAAA,QAAQ,CAACC,WAAT,GAAuB,CACrBI,IAAI,CAACC,GAAL,CAASJ,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CADqB,EAErBC,IAAI,CAACC,GAAL,CAASJ,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAFqB,EAGrBC,IAAI,CAACE,GAAL,CAASL,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAHqB,EAIrBC,IAAI,CAACE,GAAL,CAASL,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAJqB,CAAvB;AAMD;AACF;;;EA5CwCI,oB;;;8BAAtBhB,a,kBACQV,Y;8BADRU,a,mBAEI,e","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {LayerExtension, _ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Layer} from '@deck.gl/core';\n\nconst defaultProps = {\n clipBounds: [0, 0, 1, 1]\n};\n\nexport type ClipExtensionProps = {\n /** Rectangular bounds to be used for clipping the rendered region, in `[left, bottom, right, top]`.\n * @default [0, 0, 1, 1]\n */\n clipBounds?: [number, number, number, number];\n /**\n * Controls whether an object is clipped by its anchor (e.g. icon, point) or by its geometry (e.g. path, polygon).\n * If not specified, it is automatically deduced from the layer.\n */\n clipByInstance?: boolean;\n};\n\nconst shaderFunction = `\nuniform vec4 clip_bounds;\n\nbool clip_isInBounds(vec2 position) {\n return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.x < clip_bounds[2] && position.y < clip_bounds[3];\n}\n`;\n\n/*\n * The vertex-shader version clips geometries by their anchor position\n * e.g. ScatterplotLayer - show if the center of a circle is within bounds\n */\nconst shaderModuleVs: ShaderModule = {\n name: 'clip-vs',\n vs: shaderFunction\n};\n\nconst injectionVs = {\n 'vs:#decl': `\nvarying float clip_isVisible;\n`,\n 'vs:DECKGL_FILTER_GL_POSITION': `\n clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));\n`,\n 'fs:#decl': `\nvarying float clip_isVisible;\n`,\n 'fs:DECKGL_FILTER_COLOR': `\n if (clip_isVisible < 0.5) discard;\n`\n};\n\n/*\n * The fragment-shader version clips pixels at the bounds\n * e.g. PolygonLayer - show the part of the polygon that intersect with the bounds\n */\nconst shaderModuleFs: ShaderModule = {\n name: 'clip-fs',\n fs: shaderFunction\n};\n\nconst injectionFs = {\n 'vs:#decl': `\nvarying vec2 clip_commonPosition;\n`,\n 'vs:DECKGL_FILTER_GL_POSITION': `\n clip_commonPosition = geometry.position.xy;\n`,\n 'fs:#decl': `\nvarying vec2 clip_commonPosition;\n`,\n 'fs:DECKGL_FILTER_COLOR': `\n if (!clip_isInBounds(clip_commonPosition)) discard;\n`\n};\n\n/** Adds support for clipping rendered layers by rectangular bounds. */\nexport default class ClipExtension extends LayerExtension {\n static defaultProps: any = defaultProps;\n static extensionName = 'ClipExtension';\n\n getShaders(this: Layer<ClipExtensionProps>) {\n // If `clipByInstance: true`, the entire object is shown/hidden based on its anchor position (done by vertex shader)\n // Otherwise, the object is trimmed by the clip bounds (done by fragment shader)\n\n // Default behavior: consider a layer instanced if it has attribute `instancePositions`\n // @ts-expect-error attributeManager is always defined for primitive layers\n let clipByInstance = 'instancePositions' in this.getAttributeManager().attributes;\n // Users can override by setting the `clipByInstance` prop\n if ('clipByInstance' in this.props) {\n clipByInstance = this.props.clipByInstance as boolean;\n }\n this.state.clipByInstance = clipByInstance;\n\n return clipByInstance\n ? {\n modules: [shaderModuleVs],\n inject: injectionVs\n }\n : {\n modules: [shaderModuleFs],\n inject: injectionFs\n };\n }\n\n /* eslint-disable camelcase */\n draw(this: Layer<ClipExtensionProps>, {uniforms}: any): void {\n const {clipBounds = defaultProps.clipBounds} = this.props;\n if (this.state.clipByInstance) {\n uniforms.clip_bounds = clipBounds;\n } else {\n const corner0 = this.projectPosition([clipBounds[0], clipBounds[1], 0]);\n const corner1 = this.projectPosition([clipBounds[2], clipBounds[3], 0]);\n\n uniforms.clip_bounds = [\n Math.min(corner0[0], corner1[0]),\n Math.min(corner0[1], corner1[1]),\n Math.max(corner0[0], corner1[0]),\n Math.max(corner0[1], corner1[1])\n ];\n }\n }\n}\n"],"file":"clip.js"}
|
|
@@ -22,7 +22,7 @@ var AGGREGATE_VS = "#define SHADER_NAME data-filter-vertex-shader\n\n#ifdef FLOA
|
|
|
22
22
|
var AGGREGATE_FS = "#define SHADER_NAME data-filter-fragment-shader\nprecision highp float;\n\nvarying vec4 vColor;\n\nvoid main() {\n if (dataFilter_value < 0.5) {\n discard;\n }\n gl_FragColor = vColor;\n}\n";
|
|
23
23
|
|
|
24
24
|
function supportsFloatTarget(gl) {
|
|
25
|
-
return gl.getExtension('EXT_float_blend') && (gl.getExtension('EXT_color_buffer_float') || gl.getExtension('WEBGL_color_buffer_float'));
|
|
25
|
+
return Boolean(gl.getExtension('EXT_float_blend') && (gl.getExtension('EXT_color_buffer_float') || gl.getExtension('WEBGL_color_buffer_float')));
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
function getFramebuffer(gl, useFloatTarget) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/data-filter/aggregator.
|
|
1
|
+
{"version":3,"sources":["../../../src/data-filter/aggregator.ts"],"names":["AGGREGATE_VS","AGGREGATE_FS","supportsFloatTarget","gl","Boolean","getExtension","getFramebuffer","useFloatTarget","Framebuffer","width","height","attachments","Texture2D","format","type","mipmaps","depth","getModel","shaderOptions","defines","NON_INSTANCED_MODEL","FLOAT_TARGET","Model","id","vertexCount","isInstanced","drawMode","vs","fs","parameters","blend","blendFunc","blendEquation","depthTest"],"mappings":";;;;;;;;;;;;;;AAAA;;;;;;AAGA,IAAMA,YAAY,89BAAlB;AAiCA,IAAMC,YAAY,wMAAlB;;AAcO,SAASC,mBAAT,CAA6BC,EAA7B,EAAiE;AAEtE,SAAOC,OAAO,CACZD,EAAE,CAACE,YAAH,CAAgB,iBAAhB,MAEGF,EAAE,CAACE,YAAH,CAAgB,wBAAhB,KAECF,EAAE,CAACE,YAAH,CAAgB,0BAAhB,CAJJ,CADY,CAAd;AAOD;;AAGM,SAASC,cAAT,CAAwBH,EAAxB,EAAmDI,cAAnD,EAAyF;AAC9F,MAAIA,cAAJ,EAAoB;AAClB,WAAO,IAAIC,iBAAJ,CAAgBL,EAAhB,EAAoB;AACzBM,MAAAA,KAAK,EAAE,CADkB;AAEzBC,MAAAA,MAAM,EAAE,CAFiB;AAGzBC,MAAAA,WAAW,2CACe,IAAIC,eAAJ,CAAcT,EAAd,EAAkB;AACxCU,QAAAA,MAAM,EAAE,oBAASV,EAAT,gBADgC;AAExCW,QAAAA,IAAI,MAFoC;AAGxCC,QAAAA,OAAO,EAAE;AAH+B,OAAlB,CADf;AAHc,KAApB,CAAP;AAWD;;AACD,SAAO,IAAIP,iBAAJ,CAAgBL,EAAhB,EAAoB;AACzBM,IAAAA,KAAK,EAAE,GADkB;AAEzBC,IAAAA,MAAM,EAAE,EAFiB;AAGzBM,IAAAA,KAAK,EAAE;AAHkB,GAApB,CAAP;AAKD;;AAGM,SAASC,QAAT,CACLd,EADK,EAELe,aAFK,EAGLX,cAHK,EAIE;AACPW,EAAAA,aAAa,CAACC,OAAd,CAAsBC,mBAAtB,GAA4C,CAA5C;;AACA,MAAIb,cAAJ,EAAoB;AAClBW,IAAAA,aAAa,CAACC,OAAd,CAAsBE,YAAtB,GAAqC,CAArC;AACD;;AAED,SAAO,IAAIC,WAAJ,CAAUnB,EAAV;AACLoB,IAAAA,EAAE,EAAE,+BADC;AAELC,IAAAA,WAAW,EAAE,CAFR;AAGLC,IAAAA,WAAW,EAAE,KAHR;AAILC,IAAAA,QAAQ,GAJH;AAKLC,IAAAA,EAAE,EAAE3B,YALC;AAML4B,IAAAA,EAAE,EAAE3B;AANC,KAOFiB,aAPE,EAAP;AASD;;AAEM,IAAMW,UAAU,GAAG;AACxBC,EAAAA,KAAK,EAAE,IADiB;AAExBC,EAAAA,SAAS,EAAE,YAFa;AAGxBC,EAAAA,aAAa,EAAE,cAHS;AAIxBC,EAAAA,SAAS,EAAE;AAJa,CAAnB","sourcesContent":["import {Model, Texture2D, Framebuffer, isWebGL2} from '@luma.gl/core';\nimport GL from '@luma.gl/constants';\n\nconst AGGREGATE_VS = `\\\n#define SHADER_NAME data-filter-vertex-shader\n\n#ifdef FLOAT_TARGET\n attribute float filterIndices;\n attribute float filterPrevIndices;\n#else\n attribute vec2 filterIndices;\n attribute vec2 filterPrevIndices;\n#endif\n\nvarying vec4 vColor;\nconst float component = 1.0 / 255.0;\n\nvoid main() {\n #ifdef FLOAT_TARGET\n dataFilter_value *= float(filterIndices != filterPrevIndices);\n gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n vColor = vec4(0.0, 0.0, 0.0, 1.0);\n #else\n // Float texture is not supported: pack result into 4 channels x 256 px x 64px\n dataFilter_value *= float(filterIndices.x != filterPrevIndices.x);\n float col = filterIndices.x;\n float row = filterIndices.y * 4.0;\n float channel = floor(row);\n row = fract(row);\n vColor = component * vec4(bvec4(channel == 0.0, channel == 1.0, channel == 2.0, channel == 3.0));\n gl_Position = vec4(col * 2.0 - 1.0, row * 2.0 - 1.0, 0.0, 1.0);\n #endif\n gl_PointSize = 1.0;\n}\n`;\n\nconst AGGREGATE_FS = `\\\n#define SHADER_NAME data-filter-fragment-shader\nprecision highp float;\n\nvarying vec4 vColor;\n\nvoid main() {\n if (dataFilter_value < 0.5) {\n discard;\n }\n gl_FragColor = vColor;\n}\n`;\n\nexport function supportsFloatTarget(gl: WebGLRenderingContext): boolean {\n // https://developer.mozilla.org/en-US/docs/Web/API/WebGL_API/WebGL_best_practices#Support_for_float_textures_doesnt_mean_you_can_render_into_them!\n return Boolean(\n gl.getExtension('EXT_float_blend') &&\n // WebGL 2\n (gl.getExtension('EXT_color_buffer_float') ||\n // WebGL 1\n gl.getExtension('WEBGL_color_buffer_float'))\n );\n}\n\n// A 1x1 framebuffer object that encodes the total count of filtered items\nexport function getFramebuffer(gl: WebGLRenderingContext, useFloatTarget: boolean): Framebuffer {\n if (useFloatTarget) {\n return new Framebuffer(gl, {\n width: 1,\n height: 1,\n attachments: {\n [GL.COLOR_ATTACHMENT0]: new Texture2D(gl, {\n format: isWebGL2(gl) ? GL.RGBA32F : GL.RGBA,\n type: GL.FLOAT,\n mipmaps: false\n })\n }\n });\n }\n return new Framebuffer(gl, {\n width: 256,\n height: 64,\n depth: false\n });\n}\n\n// Increments the counter based on dataFilter_value\nexport function getModel(\n gl: WebGLRenderingContext,\n shaderOptions: any,\n useFloatTarget: boolean\n): Model {\n shaderOptions.defines.NON_INSTANCED_MODEL = 1;\n if (useFloatTarget) {\n shaderOptions.defines.FLOAT_TARGET = 1;\n }\n\n return new Model(gl, {\n id: 'data-filter-aggregation-model',\n vertexCount: 1,\n isInstanced: false,\n drawMode: GL.POINTS,\n vs: AGGREGATE_VS,\n fs: AGGREGATE_FS,\n ...shaderOptions\n });\n}\n\nexport const parameters = {\n blend: true,\n blendFunc: [GL.ONE, GL.ONE, GL.ONE, GL.ONE],\n blendEquation: [GL.FUNC_ADD, GL.FUNC_ADD],\n depthTest: false\n};\n"],"file":"aggregator.js"}
|
|
@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
9
9
|
});
|
|
10
10
|
exports.default = void 0;
|
|
11
11
|
|
|
12
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
13
|
-
|
|
14
12
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
15
13
|
|
|
16
14
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
@@ -21,6 +19,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
21
19
|
|
|
22
20
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
23
21
|
|
|
22
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
23
|
+
|
|
24
24
|
var _core = require("@deck.gl/core");
|
|
25
25
|
|
|
26
26
|
var _shaderModule = require("./shader-module");
|
|
@@ -154,7 +154,7 @@ var DataFilterExtension = function (_LayerExtension) {
|
|
|
154
154
|
}
|
|
155
155
|
});
|
|
156
156
|
var filterFBO = aggregator.getFramebuffer(gl, useFloatTarget);
|
|
157
|
-
var filterModel = aggregator.getModel(gl, extension.getShaders(extension), useFloatTarget);
|
|
157
|
+
var filterModel = aggregator.getModel(gl, extension.getShaders.call(this, extension), useFloatTarget);
|
|
158
158
|
this.setState({
|
|
159
159
|
filterFBO: filterFBO,
|
|
160
160
|
filterModel: filterModel
|
|
@@ -188,10 +188,10 @@ var DataFilterExtension = function (_LayerExtension) {
|
|
|
188
188
|
var onFilteredItemsChange = this.props.onFilteredItemsChange;
|
|
189
189
|
|
|
190
190
|
if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {
|
|
191
|
-
var
|
|
192
|
-
|
|
193
|
-
filterValues =
|
|
194
|
-
filterIndices =
|
|
191
|
+
var _ref4 = this.getAttributeManager(),
|
|
192
|
+
_ref4$attributes = _ref4.attributes,
|
|
193
|
+
filterValues = _ref4$attributes.filterValues,
|
|
194
|
+
filterIndices = _ref4$attributes.filterIndices;
|
|
195
195
|
|
|
196
196
|
filterModel.setVertexCount(this.getNumInstances());
|
|
197
197
|
var gl = this.context.gl;
|
|
@@ -237,6 +237,6 @@ var DataFilterExtension = function (_LayerExtension) {
|
|
|
237
237
|
}(_core.LayerExtension);
|
|
238
238
|
|
|
239
239
|
exports.default = DataFilterExtension;
|
|
240
|
-
DataFilterExtension
|
|
241
|
-
DataFilterExtension
|
|
240
|
+
(0, _defineProperty2.default)(DataFilterExtension, "defaultProps", defaultProps);
|
|
241
|
+
(0, _defineProperty2.default)(DataFilterExtension, "extensionName", 'DataFilterExtension');
|
|
242
242
|
//# sourceMappingURL=data-filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/data-filter/data-filter.js"],"names":["defaultProps","getFilterValue","type","value","onFilteredItemsChange","compare","filterEnabled","filterRange","filterSoftRange","filterTransformSize","filterTransformColor","DATA_TYPE_FROM_SIZE","DataFilterExtension","filterSize","fp64","countItems","Error","extension","opts","modules","shaderModule64","shaderModule","defines","DATAFILTER_TYPE","DATAFILTER_DOUBLE","Boolean","context","attributeManager","getAttributeManager","add","filterValues","size","accessor","shaderAttributes","divisor","instanceFilterValues","gl","useFloatTarget","aggregator","supportsFloatTarget","filterIndices","vertexOffset","normalized","object","index","i","__source","Math","floor","filterPrevIndices","filterFBO","getFramebuffer","filterModel","getModel","getShaders","setState","props","oldProps","state","filterNeedsUpdate","attributes","needsUpdate","params","setVertexCount","getNumInstances","framebuffer","color","updateModuleSettings","moduleParameters","setAttributes","getShaderAttributes","draw","parameters","viewport","width","height","count","length","id","delete","LayerExtension","extensionName"],"mappings":"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","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {LayerExtension} from '@deck.gl/core';\nimport {shaderModule, shaderModule64} from './shader-module';\nimport * as aggregator from './aggregator';\nimport {readPixelsToArray, clear} from '@luma.gl/core';\nimport GL from '@luma.gl/constants';\n\nconst defaultProps = {\n getFilterValue: {type: 'accessor', value: 0},\n onFilteredItemsChange: {type: 'function', value: null, compare: false},\n\n filterEnabled: true,\n filterRange: [-1, 1],\n filterSoftRange: null,\n filterTransformSize: true,\n filterTransformColor: true\n};\n\nconst DATA_TYPE_FROM_SIZE = {\n 1: 'float',\n 2: 'vec2',\n 3: 'vec3',\n 4: 'vec4'\n};\n\nexport default class DataFilterExtension extends LayerExtension {\n constructor({filterSize = 1, fp64 = false, countItems = false} = {}) {\n if (!DATA_TYPE_FROM_SIZE[filterSize]) {\n throw new Error('filterSize out of range');\n }\n\n super({filterSize, fp64, countItems});\n }\n\n getShaders(extension) {\n const {filterSize, fp64} = extension.opts;\n\n return {\n modules: [fp64 ? shaderModule64 : shaderModule],\n defines: {\n DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],\n DATAFILTER_DOUBLE: Boolean(fp64)\n }\n };\n }\n\n initializeState(context, extension) {\n const attributeManager = this.getAttributeManager();\n if (attributeManager) {\n attributeManager.add({\n filterValues: {\n size: extension.opts.filterSize,\n type: extension.opts.fp64 ? GL.DOUBLE : GL.FLOAT,\n accessor: 'getFilterValue',\n shaderAttributes: {\n filterValues: {\n divisor: 0\n },\n instanceFilterValues: {\n divisor: 1\n }\n }\n }\n });\n }\n\n const {gl} = this.context;\n if (attributeManager && extension.opts.countItems) {\n const useFloatTarget = aggregator.supportsFloatTarget(gl);\n // This attribute is needed for variable-width data, e.g. Path, SolidPolygon, Text\n // The vertex shader checks if a vertex has the same \"index\" as the previous vertex\n // so that we only write one count cross multiple vertices of the same object\n attributeManager.add({\n filterIndices: {\n size: useFloatTarget ? 1 : 2,\n vertexOffset: 1,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n accessor: (object, {index}) => {\n const i = object && object.__source ? object.__source.index : index;\n return useFloatTarget ? (i + 1) % 255 : [(i + 1) % 255, Math.floor(i / 255) % 255];\n },\n shaderAttributes: {\n filterPrevIndices: {\n vertexOffset: 0\n },\n filterIndices: {\n vertexOffset: 1\n }\n }\n }\n });\n\n const filterFBO = aggregator.getFramebuffer(gl, useFloatTarget);\n const filterModel = aggregator.getModel(gl, extension.getShaders(extension), useFloatTarget);\n this.setState({filterFBO, filterModel});\n }\n }\n\n updateState({props, oldProps}) {\n if (this.state.filterModel) {\n const attributeManager = this.getAttributeManager();\n const filterNeedsUpdate =\n attributeManager.attributes.filterValues.needsUpdate() ||\n props.filterEnabled !== oldProps.filterEnabled ||\n props.filterRange !== oldProps.filterRange ||\n props.filterSoftRange !== oldProps.filterSoftRange;\n if (filterNeedsUpdate) {\n this.setState({filterNeedsUpdate});\n }\n }\n }\n\n draw(params, extension) {\n const {filterFBO, filterModel, filterNeedsUpdate} = this.state;\n const {onFilteredItemsChange} = this.props;\n if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {\n const {\n attributes: {filterValues, filterIndices}\n } = this.getAttributeManager();\n filterModel.setVertexCount(this.getNumInstances());\n\n const {gl} = this.context;\n clear(gl, {framebuffer: filterFBO, color: [0, 0, 0, 0]});\n\n filterModel\n .updateModuleSettings(params.moduleParameters)\n .setAttributes({\n ...filterValues.getShaderAttributes(),\n ...(filterIndices && filterIndices.getShaderAttributes())\n })\n .draw({\n framebuffer: filterFBO,\n parameters: {\n ...aggregator.parameters,\n viewport: [0, 0, filterFBO.width, filterFBO.height]\n }\n });\n const color = readPixelsToArray(filterFBO);\n let count = 0;\n for (let i = 0; i < color.length; i++) {\n count += color[i];\n }\n onFilteredItemsChange({id: this.id, count});\n\n this.state.filterNeedsUpdate = false;\n }\n }\n\n finalizeState() {\n const {filterFBO, filterModel} = this.state;\n if (filterFBO) {\n filterFBO.color.delete();\n filterFBO.delete();\n filterModel.delete();\n }\n }\n}\n\nDataFilterExtension.extensionName = 'DataFilterExtension';\nDataFilterExtension.defaultProps = defaultProps;\n"],"file":"data-filter.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/data-filter/data-filter.ts"],"names":["defaultProps","getFilterValue","type","value","onFilteredItemsChange","compare","filterEnabled","filterRange","filterSoftRange","filterTransformSize","filterTransformColor","DATA_TYPE_FROM_SIZE","DataFilterExtension","filterSize","fp64","countItems","Error","extension","opts","modules","shaderModule64","shaderModule","defines","DATAFILTER_TYPE","DATAFILTER_DOUBLE","Boolean","context","attributeManager","getAttributeManager","add","filterValues","size","accessor","shaderAttributes","divisor","instanceFilterValues","gl","useFloatTarget","aggregator","supportsFloatTarget","filterIndices","vertexOffset","normalized","object","index","i","__source","Math","floor","filterPrevIndices","filterFBO","getFramebuffer","filterModel","getModel","getShaders","call","setState","props","oldProps","state","filterNeedsUpdate","attributes","needsUpdate","params","setVertexCount","getNumInstances","framebuffer","color","updateModuleSettings","moduleParameters","setAttributes","getShaderAttributes","draw","parameters","viewport","width","height","count","length","id","delete","LayerExtension"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAoBA;;AACA;;AACA;;AACA;;;;;;;;;;;;;;AAKA,IAAMA,YAAY,GAAG;AACnBC,EAAAA,cAAc,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAE;AAA1B,GADG;AAEnBC,EAAAA,qBAAqB,EAAE;AAACF,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAE,IAA1B;AAAgCE,IAAAA,OAAO,EAAE;AAAzC,GAFJ;AAInBC,EAAAA,aAAa,EAAE,IAJI;AAKnBC,EAAAA,WAAW,EAAE,CAAC,CAAC,CAAF,EAAK,CAAL,CALM;AAMnBC,EAAAA,eAAe,EAAE,IANE;AAOnBC,EAAAA,mBAAmB,EAAE,IAPF;AAQnBC,EAAAA,oBAAoB,EAAE;AARH,CAArB;AAyEA,IAAMC,mBAAmB,GAAG;AAC1B,KAAG,OADuB;AAE1B,KAAG,MAFuB;AAG1B,KAAG,MAHuB;AAI1B,KAAG;AAJuB,CAA5B;;IAQqBC,mB;;;;;AAInB,iCAI6C;AAAA,mFAAJ,EAAI;AAAA,+BAH3CC,UAG2C;AAAA,QAH3CA,UAG2C,gCAH9B,CAG8B;AAAA,uBAF3CC,IAE2C;AAAA,QAF3CA,IAE2C,wBAFpC,KAEoC;AAAA,+BAD3CC,UAC2C;AAAA,QAD3CA,UAC2C,gCAD9B,KAC8B;;AAAA;;AAC3C,QAAI,CAACJ,mBAAmB,CAACE,UAAD,CAAxB,EAAsC;AACpC,YAAM,IAAIG,KAAJ,CAAU,yBAAV,CAAN;AACD;;AAH0C,6BAKrC;AAACH,MAAAA,UAAU,EAAVA,UAAD;AAAaC,MAAAA,IAAI,EAAJA,IAAb;AAAmBC,MAAAA,UAAU,EAAVA;AAAnB,KALqC;AAM5C;;;;WAED,oBAAkDE,SAAlD,EAAwE;AACtE,4BAA2BA,SAAS,CAACC,IAArC;AAAA,UAAOL,UAAP,mBAAOA,UAAP;AAAA,UAAmBC,IAAnB,mBAAmBA,IAAnB;AAEA,aAAO;AACLK,QAAAA,OAAO,EAAE,CAACL,IAAI,GAAGM,4BAAH,GAAoBC,0BAAzB,CADJ;AAELC,QAAAA,OAAO,EAAE;AACPC,UAAAA,eAAe,EAAEZ,mBAAmB,CAACE,UAAD,CAD7B;AAEPW,UAAAA,iBAAiB,EAAEC,OAAO,CAACX,IAAD;AAFnB;AAFJ,OAAP;AAOD;;;WAED,yBAAuDY,OAAvD,EAA8ET,SAA9E,EAA+F;AAC7F,UAAMU,gBAAgB,GAAG,KAAKC,mBAAL,EAAzB;;AACA,UAAID,gBAAJ,EAAsB;AACpBA,QAAAA,gBAAgB,CAACE,GAAjB,CAAqB;AACnBC,UAAAA,YAAY,EAAE;AACZC,YAAAA,IAAI,EAAEd,SAAS,CAACC,IAAV,CAAeL,UADT;AAEZX,YAAAA,IAAI,EAAEe,SAAS,CAACC,IAAV,CAAeJ,IAAf,cAFM;AAGZkB,YAAAA,QAAQ,EAAE,gBAHE;AAIZC,YAAAA,gBAAgB,EAAE;AAChBH,cAAAA,YAAY,EAAE;AACZI,gBAAAA,OAAO,EAAE;AADG,eADE;AAIhBC,cAAAA,oBAAoB,EAAE;AACpBD,gBAAAA,OAAO,EAAE;AADW;AAJN;AAJN;AADK,SAArB;AAeD;;AAED,UAAOE,EAAP,GAAa,KAAKV,OAAlB,CAAOU,EAAP;;AACA,UAAIT,gBAAgB,IAAIV,SAAS,CAACC,IAAV,CAAeH,UAAvC,EAAmD;AACjD,YAAMsB,cAAc,GAAGC,UAAU,CAACC,mBAAX,CAA+BH,EAA/B,CAAvB;AAIAT,QAAAA,gBAAgB,CAACE,GAAjB,CAAqB;AACnBW,UAAAA,aAAa,EAAE;AACbT,YAAAA,IAAI,EAAEM,cAAc,GAAG,CAAH,GAAO,CADd;AAEbI,YAAAA,YAAY,EAAE,CAFD;AAGbvC,YAAAA,IAAI,MAHS;AAIbwC,YAAAA,UAAU,EAAE,IAJC;AAKbV,YAAAA,QAAQ,EAAE,kBAACW,MAAD,SAAqB;AAAA,kBAAXC,KAAW,SAAXA,KAAW;AAC7B,kBAAMC,CAAC,GAAGF,MAAM,IAAIA,MAAM,CAACG,QAAjB,GAA4BH,MAAM,CAACG,QAAP,CAAgBF,KAA5C,GAAoDA,KAA9D;AACA,qBAAOP,cAAc,GAAG,CAACQ,CAAC,GAAG,CAAL,IAAU,GAAb,GAAmB,CAAC,CAACA,CAAC,GAAG,CAAL,IAAU,GAAX,EAAgBE,IAAI,CAACC,KAAL,CAAWH,CAAC,GAAG,GAAf,IAAsB,GAAtC,CAAxC;AACD,aARY;AASbZ,YAAAA,gBAAgB,EAAE;AAChBgB,cAAAA,iBAAiB,EAAE;AACjBR,gBAAAA,YAAY,EAAE;AADG,eADH;AAIhBD,cAAAA,aAAa,EAAE;AACbC,gBAAAA,YAAY,EAAE;AADD;AAJC;AATL;AADI,SAArB;AAqBA,YAAMS,SAAS,GAAGZ,UAAU,CAACa,cAAX,CAA0Bf,EAA1B,EAA8BC,cAA9B,CAAlB;AACA,YAAMe,WAAW,GAAGd,UAAU,CAACe,QAAX,CAClBjB,EADkB,EAElBnB,SAAS,CAACqC,UAAV,CAAqBC,IAArB,CAA0B,IAA1B,EAAgCtC,SAAhC,CAFkB,EAGlBoB,cAHkB,CAApB;AAKA,aAAKmB,QAAL,CAAc;AAACN,UAAAA,SAAS,EAATA,SAAD;AAAYE,UAAAA,WAAW,EAAXA;AAAZ,SAAd;AACD;AACF;;;WAED,4BAGE;AAAA,UADCK,KACD,SADCA,KACD;AAAA,UADQC,QACR,SADQA,QACR;;AACA,UAAI,KAAKC,KAAL,CAAWP,WAAf,EAA4B;AAC1B,YAAMzB,gBAAgB,GAAG,KAAKC,mBAAL,EAAzB;AACA,YAAMgC,iBAAiB,GAErBjC,gBAAgB,CAAEkC,UAAlB,CAA6B/B,YAA7B,CAA0CgC,WAA1C,MACAL,KAAK,CAACnD,aAAN,KAAwBoD,QAAQ,CAACpD,aADjC,IAEAmD,KAAK,CAAClD,WAAN,KAAsBmD,QAAQ,CAACnD,WAF/B,IAGAkD,KAAK,CAACjD,eAAN,KAA0BkD,QAAQ,CAAClD,eALrC;;AAMA,YAAIoD,iBAAJ,EAAuB;AACrB,eAAKJ,QAAL,CAAc;AAACI,YAAAA,iBAAiB,EAAjBA;AAAD,WAAd;AACD;AACF;AACF;;;WAED,cAA4CG,MAA5C,EAAyD9C,SAAzD,EAA0E;AACxE,wBAAoD,KAAK0C,KAAzD;AAAA,UAAOT,SAAP,eAAOA,SAAP;AAAA,UAAkBE,WAAlB,eAAkBA,WAAlB;AAAA,UAA+BQ,iBAA/B,eAA+BA,iBAA/B;AACA,UAAOxD,qBAAP,GAAgC,KAAKqD,KAArC,CAAOrD,qBAAP;;AACA,UAAIwD,iBAAiB,IAAIxD,qBAArB,IAA8CgD,WAAlD,EAA+D;AAC7D,oBAEI,KAAKxB,mBAAL,EAFJ;AAAA,qCACEiC,UADF;AAAA,YACe/B,YADf,oBACeA,YADf;AAAA,YAC6BU,aAD7B,oBAC6BA,aAD7B;;AAGAY,QAAAA,WAAW,CAACY,cAAZ,CAA2B,KAAKC,eAAL,EAA3B;AAEA,YAAO7B,EAAP,GAAa,KAAKV,OAAlB,CAAOU,EAAP;AACA,0BAAMA,EAAN,EAAU;AAAC8B,UAAAA,WAAW,EAAEhB,SAAd;AAAyBiB,UAAAA,KAAK,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV;AAAhC,SAAV;AAEAf,QAAAA,WAAW,CACRgB,oBADH,CACwBL,MAAM,CAACM,gBAD/B,EAEGC,aAFH,iCAGOxC,YAAY,CAACyC,mBAAb,EAHP,GAIQ/B,aAAa,IAAIA,aAAa,CAAC+B,mBAAd,EAJzB,GAMGC,IANH,CAMQ;AACJN,UAAAA,WAAW,EAAEhB,SADT;AAEJuB,UAAAA,UAAU,kCACLnC,UAAU,CAACmC,UADN;AAERC,YAAAA,QAAQ,EAAE,CAAC,CAAD,EAAI,CAAJ,EAAOxB,SAAS,CAACyB,KAAjB,EAAwBzB,SAAS,CAAC0B,MAAlC;AAFF;AAFN,SANR;AAaA,YAAMT,KAAK,GAAG,8BAAkBjB,SAAlB,CAAd;AACA,YAAI2B,KAAK,GAAG,CAAZ;;AACA,aAAK,IAAIhC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGsB,KAAK,CAACW,MAA1B,EAAkCjC,CAAC,EAAnC,EAAuC;AACrCgC,UAAAA,KAAK,IAAIV,KAAK,CAACtB,CAAD,CAAd;AACD;;AACDzC,QAAAA,qBAAqB,CAAC;AAAC2E,UAAAA,EAAE,EAAE,KAAKA,EAAV;AAAcF,UAAAA,KAAK,EAALA;AAAd,SAAD,CAArB;AAEA,aAAKlB,KAAL,CAAWC,iBAAX,GAA+B,KAA/B;AACD;AACF;;;WAED,yBAAqD;AACnD,yBAAiC,KAAKD,KAAtC;AAAA,UAAOT,SAAP,gBAAOA,SAAP;AAAA,UAAkBE,WAAlB,gBAAkBA,WAAlB;;AACA,UAAIF,SAAJ,EAAe;AACbA,QAAAA,SAAS,CAACiB,KAAV,CAAgBa,MAAhB;AACA9B,QAAAA,SAAS,CAAC8B,MAAV;AACA5B,QAAAA,WAAW,CAAC4B,MAAZ;AACD;AACF;;;EAlJ8CC,oB;;;8BAA5BrE,mB,kBACGZ,Y;8BADHY,mB,mBAEI,qB","sourcesContent":["// Copyright (c) 2015 - 2017 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport {LayerExtension} from '@deck.gl/core';\nimport {shaderModule, shaderModule64} from './shader-module';\nimport * as aggregator from './aggregator';\nimport {readPixelsToArray, clear} from '@luma.gl/core';\nimport GL from '@luma.gl/constants';\n\nimport type {Layer, LayerContext, Accessor, UpdateParameters} from '@deck.gl/core';\n\nconst defaultProps = {\n getFilterValue: {type: 'accessor', value: 0},\n onFilteredItemsChange: {type: 'function', value: null, compare: false},\n\n filterEnabled: true,\n filterRange: [-1, 1],\n filterSoftRange: null,\n filterTransformSize: true,\n filterTransformColor: true\n};\n\nexport type DataFilterExtensionProps<DataT = any> = {\n /**\n * Accessor to retrieve the value for each object that it will be filtered by.\n * Returns either a number (if `filterSize: 1`) or an array of numbers.\n */\n getFilterValue?: Accessor<DataT, number | number[]>;\n /**\n * Enable/disable the data filter. If the data filter is disabled, all objects are rendered.\n * @default true\n */\n filterEnabled?: boolean;\n /**\n * The [min, max] bounds which defines whether an object should be rendered.\n * If an object's filtered value is within the bounds, the object will be rendered; otherwise it will be hidden.\n * @default [-1, 1]\n */\n filterRange?: [number, number] | [number, number][];\n /**\n * If specified, objects will be faded in/out instead of abruptly shown/hidden.\n * When the filtered value is outside of the bounds defined by `filterSoftRange` but still within the bounds defined by `filterRange`, the object will be rendered as \"faded.\"\n * @default null\n */\n filterSoftRange?: [number, number] | [number, number][] | null;\n /**\n * When an object is \"faded\", manipulate its size so that it appears smaller or thinner. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformSize?: boolean;\n /**\n * When an object is \"faded\", manipulate its opacity so that it appears more translucent. Only works if `filterSoftRange` is specified.\n * @default true\n */\n filterTransformColor?: boolean;\n /**\n * Only called if the `countItems` option is enabled.\n */\n onFilteredItemsChange?: (evt: {\n /** The id of the source layer. */\n id: string;\n /** The number of data objects that pass the filter. */\n count: number;\n }) => void;\n};\n\ntype DataFilterExtensionOptions = {\n /**\n * The size of the filter (number of columns to filter by). The data filter can show/hide data based on 1-4 numeric properties of each object.\n * @default 1\n */\n filterSize: number;\n /**\n * Use 64-bit precision instead of 32-bit.\n * @default false\n */\n fp64: boolean;\n /**\n * If `true`, reports the number of filtered objects with the `onFilteredItemsChange` callback.\n * @default `false`.\n */\n countItems: boolean;\n};\n\nconst DATA_TYPE_FROM_SIZE = {\n 1: 'float',\n 2: 'vec2',\n 3: 'vec3',\n 4: 'vec4'\n};\n\n/** Adds GPU-based data filtering functionalities to layers. It allows the layer to show/hide objects based on user-defined properties. */\nexport default class DataFilterExtension extends LayerExtension<DataFilterExtensionOptions> {\n static defaultProps = defaultProps;\n static extensionName = 'DataFilterExtension';\n\n constructor({\n filterSize = 1,\n fp64 = false,\n countItems = false\n }: Partial<DataFilterExtensionOptions> = {}) {\n if (!DATA_TYPE_FROM_SIZE[filterSize]) {\n throw new Error('filterSize out of range');\n }\n\n super({filterSize, fp64, countItems});\n }\n\n getShaders(this: Layer<DataFilterExtensionProps>, extension: this): any {\n const {filterSize, fp64} = extension.opts;\n\n return {\n modules: [fp64 ? shaderModule64 : shaderModule],\n defines: {\n DATAFILTER_TYPE: DATA_TYPE_FROM_SIZE[filterSize],\n DATAFILTER_DOUBLE: Boolean(fp64)\n }\n };\n }\n\n initializeState(this: Layer<DataFilterExtensionProps>, context: LayerContext, extension: this) {\n const attributeManager = this.getAttributeManager();\n if (attributeManager) {\n attributeManager.add({\n filterValues: {\n size: extension.opts.filterSize,\n type: extension.opts.fp64 ? GL.DOUBLE : GL.FLOAT,\n accessor: 'getFilterValue',\n shaderAttributes: {\n filterValues: {\n divisor: 0\n },\n instanceFilterValues: {\n divisor: 1\n }\n }\n }\n });\n }\n\n const {gl} = this.context;\n if (attributeManager && extension.opts.countItems) {\n const useFloatTarget = aggregator.supportsFloatTarget(gl);\n // This attribute is needed for variable-width data, e.g. Path, SolidPolygon, Text\n // The vertex shader checks if a vertex has the same \"index\" as the previous vertex\n // so that we only write one count cross multiple vertices of the same object\n attributeManager.add({\n filterIndices: {\n size: useFloatTarget ? 1 : 2,\n vertexOffset: 1,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n accessor: (object, {index}) => {\n const i = object && object.__source ? object.__source.index : index;\n return useFloatTarget ? (i + 1) % 255 : [(i + 1) % 255, Math.floor(i / 255) % 255];\n },\n shaderAttributes: {\n filterPrevIndices: {\n vertexOffset: 0\n },\n filterIndices: {\n vertexOffset: 1\n }\n }\n }\n });\n\n const filterFBO = aggregator.getFramebuffer(gl, useFloatTarget);\n const filterModel = aggregator.getModel(\n gl,\n extension.getShaders.call(this, extension),\n useFloatTarget\n );\n this.setState({filterFBO, filterModel});\n }\n }\n\n updateState(\n this: Layer<DataFilterExtensionProps>,\n {props, oldProps}: UpdateParameters<Layer<DataFilterExtensionProps>>\n ) {\n if (this.state.filterModel) {\n const attributeManager = this.getAttributeManager();\n const filterNeedsUpdate =\n // attributeManager must be defined for filterModel to be set\n attributeManager!.attributes.filterValues.needsUpdate() ||\n props.filterEnabled !== oldProps.filterEnabled ||\n props.filterRange !== oldProps.filterRange ||\n props.filterSoftRange !== oldProps.filterSoftRange;\n if (filterNeedsUpdate) {\n this.setState({filterNeedsUpdate});\n }\n }\n }\n\n draw(this: Layer<DataFilterExtensionProps>, params: any, extension: this) {\n const {filterFBO, filterModel, filterNeedsUpdate} = this.state;\n const {onFilteredItemsChange} = this.props;\n if (filterNeedsUpdate && onFilteredItemsChange && filterModel) {\n const {\n attributes: {filterValues, filterIndices}\n } = this.getAttributeManager()!;\n filterModel.setVertexCount(this.getNumInstances());\n\n const {gl} = this.context;\n clear(gl, {framebuffer: filterFBO, color: [0, 0, 0, 0]});\n\n filterModel\n .updateModuleSettings(params.moduleParameters)\n .setAttributes({\n ...filterValues.getShaderAttributes(),\n ...(filterIndices && filterIndices.getShaderAttributes())\n })\n .draw({\n framebuffer: filterFBO,\n parameters: {\n ...aggregator.parameters,\n viewport: [0, 0, filterFBO.width, filterFBO.height]\n }\n });\n const color = readPixelsToArray(filterFBO);\n let count = 0;\n for (let i = 0; i < color.length; i++) {\n count += color[i];\n }\n onFilteredItemsChange({id: this.id, count});\n\n this.state.filterNeedsUpdate = false;\n }\n }\n\n finalizeState(this: Layer<DataFilterExtensionProps>) {\n const {filterFBO, filterModel} = this.state;\n if (filterFBO) {\n filterFBO.color.delete();\n filterFBO.delete();\n filterModel.delete();\n }\n }\n}\n"],"file":"data-filter.js"}
|
|
@@ -1,14 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
3
5
|
Object.defineProperty(exports, "__esModule", {
|
|
4
6
|
value: true
|
|
5
7
|
});
|
|
6
8
|
exports.shaderModule64 = exports.shaderModule = void 0;
|
|
9
|
+
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
|
|
12
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
|
|
13
|
+
|
|
14
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
|
|
15
|
+
|
|
7
16
|
var vs = "\nuniform DATAFILTER_TYPE filter_min;\nuniform DATAFILTER_TYPE filter_softMin;\nuniform DATAFILTER_TYPE filter_softMax;\nuniform DATAFILTER_TYPE filter_max;\nuniform bool filter_useSoftMargin;\nuniform bool filter_enabled;\nuniform bool filter_transformSize;\n\n#ifdef NON_INSTANCED_MODEL\n #define DATAFILTER_ATTRIB filterValues\n #define DATAFILTER_ATTRIB_64LOW filterValues64Low\n#else\n #define DATAFILTER_ATTRIB instanceFilterValues\n #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low\n#endif\n\nattribute DATAFILTER_TYPE DATAFILTER_ATTRIB;\n#ifdef DATAFILTER_DOUBLE\n attribute DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;\n\n uniform DATAFILTER_TYPE filter_min64High;\n uniform DATAFILTER_TYPE filter_max64High;\n#endif\n\nvarying float dataFilter_value;\n\nfloat dataFilter_reduceValue(float value) {\n return value;\n}\nfloat dataFilter_reduceValue(vec2 value) {\n return min(value.x, value.y);\n}\nfloat dataFilter_reduceValue(vec3 value) {\n return min(min(value.x, value.y), value.z);\n}\nfloat dataFilter_reduceValue(vec4 value) {\n return min(min(value.x, value.y), min(value.z, value.w));\n}\nvoid dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {\n if (filter_enabled) {\n if (filter_useSoftMargin) {\n dataFilter_value = dataFilter_reduceValue(\n smoothstep(filter_min, filter_softMin, valueFromMin) *\n (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))\n );\n } else {\n dataFilter_value = dataFilter_reduceValue(\n step(filter_min, valueFromMin) * step(valueFromMax, filter_max)\n );\n }\n } else {\n dataFilter_value = 1.0;\n }\n}\n";
|
|
8
17
|
var fs = "\nuniform bool filter_transformColor;\nvarying float dataFilter_value;\n";
|
|
9
18
|
|
|
10
|
-
|
|
11
|
-
if (!opts || !opts
|
|
19
|
+
function getUniforms(opts) {
|
|
20
|
+
if (!opts || !('extensions' in opts)) {
|
|
12
21
|
return {};
|
|
13
22
|
}
|
|
14
23
|
|
|
@@ -21,7 +30,7 @@ var getUniforms = function getUniforms(opts) {
|
|
|
21
30
|
_opts$filterTransform2 = opts.filterTransformColor,
|
|
22
31
|
filterTransformColor = _opts$filterTransform2 === void 0 ? true : _opts$filterTransform2;
|
|
23
32
|
var filterSoftRange = opts.filterSoftRange || filterRange;
|
|
24
|
-
|
|
33
|
+
return _objectSpread(_objectSpread({}, Number.isFinite(filterRange[0]) ? {
|
|
25
34
|
filter_min: filterRange[0],
|
|
26
35
|
filter_softMin: filterSoftRange[0],
|
|
27
36
|
filter_softMax: filterSoftRange[1],
|
|
@@ -39,16 +48,16 @@ var getUniforms = function getUniforms(opts) {
|
|
|
39
48
|
filter_max: filterRange.map(function (r) {
|
|
40
49
|
return r[1];
|
|
41
50
|
})
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
51
|
+
}), {}, {
|
|
52
|
+
filter_enabled: filterEnabled,
|
|
53
|
+
filter_useSoftMargin: Boolean(opts.filterSoftRange),
|
|
54
|
+
filter_transformSize: filterEnabled && filterTransformSize,
|
|
55
|
+
filter_transformColor: filterEnabled && filterTransformColor
|
|
56
|
+
});
|
|
57
|
+
}
|
|
49
58
|
|
|
50
|
-
|
|
51
|
-
if (!opts || !opts
|
|
59
|
+
function getUniforms64(opts) {
|
|
60
|
+
if (!opts || !('extensions' in opts)) {
|
|
52
61
|
return {};
|
|
53
62
|
}
|
|
54
63
|
|
|
@@ -86,7 +95,7 @@ var getUniforms64 = function getUniforms64(opts) {
|
|
|
86
95
|
}
|
|
87
96
|
|
|
88
97
|
return uniforms;
|
|
89
|
-
}
|
|
98
|
+
}
|
|
90
99
|
|
|
91
100
|
var inject = {
|
|
92
101
|
'vs:#main-start': "\n #ifdef DATAFILTER_DOUBLE\n dataFilter_setValue(\n DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,\n DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW\n );\n #else\n dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);\n #endif\n ",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/data-filter/shader-module.
|
|
1
|
+
{"version":3,"sources":["../../../src/data-filter/shader-module.ts"],"names":["vs","fs","getUniforms","opts","filterRange","filterEnabled","filterTransformSize","filterTransformColor","filterSoftRange","Number","isFinite","filter_min","filter_softMin","filter_softMax","filter_max","map","r","filter_enabled","filter_useSoftMargin","Boolean","filter_transformSize","filter_transformColor","getUniforms64","uniforms","min64High","Math","fround","filter_min64High","max64High","filter_max64High","x","i","inject","shaderModule","name","shaderModule64"],"mappings":";;;;;;;;;;;;;;;AAOA,IAAMA,EAAE,uoDAAR;AAyDA,IAAMC,EAAE,6EAAR;;AAUA,SAASC,WAAT,CAAqBC,IAArB,EAAgF;AAC9E,MAAI,CAACA,IAAD,IAAS,EAAE,gBAAgBA,IAAlB,CAAb,EAAsC;AACpC,WAAO,EAAP;AACD;;AACD,0BAKIA,IALJ,CACEC,WADF;AAAA,MACEA,WADF,kCACgB,CAAC,CAAC,CAAF,EAAK,CAAL,CADhB;AAAA,4BAKID,IALJ,CAEEE,aAFF;AAAA,MAEEA,aAFF,oCAEkB,IAFlB;AAAA,8BAKIF,IALJ,CAGEG,mBAHF;AAAA,MAGEA,mBAHF,sCAGwB,IAHxB;AAAA,+BAKIH,IALJ,CAIEI,oBAJF;AAAA,MAIEA,oBAJF,uCAIyB,IAJzB;AAMA,MAAMC,eAAe,GAAGL,IAAI,CAACK,eAAL,IAAwBJ,WAAhD;AAEA,yCACMK,MAAM,CAACC,QAAP,CAAgBN,WAAW,CAAC,CAAD,CAA3B,IACA;AACEO,IAAAA,UAAU,EAAEP,WAAW,CAAC,CAAD,CADzB;AAEEQ,IAAAA,cAAc,EAAEJ,eAAe,CAAC,CAAD,CAFjC;AAGEK,IAAAA,cAAc,EAAEL,eAAe,CAAC,CAAD,CAHjC;AAIEM,IAAAA,UAAU,EAAEV,WAAW,CAAC,CAAD;AAJzB,GADA,GAOA;AACEO,IAAAA,UAAU,EAAEP,WAAW,CAACW,GAAZ,CAAgB,UAAAC,CAAC;AAAA,aAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,KAAjB,CADd;AAEEJ,IAAAA,cAAc,EAAEJ,eAAe,CAACO,GAAhB,CAAoB,UAAAC,CAAC;AAAA,aAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,KAArB,CAFlB;AAGEH,IAAAA,cAAc,EAAEL,eAAe,CAACO,GAAhB,CAAoB,UAAAC,CAAC;AAAA,aAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,KAArB,CAHlB;AAIEF,IAAAA,UAAU,EAAEV,WAAW,CAACW,GAAZ,CAAgB,UAAAC,CAAC;AAAA,aAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,KAAjB;AAJd,GARN;AAcEC,IAAAA,cAAc,EAAEZ,aAdlB;AAeEa,IAAAA,oBAAoB,EAAEC,OAAO,CAAChB,IAAI,CAACK,eAAN,CAf/B;AAgBEY,IAAAA,oBAAoB,EAAEf,aAAa,IAAIC,mBAhBzC;AAiBEe,IAAAA,qBAAqB,EAAEhB,aAAa,IAAIE;AAjB1C;AAmBD;;AAED,SAASe,aAAT,CAAuBnB,IAAvB,EAAkF;AAChF,MAAI,CAACA,IAAD,IAAS,EAAE,gBAAgBA,IAAlB,CAAb,EAAsC;AACpC,WAAO,EAAP;AACD;;AACD,MAAMoB,QAAQ,GAAGrB,WAAW,CAACC,IAAD,CAA5B;;AACA,MAAIM,MAAM,CAACC,QAAP,CAAgBa,QAAQ,CAACZ,UAAzB,CAAJ,EAA0C;AACxC,QAAMa,SAAS,GAAGC,IAAI,CAACC,MAAL,CAAYH,QAAQ,CAACZ,UAArB,CAAlB;AACAY,IAAAA,QAAQ,CAACZ,UAAT,IAAuBa,SAAvB;AACAD,IAAAA,QAAQ,CAACX,cAAT,IAA2BY,SAA3B;AACAD,IAAAA,QAAQ,CAACI,gBAAT,GAA4BH,SAA5B;AAEA,QAAMI,SAAS,GAAGH,IAAI,CAACC,MAAL,CAAYH,QAAQ,CAACT,UAArB,CAAlB;AACAS,IAAAA,QAAQ,CAACT,UAAT,IAAuBc,SAAvB;AACAL,IAAAA,QAAQ,CAACV,cAAT,IAA2Be,SAA3B;AACAL,IAAAA,QAAQ,CAACM,gBAAT,GAA4BD,SAA5B;AACD,GAVD,MAUO;AACL,QAAMJ,UAAS,GAAGD,QAAQ,CAACZ,UAAT,CAAoBI,GAApB,CAAwBU,IAAI,CAACC,MAA7B,CAAlB;;AACAH,IAAAA,QAAQ,CAACZ,UAAT,GAAsBY,QAAQ,CAACZ,UAAT,CAAoBI,GAApB,CAAwB,UAACe,CAAD,EAAIC,CAAJ;AAAA,aAAUD,CAAC,GAAGN,UAAS,CAACO,CAAD,CAAvB;AAAA,KAAxB,CAAtB;AACAR,IAAAA,QAAQ,CAACX,cAAT,GAA0BW,QAAQ,CAACX,cAAT,CAAwBG,GAAxB,CAA4B,UAACe,CAAD,EAAIC,CAAJ;AAAA,aAAUD,CAAC,GAAGN,UAAS,CAACO,CAAD,CAAvB;AAAA,KAA5B,CAA1B;AACAR,IAAAA,QAAQ,CAACI,gBAAT,GAA4BH,UAA5B;;AAEA,QAAMI,UAAS,GAAGL,QAAQ,CAACT,UAAT,CAAoBC,GAApB,CAAwBU,IAAI,CAACC,MAA7B,CAAlB;;AACAH,IAAAA,QAAQ,CAACT,UAAT,GAAsBS,QAAQ,CAACT,UAAT,CAAoBC,GAApB,CAAwB,UAACe,CAAD,EAAIC,CAAJ;AAAA,aAAUD,CAAC,GAAGF,UAAS,CAACG,CAAD,CAAvB;AAAA,KAAxB,CAAtB;AACAR,IAAAA,QAAQ,CAACV,cAAT,GAA0BU,QAAQ,CAACV,cAAT,CAAwBE,GAAxB,CAA4B,UAACe,CAAD,EAAIC,CAAJ;AAAA,aAAUD,CAAC,GAAGF,UAAS,CAACG,CAAD,CAAvB;AAAA,KAA5B,CAA1B;AACAR,IAAAA,QAAQ,CAACM,gBAAT,GAA4BD,UAA5B;AACD;;AACD,SAAOL,QAAP;AACD;;AAED,IAAMS,MAAM,GAAG;AACb,wUADa;AAYb,gHAZa;AAkBb;AAlBa,CAAf;AA0BO,IAAMC,YAAoD,GAAG;AAClEC,EAAAA,IAAI,EAAE,aAD4D;AAElElC,EAAAA,EAAE,EAAFA,EAFkE;AAGlEC,EAAAA,EAAE,EAAFA,EAHkE;AAIlE+B,EAAAA,MAAM,EAANA,MAJkE;AAKlE9B,EAAAA,WAAW,EAAXA;AALkE,CAA7D;;AAQA,IAAMiC,cAAsD,GAAG;AACpED,EAAAA,IAAI,EAAE,kBAD8D;AAEpElC,EAAAA,EAAE,EAAFA,EAFoE;AAGpEC,EAAAA,EAAE,EAAFA,EAHoE;AAIpE+B,EAAAA,MAAM,EAANA,MAJoE;AAKpE9B,EAAAA,WAAW,EAAEoB;AALuD,CAA/D","sourcesContent":["import {_ShaderModule as ShaderModule} from '@deck.gl/core/typed';\n\nimport type {DataFilterExtensionProps} from './data-filter';\n\n/*\n * data filter shader module\n */\nconst vs = `\nuniform DATAFILTER_TYPE filter_min;\nuniform DATAFILTER_TYPE filter_softMin;\nuniform DATAFILTER_TYPE filter_softMax;\nuniform DATAFILTER_TYPE filter_max;\nuniform bool filter_useSoftMargin;\nuniform bool filter_enabled;\nuniform bool filter_transformSize;\n\n#ifdef NON_INSTANCED_MODEL\n #define DATAFILTER_ATTRIB filterValues\n #define DATAFILTER_ATTRIB_64LOW filterValues64Low\n#else\n #define DATAFILTER_ATTRIB instanceFilterValues\n #define DATAFILTER_ATTRIB_64LOW instanceFilterValues64Low\n#endif\n\nattribute DATAFILTER_TYPE DATAFILTER_ATTRIB;\n#ifdef DATAFILTER_DOUBLE\n attribute DATAFILTER_TYPE DATAFILTER_ATTRIB_64LOW;\n\n uniform DATAFILTER_TYPE filter_min64High;\n uniform DATAFILTER_TYPE filter_max64High;\n#endif\n\nvarying float dataFilter_value;\n\nfloat dataFilter_reduceValue(float value) {\n return value;\n}\nfloat dataFilter_reduceValue(vec2 value) {\n return min(value.x, value.y);\n}\nfloat dataFilter_reduceValue(vec3 value) {\n return min(min(value.x, value.y), value.z);\n}\nfloat dataFilter_reduceValue(vec4 value) {\n return min(min(value.x, value.y), min(value.z, value.w));\n}\nvoid dataFilter_setValue(DATAFILTER_TYPE valueFromMin, DATAFILTER_TYPE valueFromMax) {\n if (filter_enabled) {\n if (filter_useSoftMargin) {\n dataFilter_value = dataFilter_reduceValue(\n smoothstep(filter_min, filter_softMin, valueFromMin) *\n (1.0 - smoothstep(filter_softMax, filter_max, valueFromMax))\n );\n } else {\n dataFilter_value = dataFilter_reduceValue(\n step(filter_min, valueFromMin) * step(valueFromMax, filter_max)\n );\n }\n } else {\n dataFilter_value = 1.0;\n }\n}\n`;\n\nconst fs = `\nuniform bool filter_transformColor;\nvarying float dataFilter_value;\n`;\n\ntype DataFilterModuleSettings = {\n extensions: any[]; // used to detect if layer props are present\n} & DataFilterExtensionProps;\n\n/* eslint-disable camelcase */\nfunction getUniforms(opts?: DataFilterModuleSettings | {}): Record<string, any> {\n if (!opts || !('extensions' in opts)) {\n return {};\n }\n const {\n filterRange = [-1, 1],\n filterEnabled = true,\n filterTransformSize = true,\n filterTransformColor = true\n } = opts;\n const filterSoftRange = opts.filterSoftRange || filterRange;\n\n return {\n ...(Number.isFinite(filterRange[0])\n ? {\n filter_min: filterRange[0],\n filter_softMin: filterSoftRange[0],\n filter_softMax: filterSoftRange[1],\n filter_max: filterRange[1]\n }\n : {\n filter_min: filterRange.map(r => r[0]),\n filter_softMin: filterSoftRange.map(r => r[0]),\n filter_softMax: filterSoftRange.map(r => r[1]),\n filter_max: filterRange.map(r => r[1])\n }),\n filter_enabled: filterEnabled,\n filter_useSoftMargin: Boolean(opts.filterSoftRange),\n filter_transformSize: filterEnabled && filterTransformSize,\n filter_transformColor: filterEnabled && filterTransformColor\n };\n}\n\nfunction getUniforms64(opts?: DataFilterModuleSettings | {}): Record<string, any> {\n if (!opts || !('extensions' in opts)) {\n return {};\n }\n const uniforms = getUniforms(opts);\n if (Number.isFinite(uniforms.filter_min)) {\n const min64High = Math.fround(uniforms.filter_min);\n uniforms.filter_min -= min64High;\n uniforms.filter_softMin -= min64High;\n uniforms.filter_min64High = min64High;\n\n const max64High = Math.fround(uniforms.filter_max);\n uniforms.filter_max -= max64High;\n uniforms.filter_softMax -= max64High;\n uniforms.filter_max64High = max64High;\n } else {\n const min64High = uniforms.filter_min.map(Math.fround);\n uniforms.filter_min = uniforms.filter_min.map((x, i) => x - min64High[i]);\n uniforms.filter_softMin = uniforms.filter_softMin.map((x, i) => x - min64High[i]);\n uniforms.filter_min64High = min64High;\n\n const max64High = uniforms.filter_max.map(Math.fround);\n uniforms.filter_max = uniforms.filter_max.map((x, i) => x - max64High[i]);\n uniforms.filter_softMax = uniforms.filter_softMax.map((x, i) => x - max64High[i]);\n uniforms.filter_max64High = max64High;\n }\n return uniforms;\n}\n\nconst inject = {\n 'vs:#main-start': `\n #ifdef DATAFILTER_DOUBLE\n dataFilter_setValue(\n DATAFILTER_ATTRIB - filter_min64High + DATAFILTER_ATTRIB_64LOW,\n DATAFILTER_ATTRIB - filter_max64High + DATAFILTER_ATTRIB_64LOW\n );\n #else\n dataFilter_setValue(DATAFILTER_ATTRIB, DATAFILTER_ATTRIB);\n #endif\n `,\n\n 'vs:DECKGL_FILTER_SIZE': `\n if (filter_transformSize) {\n size = size * dataFilter_value;\n }\n `,\n\n 'fs:DECKGL_FILTER_COLOR': `\n if (dataFilter_value == 0.0) discard;\n if (filter_transformColor) {\n color.a *= dataFilter_value;\n }\n `\n};\n\nexport const shaderModule: ShaderModule<DataFilterModuleSettings> = {\n name: 'data-filter',\n vs,\n fs,\n inject,\n getUniforms\n};\n\nexport const shaderModule64: ShaderModule<DataFilterModuleSettings> = {\n name: 'data-filter-fp64',\n vs,\n fs,\n inject,\n getUniforms: getUniforms64\n};\n"],"file":"shader-module.js"}
|
|
@@ -76,7 +76,7 @@ var FillStyleExtension = function (_LayerExtension) {
|
|
|
76
76
|
(0, _createClass2.default)(FillStyleExtension, [{
|
|
77
77
|
key: "isEnabled",
|
|
78
78
|
value: function isEnabled(layer) {
|
|
79
|
-
return layer.getAttributeManager() && !layer.state
|
|
79
|
+
return layer.getAttributeManager() !== null && !('pathTesselator' in layer.state);
|
|
80
80
|
}
|
|
81
81
|
}, {
|
|
82
82
|
key: "getShaders",
|
|
@@ -160,11 +160,11 @@ var FillStyleExtension = function (_LayerExtension) {
|
|
|
160
160
|
}
|
|
161
161
|
|
|
162
162
|
if (props.fillPatternAtlas && props.fillPatternAtlas !== oldProps.fillPatternAtlas) {
|
|
163
|
-
extension.loadPatternAtlas.call(this
|
|
163
|
+
extension.loadPatternAtlas.call(this);
|
|
164
164
|
}
|
|
165
165
|
|
|
166
166
|
if (props.fillPatternMapping && props.fillPatternMapping !== oldProps.fillPatternMapping) {
|
|
167
|
-
extension.loadPatternMapping.call(this
|
|
167
|
+
extension.loadPatternMapping.call(this);
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
170
|
}, {
|
|
@@ -191,15 +191,16 @@ var FillStyleExtension = function (_LayerExtension) {
|
|
|
191
191
|
}, {
|
|
192
192
|
key: "loadPatternAtlas",
|
|
193
193
|
value: function () {
|
|
194
|
-
var _loadPatternAtlas = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(
|
|
194
|
+
var _loadPatternAtlas = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
|
|
195
195
|
var _this$state$patternTe;
|
|
196
196
|
|
|
197
|
-
var fillPatternAtlas, fetch, image, patternTexture;
|
|
197
|
+
var _this$props, fillPatternAtlas, fetch, image, patternTexture;
|
|
198
|
+
|
|
198
199
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
199
200
|
while (1) {
|
|
200
201
|
switch (_context.prev = _context.next) {
|
|
201
202
|
case 0:
|
|
202
|
-
fillPatternAtlas =
|
|
203
|
+
_this$props = this.props, fillPatternAtlas = _this$props.fillPatternAtlas, fetch = _this$props.fetch;
|
|
203
204
|
(_this$state$patternTe = this.state.patternTexture) === null || _this$state$patternTe === void 0 ? void 0 : _this$state$patternTe.delete();
|
|
204
205
|
this.setState({
|
|
205
206
|
patternTexture: null
|
|
@@ -246,13 +247,14 @@ var FillStyleExtension = function (_LayerExtension) {
|
|
|
246
247
|
}, {
|
|
247
248
|
key: "loadPatternMapping",
|
|
248
249
|
value: function () {
|
|
249
|
-
var _loadPatternMapping = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(
|
|
250
|
-
var fillPatternMapping, fetch, patternMapping;
|
|
250
|
+
var _loadPatternMapping = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2() {
|
|
251
|
+
var _this$props2, fillPatternMapping, fetch, patternMapping;
|
|
252
|
+
|
|
251
253
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
252
254
|
while (1) {
|
|
253
255
|
switch (_context2.prev = _context2.next) {
|
|
254
256
|
case 0:
|
|
255
|
-
fillPatternMapping =
|
|
257
|
+
_this$props2 = this.props, fillPatternMapping = _this$props2.fillPatternMapping, fetch = _this$props2.fetch;
|
|
256
258
|
this.setState({
|
|
257
259
|
patternMapping: null
|
|
258
260
|
});
|
|
@@ -305,6 +307,6 @@ var FillStyleExtension = function (_LayerExtension) {
|
|
|
305
307
|
}(_core.LayerExtension);
|
|
306
308
|
|
|
307
309
|
exports.default = FillStyleExtension;
|
|
308
|
-
FillStyleExtension
|
|
309
|
-
FillStyleExtension
|
|
310
|
+
(0, _defineProperty2.default)(FillStyleExtension, "defaultProps", defaultProps);
|
|
311
|
+
(0, _defineProperty2.default)(FillStyleExtension, "extensionName", 'FillStyleExtension');
|
|
310
312
|
//# sourceMappingURL=fill-style.js.map
|