@deck.gl/extensions 9.0.40 → 9.1.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (160) hide show
  1. package/dist/brushing/brushing-extension.d.ts +1 -0
  2. package/dist/brushing/brushing-extension.d.ts.map +1 -1
  3. package/dist/brushing/brushing-extension.js +16 -19
  4. package/dist/brushing/brushing-extension.js.map +1 -0
  5. package/dist/brushing/shader-module.d.ts +8 -2
  6. package/dist/brushing/shader-module.d.ts.map +1 -1
  7. package/dist/brushing/shader-module.js +75 -50
  8. package/dist/brushing/shader-module.js.map +1 -0
  9. package/dist/clip/clip-extension.d.ts +5 -2
  10. package/dist/clip/clip-extension.d.ts.map +1 -1
  11. package/dist/clip/clip-extension.js +37 -42
  12. package/dist/clip/clip-extension.js.map +1 -0
  13. package/dist/collision-filter/collision-filter-effect.d.ts +4 -4
  14. package/dist/collision-filter/collision-filter-effect.d.ts.map +1 -1
  15. package/dist/collision-filter/collision-filter-effect.js +28 -13
  16. package/dist/collision-filter/collision-filter-effect.js.map +1 -0
  17. package/dist/collision-filter/collision-filter-extension.d.ts +1 -1
  18. package/dist/collision-filter/collision-filter-extension.d.ts.map +1 -1
  19. package/dist/collision-filter/collision-filter-extension.js +6 -6
  20. package/dist/collision-filter/collision-filter-extension.js.map +1 -0
  21. package/dist/collision-filter/collision-filter-pass.d.ts +9 -5
  22. package/dist/collision-filter/collision-filter-pass.d.ts.map +1 -1
  23. package/dist/collision-filter/collision-filter-pass.js +15 -4
  24. package/dist/collision-filter/collision-filter-pass.js.map +1 -0
  25. package/dist/collision-filter/shader-module.d.ts +3 -2
  26. package/dist/collision-filter/shader-module.d.ts.map +1 -1
  27. package/dist/collision-filter/shader-module.js +75 -52
  28. package/dist/collision-filter/shader-module.js.map +1 -0
  29. package/dist/data-filter/aggregator.d.ts +4 -10
  30. package/dist/data-filter/aggregator.d.ts.map +1 -1
  31. package/dist/data-filter/aggregator.js +15 -8
  32. package/dist/data-filter/aggregator.js.map +1 -0
  33. package/dist/data-filter/data-filter-extension.d.ts.map +1 -1
  34. package/dist/data-filter/data-filter-extension.js +49 -39
  35. package/dist/data-filter/data-filter-extension.js.map +1 -0
  36. package/dist/data-filter/shader-module.d.ts +12 -5
  37. package/dist/data-filter/shader-module.d.ts.map +1 -1
  38. package/dist/data-filter/shader-module.js +190 -131
  39. package/dist/data-filter/shader-module.js.map +1 -0
  40. package/dist/dist.dev.js +2720 -2037
  41. package/dist/fill-style/fill-style-extension.d.ts.map +1 -1
  42. package/dist/fill-style/fill-style-extension.js +12 -4
  43. package/dist/fill-style/fill-style-extension.js.map +1 -0
  44. package/dist/fill-style/shader-module.d.ts +64 -6
  45. package/dist/fill-style/shader-module.d.ts.map +1 -1
  46. package/dist/fill-style/shader-module.js +74 -51
  47. package/dist/fill-style/shader-module.js.map +1 -0
  48. package/dist/fp64/fp64-extension.d.ts +1 -0
  49. package/dist/fp64/fp64-extension.d.ts.map +1 -1
  50. package/dist/fp64/fp64-extension.js +8 -19
  51. package/dist/fp64/fp64-extension.js.map +1 -0
  52. package/dist/fp64/project64.d.ts +2 -2
  53. package/dist/fp64/project64.d.ts.map +1 -1
  54. package/dist/fp64/project64.glsl.d.ts +1 -1
  55. package/dist/fp64/project64.glsl.d.ts.map +1 -1
  56. package/dist/fp64/project64.glsl.js +19 -21
  57. package/dist/fp64/project64.glsl.js.map +1 -0
  58. package/dist/fp64/project64.js +25 -24
  59. package/dist/fp64/project64.js.map +1 -0
  60. package/dist/index.cjs +1034 -528
  61. package/dist/index.cjs.map +4 -4
  62. package/dist/index.d.ts +1 -0
  63. package/dist/index.d.ts.map +1 -1
  64. package/dist/index.js +4 -0
  65. package/dist/index.js.map +1 -0
  66. package/dist/mask/mask-effect.d.ts +5 -3
  67. package/dist/mask/mask-effect.d.ts.map +1 -1
  68. package/dist/mask/mask-effect.js +13 -5
  69. package/dist/mask/mask-effect.js.map +1 -0
  70. package/dist/mask/mask-extension.d.ts +1 -1
  71. package/dist/mask/mask-extension.d.ts.map +1 -1
  72. package/dist/mask/mask-extension.js +14 -8
  73. package/dist/mask/mask-extension.js.map +1 -0
  74. package/dist/mask/mask-pass.d.ts +2 -43
  75. package/dist/mask/mask-pass.d.ts.map +1 -1
  76. package/dist/mask/mask-pass.js +5 -1
  77. package/dist/mask/mask-pass.js.map +1 -0
  78. package/dist/mask/shader-module.d.ts +60 -3
  79. package/dist/mask/shader-module.d.ts.map +1 -1
  80. package/dist/mask/shader-module.js +74 -46
  81. package/dist/mask/shader-module.js.map +1 -0
  82. package/dist/path-style/path-style-extension.d.ts.map +1 -1
  83. package/dist/path-style/path-style-extension.js +21 -24
  84. package/dist/path-style/path-style-extension.js.map +1 -0
  85. package/dist/path-style/shaders.glsl.d.ts.map +1 -1
  86. package/dist/path-style/shaders.glsl.js +12 -7
  87. package/dist/path-style/shaders.glsl.js.map +1 -0
  88. package/dist/terrain/height-map-builder.d.ts.map +1 -1
  89. package/dist/terrain/height-map-builder.js +4 -0
  90. package/dist/terrain/height-map-builder.js.map +1 -0
  91. package/dist/terrain/shader-module.d.ts +60 -6
  92. package/dist/terrain/shader-module.d.ts.map +1 -1
  93. package/dist/terrain/shader-module.js +70 -61
  94. package/dist/terrain/shader-module.js.map +1 -0
  95. package/dist/terrain/terrain-cover.d.ts.map +1 -1
  96. package/dist/terrain/terrain-cover.js +4 -0
  97. package/dist/terrain/terrain-cover.js.map +1 -0
  98. package/dist/terrain/terrain-effect.d.ts +4 -2
  99. package/dist/terrain/terrain-effect.d.ts.map +1 -1
  100. package/dist/terrain/terrain-effect.js +32 -18
  101. package/dist/terrain/terrain-effect.js.map +1 -0
  102. package/dist/terrain/terrain-extension.d.ts.map +1 -1
  103. package/dist/terrain/terrain-extension.js +4 -0
  104. package/dist/terrain/terrain-extension.js.map +1 -0
  105. package/dist/terrain/terrain-pass.d.ts +6 -41
  106. package/dist/terrain/terrain-pass.d.ts.map +1 -1
  107. package/dist/terrain/terrain-pass.js +12 -1
  108. package/dist/terrain/terrain-pass.js.map +1 -0
  109. package/dist/terrain/terrain-picking-pass.d.ts +7 -1
  110. package/dist/terrain/terrain-picking-pass.d.ts.map +1 -1
  111. package/dist/terrain/terrain-picking-pass.js +12 -1
  112. package/dist/terrain/terrain-picking-pass.js.map +1 -0
  113. package/dist/terrain/utils.d.ts.map +1 -1
  114. package/dist/terrain/utils.js +4 -0
  115. package/dist/terrain/utils.js.map +1 -0
  116. package/dist/utils/debug.d.ts +2 -2
  117. package/dist/utils/debug.d.ts.map +1 -1
  118. package/dist/utils/debug.js +4 -1
  119. package/dist/utils/debug.js.map +1 -0
  120. package/dist/utils/projection-utils.d.ts.map +1 -1
  121. package/dist/utils/projection-utils.js +4 -0
  122. package/dist/utils/projection-utils.js.map +1 -0
  123. package/dist.min.js +1102 -817
  124. package/package.json +8 -8
  125. package/src/brushing/brushing-extension.ts +17 -20
  126. package/src/brushing/shader-module.ts +58 -47
  127. package/src/clip/clip-extension.ts +38 -40
  128. package/src/collision-filter/collision-filter-effect.ts +31 -20
  129. package/src/collision-filter/collision-filter-extension.ts +6 -7
  130. package/src/collision-filter/collision-filter-pass.ts +17 -6
  131. package/src/collision-filter/shader-module.ts +40 -22
  132. package/src/data-filter/aggregator.ts +23 -11
  133. package/src/data-filter/data-filter-extension.ts +76 -49
  134. package/src/data-filter/shader-module.ts +150 -90
  135. package/src/fill-style/fill-style-extension.ts +13 -5
  136. package/src/fill-style/shader-module.ts +84 -52
  137. package/src/fp64/fp64-extension.ts +8 -19
  138. package/src/fp64/project64.glsl.ts +18 -21
  139. package/src/fp64/project64.ts +27 -28
  140. package/src/index.ts +5 -0
  141. package/src/mask/mask-effect.ts +17 -7
  142. package/src/mask/mask-extension.ts +16 -9
  143. package/src/mask/mask-pass.ts +17 -3
  144. package/src/mask/shader-module.ts +63 -27
  145. package/src/path-style/path-style-extension.ts +27 -28
  146. package/src/path-style/shaders.glsl.ts +13 -7
  147. package/src/terrain/height-map-builder.ts +4 -0
  148. package/src/terrain/shader-module.ts +62 -44
  149. package/src/terrain/terrain-cover.ts +4 -0
  150. package/src/terrain/terrain-effect.ts +36 -19
  151. package/src/terrain/terrain-extension.ts +4 -0
  152. package/src/terrain/terrain-pass.ts +19 -3
  153. package/src/terrain/terrain-picking-pass.ts +15 -2
  154. package/src/terrain/utils.ts +4 -0
  155. package/src/utils/debug.ts +4 -0
  156. package/src/utils/projection-utils.ts +4 -0
  157. package/dist/utils/syntax-tags.d.ts +0 -6
  158. package/dist/utils/syntax-tags.d.ts.map +0 -1
  159. package/dist/utils/syntax-tags.js +0 -5
  160. package/src/utils/syntax-tags.ts +0 -5
@@ -35,5 +35,6 @@ export default class BrushingExtension extends LayerExtension {
35
35
  getShaders(): any;
36
36
  initializeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this): void;
37
37
  finalizeState(this: Layer<BrushingExtensionProps>, context: LayerContext, extension: this): void;
38
+ draw(this: Layer<BrushingExtensionProps>, params: any, extension: this): void;
38
39
  }
39
40
  //# sourceMappingURL=brushing-extension.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA2B3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;CAW1F"}
1
+ {"version":3,"file":"brushing-extension.d.ts","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAUjE,MAAM,MAAM,sBAAsB,CAAC,KAAK,GAAG,GAAG,IAAI;IAChD;;;OAGG;IACH,iBAAiB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC;IAClE;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,8IAA8I;AAC9I,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,cAAc;IAC3D,MAAM,CAAC,YAAY;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAAuB;IAE3C,UAAU,IAAI,GAAG;IAMjB,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IA2B3F,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI;IAYzF,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI;CAYvE"}
@@ -1,22 +1,6 @@
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.
1
+ // deck.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
20
4
  import { LayerExtension } from '@deck.gl/core';
21
5
  import shaderModule from "./shader-module.js";
22
6
  const defaultProps = {
@@ -68,7 +52,20 @@ class BrushingExtension extends LayerExtension {
68
52
  });
69
53
  }
70
54
  }
55
+ draw(params, extension) {
56
+ const { viewport, mousePosition } = params.context;
57
+ const { brushingEnabled, brushingRadius, brushingTarget } = this.props;
58
+ const brushingProps = {
59
+ viewport,
60
+ mousePosition,
61
+ brushingEnabled,
62
+ brushingRadius,
63
+ brushingTarget
64
+ };
65
+ this.setShaderModuleProps({ brushing: brushingProps });
66
+ }
71
67
  }
72
68
  BrushingExtension.defaultProps = defaultProps;
73
69
  BrushingExtension.extensionName = 'BrushingExtension';
74
70
  export default BrushingExtension;
71
+ //# sourceMappingURL=brushing-extension.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"brushing-extension.js","sourceRoot":"","sources":["../../src/brushing/brushing-extension.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC7C,OAAO,YAAmC,2BAAwB;AAIlE,MAAM,YAAY,GAAG;IACnB,iBAAiB,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC;IAEpD,cAAc,EAAE,QAAQ;IACxB,eAAe,EAAE,IAAI;IACrB,cAAc,EAAE,KAAK;CACtB,CAAC;AAuBF,8IAA8I;AAC9I,MAAqB,iBAAkB,SAAQ,cAAc;IAI3D,UAAU;QACR,OAAO;YACL,OAAO,EAAE,CAAC,YAAY,CAAC;SACxB,CAAC;IACJ,CAAC;IAED,eAAe,CAAsC,OAAqB,EAAE,SAAe;QACzF,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpD,IAAI,gBAAgB,EAAE,CAAC;YACrB,gBAAgB,CAAC,GAAG,CAAC;gBACnB,eAAe,EAAE;oBACf,IAAI,EAAE,CAAC;oBACP,QAAQ,EAAE,SAAS;oBACnB,QAAQ,EAAE,mBAAmB;iBAC9B;aACF,CAAC,CAAC;QACL,CAAC;QAED,kCAAkC;QAClC,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC,eAAe,EAAE,EAAE,cAAc,EAAE,CAAC;QAC3C,CAAC,CAAC;QACF,qCAAqC;QACrC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;QACrC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,uDAAuD;YACvD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC3B,WAAW,EAAE,WAAW;gBACxB,YAAY,EAAE,WAAW;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,aAAa,CAAsC,OAAqB,EAAE,SAAe;QACvF,yBAAyB;QACzB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAyB,CAAC;YACzD,uDAAuD;YACvD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;gBAC5B,WAAW,EAAE,WAAW;gBACxB,YAAY,EAAE,WAAW;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAsC,MAAW,EAAE,SAAe;QACpE,MAAM,EAAC,QAAQ,EAAE,aAAa,EAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QACjD,MAAM,EAAC,eAAe,EAAE,cAAc,EAAE,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrE,MAAM,aAAa,GAAwB;YACzC,QAAQ;YACR,aAAa;YACb,eAAe;YACf,cAAc;YACd,cAAc;SACf,CAAC;QACF,IAAI,CAAC,oBAAoB,CAAC,EAAC,QAAQ,EAAE,aAAa,EAAC,CAAC,CAAC;IACvD,CAAC;;AA3DM,8BAAY,GAAG,YAAY,CAAC;AAC5B,+BAAa,GAAG,mBAAmB,CAAC;eAFxB,iBAAiB"}
@@ -1,13 +1,19 @@
1
1
  import type { ShaderModule } from '@luma.gl/shadertools';
2
2
  import type { Viewport } from '@deck.gl/core';
3
3
  import type { BrushingExtensionProps } from "./brushing-extension.js";
4
- type BrushingModuleSettings = {
4
+ export type BrushingModuleProps = {
5
5
  viewport: Viewport;
6
6
  mousePosition?: {
7
7
  x: number;
8
8
  y: number;
9
9
  };
10
10
  } & BrushingExtensionProps;
11
- declare const _default: ShaderModule<BrushingModuleSettings>;
11
+ type BrushingModuleUniforms = {
12
+ enabled?: boolean;
13
+ target?: number;
14
+ mousePos?: [number, number];
15
+ radius?: number;
16
+ };
17
+ declare const _default: ShaderModule<BrushingModuleProps, BrushingModuleUniforms, {}>;
12
18
  export default _default;
13
19
  //# sourceMappingURL=shader-module.d.ts.map
@@ -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,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;;AA0E3B,wBA4B0C"}
1
+ {"version":3,"file":"shader-module.d.ts","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAE5C,OAAO,KAAK,EAAC,sBAAsB,EAAC,gCAA6B;AAEjE,MAAM,MAAM,mBAAmB,GAAG;IAEhC,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;CACxC,GAAG,sBAAsB,CAAC;AAE3B,KAAK,sBAAsB,GAAG;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;wBA0HG,YAAY,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,EAAE,CAAC;AAnClE,wBAmCmE"}
@@ -1,31 +1,49 @@
1
+ // deck.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
1
4
  import { project } from '@deck.gl/core';
2
- import { glsl } from "../utils/syntax-tags.js";
5
+ const uniformBlock = /* glsl */ `\
6
+ uniform brushingUniforms {
7
+ bool enabled;
8
+ highp int target;
9
+ vec2 mousePos;
10
+ float radius;
11
+ } brushing;
12
+ `;
13
+ const vertex = /* glsl */ `
14
+ in vec2 brushingTargets;
15
+
16
+ out float brushing_isVisible;
17
+
18
+ bool brushing_isPointInRange(vec2 position) {
19
+ if (!brushing.enabled) {
20
+ return true;
21
+ }
22
+ vec2 source_commonspace = project_position(position);
23
+ vec2 target_commonspace = project_position(brushing.mousePos);
24
+ float distance = length((target_commonspace - source_commonspace) / project.commonUnitsPerMeter.xy);
25
+
26
+ return distance <= brushing.radius;
27
+ }
28
+
29
+ bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {
30
+ return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);
31
+ }
32
+
33
+ void brushing_setVisible(bool visible) {
34
+ brushing_isVisible = float(visible);
35
+ }
36
+ `;
3
37
  const vs = `
4
- uniform bool brushing_enabled;
5
- uniform int brushing_target;
6
- uniform vec2 brushing_mousePos;
7
- uniform float brushing_radius;
8
- in vec2 brushingTargets;
9
- out float brushing_isVisible;
10
- bool brushing_isPointInRange(vec2 position) {
11
- if (!brushing_enabled) {
12
- return true;
13
- }
14
- vec2 source_commonspace = project_position(position);
15
- vec2 target_commonspace = project_position(brushing_mousePos);
16
- float distance = length((target_commonspace - source_commonspace) / project_uCommonUnitsPerMeter.xy);
17
- return distance <= brushing_radius;
18
- }
19
- bool brushing_arePointsInRange(vec2 sourcePos, vec2 targetPos) {
20
- return brushing_isPointInRange(sourcePos) || brushing_isPointInRange(targetPos);
21
- }
22
- void brushing_setVisible(bool visible) {
23
- brushing_isVisible = float(visible);
24
- }
38
+ ${uniformBlock}
39
+ ${vertex}
40
+ `;
41
+ const fragment = /* glsl */ `
42
+ in float brushing_isVisible;
25
43
  `;
26
44
  const fs = `
27
- uniform bool brushing_enabled;
28
- in float brushing_isVisible;
45
+ ${uniformBlock}
46
+ ${fragment}
29
47
  `;
30
48
  const TARGET = {
31
49
  source: 0,
@@ -34,29 +52,29 @@ const TARGET = {
34
52
  source_target: 3
35
53
  };
36
54
  const inject = {
37
- 'vs:DECKGL_FILTER_GL_POSITION': `
38
- vec2 brushingTarget;
39
- vec2 brushingSource;
40
- if (brushing_target == 3) {
41
- brushingTarget = geometry.worldPositionAlt.xy;
42
- brushingSource = geometry.worldPosition.xy;
43
- } else if (brushing_target == 0) {
44
- brushingTarget = geometry.worldPosition.xy;
45
- } else if (brushing_target == 1) {
46
- brushingTarget = geometry.worldPositionAlt.xy;
47
- } else {
48
- brushingTarget = brushingTargets;
49
- }
50
- bool visible;
51
- if (brushing_target == 3) {
52
- visible = brushing_arePointsInRange(brushingSource, brushingTarget);
53
- } else {
54
- visible = brushing_isPointInRange(brushingTarget);
55
- }
56
- brushing_setVisible(visible);
57
- `,
55
+ 'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
56
+ vec2 brushingTarget;
57
+ vec2 brushingSource;
58
+ if (brushing.target == 3) {
59
+ brushingTarget = geometry.worldPositionAlt.xy;
60
+ brushingSource = geometry.worldPosition.xy;
61
+ } else if (brushing.target == 0) {
62
+ brushingTarget = geometry.worldPosition.xy;
63
+ } else if (brushing.target == 1) {
64
+ brushingTarget = geometry.worldPositionAlt.xy;
65
+ } else {
66
+ brushingTarget = brushingTargets;
67
+ }
68
+ bool visible;
69
+ if (brushing.target == 3) {
70
+ visible = brushing_arePointsInRange(brushingSource, brushingTarget);
71
+ } else {
72
+ visible = brushing_isPointInRange(brushingTarget);
73
+ }
74
+ brushing_setVisible(visible);
75
+ `,
58
76
  'fs:DECKGL_FILTER_COLOR': `
59
- if (brushing_enabled && brushing_isVisible < 0.5) {
77
+ if (brushing.enabled && brushing_isVisible < 0.5) {
60
78
  discard;
61
79
  }
62
80
  `
@@ -73,12 +91,19 @@ export default {
73
91
  }
74
92
  const { brushingEnabled = true, brushingRadius = 10000, brushingTarget = 'source', mousePosition, viewport } = opts;
75
93
  return {
76
- brushing_enabled: Boolean(brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)),
77
- brushing_radius: brushingRadius,
78
- brushing_target: TARGET[brushingTarget] || 0,
79
- brushing_mousePos: mousePosition
94
+ enabled: Boolean(brushingEnabled && mousePosition && viewport.containsPixel(mousePosition)),
95
+ radius: brushingRadius,
96
+ target: TARGET[brushingTarget] || 0,
97
+ mousePos: mousePosition
80
98
  ? viewport.unproject([mousePosition.x - viewport.x, mousePosition.y - viewport.y])
81
99
  : [0, 0]
82
100
  };
101
+ },
102
+ uniformTypes: {
103
+ enabled: 'i32',
104
+ target: 'i32',
105
+ mousePos: 'vec2<f32>',
106
+ radius: 'f32'
83
107
  }
84
108
  };
109
+ //# sourceMappingURL=shader-module.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"shader-module.js","sourceRoot":"","sources":["../../src/brushing/shader-module.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAIpC,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAkBtC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;CAO/B,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;CAuBzB,CAAC;AAEF,MAAM,EAAE,GAAG;EACT,YAAY;EACZ,MAAM;CACP,CAAC;AAEF,MAAM,QAAQ,GAAG,UAAU,CAAC;;CAE3B,CAAC;AAEF,MAAM,EAAE,GAAG;EACT,YAAY;EACZ,QAAQ;CACT,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,aAAa,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,8BAA8B,EAAE,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;GAoB1C;IAED,wBAAwB,EAAE;;;;GAIzB;CACF,CAAC;AAEF,eAAe;IACb,IAAI,EAAE,UAAU;IAChB,YAAY,EAAE,CAAC,OAAO,CAAC;IACvB,EAAE;IACF,EAAE;IACF,MAAM;IACN,WAAW,EAAE,CAAC,IAA+B,EAA0B,EAAE;QACvE,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,EACJ,eAAe,GAAG,IAAI,EACtB,cAAc,GAAG,KAAK,EACtB,cAAc,GAAG,QAAQ,EACzB,aAAa,EACb,QAAQ,EACT,GAAG,IAAI,CAAC;QACT,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,eAAe,IAAI,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YAC3F,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;YACnC,QAAQ,EAAE,aAAa;gBACrB,CAAC,CAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAG9E;gBACJ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACX,CAAC;IACJ,CAAC;IACD,YAAY,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,WAAW;QACrB,MAAM,EAAE,KAAK;KACd;CAC+D,CAAC"}
@@ -12,6 +12,9 @@ export type ClipExtensionProps = {
12
12
  */
13
13
  clipByInstance?: boolean;
14
14
  };
15
+ export type ClipModuleProps = {
16
+ bounds: [number, number, number, number];
17
+ };
15
18
  /** Adds support for clipping rendered layers by rectangular bounds. */
16
19
  export default class ClipExtension extends LayerExtension {
17
20
  static defaultProps: {
@@ -20,7 +23,7 @@ export default class ClipExtension extends LayerExtension {
20
23
  };
21
24
  static extensionName: string;
22
25
  getShaders(this: Layer<ClipExtensionProps>): {
23
- modules: ShaderModule[];
26
+ modules: ShaderModule<ClipModuleProps>[];
24
27
  inject: {
25
28
  'vs:#decl': string;
26
29
  'vs:DECKGL_FILTER_GL_POSITION': string;
@@ -28,6 +31,6 @@ export default class ClipExtension extends LayerExtension {
28
31
  'fs:DECKGL_FILTER_COLOR': string;
29
32
  };
30
33
  };
31
- draw(this: Layer<Required<ClipExtensionProps>>, { uniforms }: any): void;
34
+ draw(this: Layer<Required<ClipExtensionProps>>): void;
32
35
  }
33
36
  //# sourceMappingURL=clip-extension.d.ts.map
@@ -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;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"}
1
+ {"version":3,"file":"clip-extension.d.ts","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"AAIA,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;AAOzC,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;AAYF,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC;AAwDF,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,GAAG,IAAI;CAmBtD"}
@@ -1,32 +1,18 @@
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.
1
+ // deck.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
20
4
  import { LayerExtension } from '@deck.gl/core';
21
- import { glsl } from "../utils/syntax-tags.js";
22
5
  const defaultProps = {
23
6
  clipBounds: [0, 0, 1, 1],
24
7
  clipByInstance: undefined
25
8
  };
26
- const shaderFunction = `
27
- uniform vec4 clip_bounds;
9
+ const shaderFunction = /* glsl */ `
10
+ uniform clipUniforms {
11
+ vec4 bounds;
12
+ } clip;
13
+
28
14
  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];
15
+ return position.x >= clip.bounds[0] && position.y >= clip.bounds[1] && position.x < clip.bounds[2] && position.y < clip.bounds[3];
30
16
  }
31
17
  `;
32
18
  /*
@@ -34,21 +20,24 @@ return position.x >= clip_bounds[0] && position.y >= clip_bounds[1] && position.
34
20
  * e.g. ScatterplotLayer - show if the center of a circle is within bounds
35
21
  */
36
22
  const shaderModuleVs = {
37
- name: 'clip-vs',
38
- vs: shaderFunction
23
+ name: 'clip',
24
+ vs: shaderFunction,
25
+ uniformTypes: {
26
+ bounds: 'vec4<f32>'
27
+ }
39
28
  };
40
29
  const injectionVs = {
41
- 'vs:#decl': `
30
+ 'vs:#decl': /* glsl */ `
42
31
  out float clip_isVisible;
43
32
  `,
44
- 'vs:DECKGL_FILTER_GL_POSITION': `
45
- clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
33
+ 'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
34
+ clip_isVisible = float(clip_isInBounds(geometry.worldPosition.xy));
46
35
  `,
47
- 'fs:#decl': `
36
+ 'fs:#decl': /* glsl */ `
48
37
  in float clip_isVisible;
49
38
  `,
50
- 'fs:DECKGL_FILTER_COLOR': `
51
- if (clip_isVisible < 0.5) discard;
39
+ 'fs:DECKGL_FILTER_COLOR': /* glsl */ `
40
+ if (clip_isVisible < 0.5) discard;
52
41
  `
53
42
  };
54
43
  /*
@@ -56,21 +45,24 @@ if (clip_isVisible < 0.5) discard;
56
45
  * e.g. PolygonLayer - show the part of the polygon that intersect with the bounds
57
46
  */
58
47
  const shaderModuleFs = {
59
- name: 'clip-fs',
60
- fs: shaderFunction
48
+ name: 'clip',
49
+ fs: shaderFunction,
50
+ uniformTypes: {
51
+ bounds: 'vec4<f32>'
52
+ }
61
53
  };
62
54
  const injectionFs = {
63
- 'vs:#decl': `
55
+ 'vs:#decl': /* glsl */ `
64
56
  out vec2 clip_commonPosition;
65
57
  `,
66
- 'vs:DECKGL_FILTER_GL_POSITION': `
67
- clip_commonPosition = geometry.position.xy;
58
+ 'vs:DECKGL_FILTER_GL_POSITION': /* glsl */ `
59
+ clip_commonPosition = geometry.position.xy;
68
60
  `,
69
- 'fs:#decl': `
61
+ 'fs:#decl': /* glsl */ `
70
62
  in vec2 clip_commonPosition;
71
63
  `,
72
- 'fs:DECKGL_FILTER_COLOR': `
73
- if (!clip_isInBounds(clip_commonPosition)) discard;
64
+ 'fs:DECKGL_FILTER_COLOR': /* glsl */ `
65
+ if (!clip_isInBounds(clip_commonPosition)) discard;
74
66
  `
75
67
  };
76
68
  /** Adds support for clipping rendered layers by rectangular bounds. */
@@ -96,23 +88,26 @@ class ClipExtension extends LayerExtension {
96
88
  };
97
89
  }
98
90
  /* eslint-disable camelcase */
99
- draw({ uniforms }) {
91
+ draw() {
100
92
  const { clipBounds } = this.props;
93
+ const clipProps = {};
101
94
  if (this.state.clipByInstance) {
102
- uniforms.clip_bounds = clipBounds;
95
+ clipProps.bounds = clipBounds;
103
96
  }
104
97
  else {
105
98
  const corner0 = this.projectPosition([clipBounds[0], clipBounds[1], 0]);
106
99
  const corner1 = this.projectPosition([clipBounds[2], clipBounds[3], 0]);
107
- uniforms.clip_bounds = [
100
+ clipProps.bounds = [
108
101
  Math.min(corner0[0], corner1[0]),
109
102
  Math.min(corner0[1], corner1[1]),
110
103
  Math.max(corner0[0], corner1[0]),
111
104
  Math.max(corner0[1], corner1[1])
112
105
  ];
113
106
  }
107
+ this.setShaderModuleProps({ clip: clipProps });
114
108
  }
115
109
  }
116
110
  ClipExtension.defaultProps = defaultProps;
117
111
  ClipExtension.extensionName = 'ClipExtension';
118
112
  export default ClipExtension;
113
+ //# sourceMappingURL=clip-extension.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clip-extension.js","sourceRoot":"","sources":["../../src/clip/clip-extension.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
- import { Device, Framebuffer, Texture } from '@luma.gl/core';
1
+ import { Device } from '@luma.gl/core';
2
2
  import type { Effect, EffectContext, Layer, PreRenderOptions } from '@deck.gl/core';
3
+ import type { CollisionModuleProps } from "./shader-module.js";
3
4
  export default class CollisionFilterEffect implements Effect {
4
5
  id: string;
5
6
  props: null;
@@ -19,9 +20,8 @@ export default class CollisionFilterEffect implements Effect {
19
20
  * Returns a map from collisionGroup to render info
20
21
  */
21
22
  private _groupByCollisionGroup;
22
- getModuleParameters(layer: Layer): {
23
- collisionFBO: Framebuffer;
24
- dummyCollisionMap: Texture;
23
+ getShaderModuleProps(layer: Layer): {
24
+ collision: CollisionModuleProps;
25
25
  };
26
26
  cleanup(): void;
27
27
  createFBO(device: Device, collisionGroup: string): void;
@@ -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;AAG3D,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAW,MAAM,eAAe,CAAC;AAoB5F,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,MAAM;IAC1D,EAAE,SAA6B;IAC/B,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,OAAO,CAAC,CAAgB;IAChC,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,KAAK,CAAC,OAAO,EAAE,aAAa;IAO5B,SAAS,CAAC,EACR,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,cAAmB,EACpB,EAAE,gBAAgB,GAAG,IAAI;IAoD1B,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"}
1
+ {"version":3,"file":"collision-filter-effect.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAuB,MAAM,eAAe,CAAC;AAG3D,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAW,MAAM,eAAe,CAAC;AAM5F,OAAO,KAAK,EAAC,oBAAoB,EAAC,2BAAwB;AAY1D,MAAM,CAAC,OAAO,OAAO,qBAAsB,YAAW,MAAM;IAC1D,EAAE,SAA6B;IAC/B,KAAK,OAAQ;IACb,YAAY,UAAQ;IACpB,KAAK,SAAK;IAEV,OAAO,CAAC,OAAO,CAAC,CAAgB;IAChC,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,KAAK,CAAC,OAAO,EAAE,aAAa;IAO5B,SAAS,CAAC,EACR,OAAO,EAAE,UAAU,EACnB,MAAM,EACN,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,SAAS,EACT,cAAmB,EACpB,EAAE,gBAAgB,GAAG,IAAI;IAoD1B,OAAO,CAAC,OAAO;IAoEf;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAqC9B,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG;QAClC,SAAS,EAAE,oBAAoB,CAAC;KACjC;IAeD,OAAO,IAAI,IAAI;IAaf,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IA+BhD,UAAU,CAAC,cAAc,EAAE,MAAM;CAOlC"}
@@ -1,3 +1,6 @@
1
+ // deck.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
1
4
  import { equals } from '@math.gl/core';
2
5
  import { _deepEqual as deepEqual } from '@deck.gl/core';
3
6
  import CollisionFilterPass from "./collision-filter-pass.js";
@@ -91,11 +94,16 @@ export default class CollisionFilterEffect {
91
94
  viewports: viewport ? [viewport] : [],
92
95
  onViewportActive,
93
96
  views,
94
- moduleParameters: {
95
- // To avoid feedback loop forming between Framebuffer and active Texture.
96
- dummyCollisionMap: this.dummyCollisionMap,
97
- // @ts-expect-error TODO - assuming WebGL context
98
- devicePixelRatio: collisionFBO.device.canvasContext.getDevicePixelRatio() / DOWNSCALE
97
+ shaderModuleProps: {
98
+ collision: {
99
+ enabled: true,
100
+ // To avoid feedback loop forming between Framebuffer and active Texture.
101
+ dummyCollisionMap: this.dummyCollisionMap
102
+ },
103
+ project: {
104
+ // @ts-expect-error TODO - assuming WebGL context
105
+ devicePixelRatio: collisionFBO.device.canvasContext.getDevicePixelRatio() / DOWNSCALE
106
+ }
99
107
  }
100
108
  });
101
109
  }
@@ -107,7 +115,7 @@ export default class CollisionFilterEffect {
107
115
  _groupByCollisionGroup(device, collisionLayers) {
108
116
  const channelMap = {};
109
117
  for (const layer of collisionLayers) {
110
- const { collisionGroup } = layer.props;
118
+ const collisionGroup = layer.props.collisionGroup;
111
119
  let channelInfo = channelMap[collisionGroup];
112
120
  if (!channelInfo) {
113
121
  channelInfo = { collisionGroup, layers: [], layerBounds: [], allLayersLoaded: true };
@@ -135,10 +143,19 @@ export default class CollisionFilterEffect {
135
143
  }
136
144
  return channelMap;
137
145
  }
138
- getModuleParameters(layer) {
139
- const { collisionGroup } = layer.props;
146
+ getShaderModuleProps(layer) {
147
+ const { collisionGroup, collisionEnabled } = layer
148
+ .props;
140
149
  const { collisionFBOs, dummyCollisionMap } = this;
141
- return { collisionFBO: collisionFBOs[collisionGroup], dummyCollisionMap: dummyCollisionMap };
150
+ const collisionFBO = collisionFBOs[collisionGroup];
151
+ const enabled = collisionEnabled && Boolean(collisionFBO);
152
+ return {
153
+ collision: {
154
+ enabled,
155
+ collisionFBO,
156
+ dummyCollisionMap: dummyCollisionMap
157
+ }
158
+ };
142
159
  }
143
160
  cleanup() {
144
161
  if (this.dummyCollisionMap) {
@@ -171,10 +188,7 @@ export default class CollisionFilterEffect {
171
188
  format: 'depth16unorm',
172
189
  width,
173
190
  height,
174
- mipmaps: false,
175
- // TODO fix getWebGLTextureParameters() in luma to avoid passing deprecated parameters
176
- dataFormat: 6402, // gl.DEPTH_COMPONENT
177
- type: 5125 // gl.UNSIGNED_INT
191
+ mipmaps: false
178
192
  });
179
193
  this.collisionFBOs[collisionGroup] = device.createFramebuffer({
180
194
  id: `collision-${collisionGroup}`,
@@ -192,3 +206,4 @@ export default class CollisionFilterEffect {
192
206
  delete this.collisionFBOs[collisionGroup];
193
207
  }
194
208
  }
209
+ //# sourceMappingURL=collision-filter-effect.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collision-filter-effect.js","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-effect.ts"],"names":[],"mappings":"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"}
@@ -34,7 +34,7 @@ export default class CollisionFilterExtension extends LayerExtension {
34
34
  };
35
35
  static extensionName: string;
36
36
  getShaders(this: Layer<CollisionFilterExtensionProps>): any;
37
- draw(this: Layer<CollisionFilterExtensionProps>, { uniforms, context, moduleParameters }: any): void;
37
+ draw(this: Layer<CollisionFilterExtensionProps>, { shaderModuleProps }: any): void;
38
38
  initializeState(this: Layer<CollisionFilterExtensionProps>, context: LayerContext, extension: this): void;
39
39
  getNeedsPickingBuffer(this: Layer<CollisionFilterExtensionProps>): boolean;
40
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,GAAG;IAa3F,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAgBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}
1
+ {"version":3,"file":"collision-filter-extension.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAW5E,MAAM,MAAM,6BAA6B,CAAC,KAAK,GAAG,GAAG,IAAI;IACvD;;OAEG;IACH,oBAAoB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;OAEG;IACH,kBAAkB,CAAC,EAAE,EAAE,CAAC;CACzB,CAAC;AAEF,iDAAiD;AACjD,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,cAAc;IAClE,MAAM,CAAC,YAAY;;;;;;;;;;;MAAgB;IACnC,MAAM,CAAC,aAAa,SAA8B;IAElD,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,GAAG;IAK3D,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAAE,EAAC,iBAAiB,EAAC,EAAE,GAAG;IAQzE,eAAe,CACb,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,EAC1C,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,IAAI;IAgBjB,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,6BAA6B,CAAC,GAAG,OAAO;CAG3E"}
@@ -1,3 +1,6 @@
1
+ // deck.gl
2
+ // SPDX-License-Identifier: MIT
3
+ // Copyright (c) vis.gl contributors
1
4
  import { LayerExtension } from '@deck.gl/core';
2
5
  import collision from "./shader-module.js";
3
6
  import CollisionFilterEffect from "./collision-filter-effect.js";
@@ -13,12 +16,8 @@ class CollisionFilterExtension extends LayerExtension {
13
16
  return { modules: [collision] };
14
17
  }
15
18
  /* eslint-disable camelcase */
16
- draw({ uniforms, context, moduleParameters }) {
17
- const { collisionEnabled } = this.props;
18
- const { collisionFBO, drawToCollisionMap } = moduleParameters;
19
- const enabled = collisionEnabled && Boolean(collisionFBO);
20
- uniforms.collision_enabled = enabled;
21
- if (drawToCollisionMap) {
19
+ draw({ shaderModuleProps }) {
20
+ if (shaderModuleProps.collision?.drawToCollisionMap) {
22
21
  // Override any props with those defined in collisionTestProps
23
22
  // @ts-ignore
24
23
  this.props = this.clone(this.props.collisionTestProps).props;
@@ -45,3 +44,4 @@ class CollisionFilterExtension extends LayerExtension {
45
44
  CollisionFilterExtension.defaultProps = defaultProps;
46
45
  CollisionFilterExtension.extensionName = 'CollisionFilterExtension';
47
46
  export default CollisionFilterExtension;
47
+ //# sourceMappingURL=collision-filter-extension.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"collision-filter-extension.js","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-extension.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAgC,cAAc,EAAC,MAAM,eAAe,CAAC;AAC5E,OAAO,SAAS,2BAAwB;AACxC,OAAO,qBAAqB,qCAAkC;AAE9D,MAAM,YAAY,GAAG;IACnB,oBAAoB,EAAE,EAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,EAAC;IAClD,gBAAgB,EAAE,IAAI;IACtB,cAAc,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAC;IAClD,kBAAkB,EAAE,EAAE;CACvB,CAAC;AAyBF,iDAAiD;AACjD,MAAqB,wBAAyB,SAAQ,cAAc;IAIlE,UAAU;QACR,OAAO,EAAC,OAAO,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC;IAChC,CAAC;IAED,8BAA8B;IAC9B,IAAI,CAA6C,EAAC,iBAAiB,EAAM;QACvE,IAAI,iBAAiB,CAAC,SAAS,EAAE,kBAAkB,EAAE,CAAC;YACpD,8DAA8D;YAC9D,aAAa;YACb,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,eAAe,CAEb,OAAqB,EACrB,SAAe;QAEf,IAAI,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAClE,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpD,gBAAiB,CAAC,GAAG,CAAC;YACpB,mBAAmB,EAAE;gBACnB,IAAI,EAAE,CAAC;gBACP,QAAQ,EAAE,SAAS;gBACnB,QAAQ,EAAE,sBAAsB;aACjC;SACF,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;IACrC,CAAC;;AArCM,qCAAY,GAAG,YAAY,CAAC;AAC5B,sCAAa,GAAG,0BAA0B,CAAC;eAF/B,wBAAwB"}
@@ -1,16 +1,20 @@
1
- import { Framebuffer } from '@luma.gl/core';
1
+ import { Framebuffer, Parameters } from '@luma.gl/core';
2
2
  import { Layer, _LayersPass as LayersPass, LayersPassRenderOptions, Viewport } from '@deck.gl/core';
3
3
  type CollisionFilterPassRenderOptions = LayersPassRenderOptions & {};
4
4
  export default class CollisionFilterPass extends LayersPass {
5
5
  renderCollisionMap(target: Framebuffer, options: CollisionFilterPassRenderOptions): void;
6
- protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): any;
7
- getModuleParameters(): {
8
- drawToCollisionMap: boolean;
6
+ protected getLayerParameters(layer: Layer, layerIndex: number, viewport: Viewport): Parameters;
7
+ getShaderModuleProps(): {
8
+ collision: {
9
+ drawToCollisionMap: boolean;
10
+ };
9
11
  picking: {
10
12
  isActive: number;
11
13
  isAttribute: boolean;
12
14
  };
13
- lightSources: {};
15
+ lighting: {
16
+ enabled: boolean;
17
+ };
14
18
  };
15
19
  }
16
20
  export {};
@@ -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;AAC1C,OAAO,EAAC,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAElG,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;IAQjF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG;IAIvF,mBAAmB;;;;;;;;CAWpB"}
1
+ {"version":3,"file":"collision-filter-pass.d.ts","sourceRoot":"","sources":["../../src/collision-filter/collision-filter-pass.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AACtD,OAAO,EAAC,KAAK,EAAE,WAAW,IAAI,UAAU,EAAE,uBAAuB,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AAElG,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;IAQjF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,UAAU;IAS9F,oBAAoB;;;;;;;;;;;;CAarB"}