@antv/l7-layers 2.9.18 → 2.9.19

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 (354) hide show
  1. package/es/Geometry/index.js +12 -2
  2. package/es/Geometry/index.js.map +1 -1
  3. package/es/Geometry/models/billboard.d.ts +3 -3
  4. package/es/Geometry/models/billboard.js +11 -6
  5. package/es/Geometry/models/billboard.js.map +1 -1
  6. package/es/Geometry/models/plane.d.ts +3 -3
  7. package/es/Geometry/models/plane.js +12 -7
  8. package/es/Geometry/models/plane.js.map +1 -1
  9. package/es/Geometry/models/sprite.d.ts +3 -3
  10. package/es/Geometry/models/sprite.js +11 -6
  11. package/es/Geometry/models/sprite.js.map +1 -1
  12. package/es/canvas/index.js +12 -2
  13. package/es/canvas/index.js.map +1 -1
  14. package/es/citybuliding/building.js +12 -2
  15. package/es/citybuliding/building.js.map +1 -1
  16. package/es/citybuliding/models/build.d.ts +2 -1
  17. package/es/citybuliding/models/build.js +16 -3
  18. package/es/citybuliding/models/build.js.map +1 -1
  19. package/es/core/BaseLayer.d.ts +1 -1
  20. package/es/core/BaseLayer.js +105 -62
  21. package/es/core/BaseLayer.js.map +1 -1
  22. package/es/core/BaseModel.d.ts +2 -2
  23. package/es/core/BaseModel.js +2 -2
  24. package/es/core/BaseModel.js.map +1 -1
  25. package/es/core/interface.d.ts +2 -0
  26. package/es/core/interface.js.map +1 -1
  27. package/es/core/triangulation.js +1 -2
  28. package/es/core/triangulation.js.map +1 -1
  29. package/es/earth/index.js +8 -2
  30. package/es/earth/index.js.map +1 -1
  31. package/es/earth/models/atmosphere.d.ts +2 -2
  32. package/es/earth/models/atmosphere.js +11 -6
  33. package/es/earth/models/atmosphere.js.map +1 -1
  34. package/es/earth/models/base.d.ts +2 -2
  35. package/es/earth/models/base.js +11 -6
  36. package/es/earth/models/base.js.map +1 -1
  37. package/es/earth/models/bloomsphere.d.ts +2 -2
  38. package/es/earth/models/bloomsphere.js +11 -6
  39. package/es/earth/models/bloomsphere.js.map +1 -1
  40. package/es/heatmap/index.js +17 -5
  41. package/es/heatmap/index.js.map +1 -1
  42. package/es/heatmap/models/grid.d.ts +2 -2
  43. package/es/heatmap/models/grid.js +12 -8
  44. package/es/heatmap/models/grid.js.map +1 -1
  45. package/es/heatmap/models/grid3d.d.ts +2 -2
  46. package/es/heatmap/models/grid3d.js +12 -6
  47. package/es/heatmap/models/grid3d.js.map +1 -1
  48. package/es/heatmap/models/heatmap.d.ts +2 -2
  49. package/es/heatmap/models/heatmap.js +112 -62
  50. package/es/heatmap/models/heatmap.js.map +1 -1
  51. package/es/heatmap/models/hexagon.d.ts +2 -2
  52. package/es/heatmap/models/hexagon.js +11 -6
  53. package/es/heatmap/models/hexagon.js.map +1 -1
  54. package/es/image/index.js +12 -2
  55. package/es/image/index.js.map +1 -1
  56. package/es/image/models/dataImage.d.ts +3 -3
  57. package/es/image/models/dataImage.js +10 -5
  58. package/es/image/models/dataImage.js.map +1 -1
  59. package/es/image/models/image.d.ts +3 -3
  60. package/es/image/models/image.js +11 -7
  61. package/es/image/models/image.js.map +1 -1
  62. package/es/line/index.d.ts +0 -2
  63. package/es/line/index.js +12 -5
  64. package/es/line/index.js.map +1 -1
  65. package/es/line/models/arc.d.ts +2 -2
  66. package/es/line/models/arc.js +14 -9
  67. package/es/line/models/arc.js.map +1 -1
  68. package/es/line/models/arc_3d.d.ts +2 -2
  69. package/es/line/models/arc_3d.js +13 -8
  70. package/es/line/models/arc_3d.js.map +1 -1
  71. package/es/line/models/earthArc_3d.d.ts +2 -2
  72. package/es/line/models/earthArc_3d.js +17 -9
  73. package/es/line/models/earthArc_3d.js.map +1 -1
  74. package/es/line/models/great_circle.d.ts +2 -2
  75. package/es/line/models/great_circle.js +11 -6
  76. package/es/line/models/great_circle.js.map +1 -1
  77. package/es/line/models/half.d.ts +2 -2
  78. package/es/line/models/half.js +46 -29
  79. package/es/line/models/half.js.map +1 -1
  80. package/es/line/models/index.d.ts +1 -1
  81. package/es/line/models/index.js +0 -2
  82. package/es/line/models/index.js.map +1 -1
  83. package/es/line/models/line.d.ts +2 -2
  84. package/es/line/models/line.js +27 -15
  85. package/es/line/models/line.js.map +1 -1
  86. package/es/line/models/linearline.d.ts +2 -11
  87. package/es/line/models/linearline.js +14 -24
  88. package/es/line/models/linearline.js.map +1 -1
  89. package/es/line/models/simpleLine.d.ts +2 -2
  90. package/es/line/models/simpleLine.js +13 -8
  91. package/es/line/models/simpleLine.js.map +1 -1
  92. package/es/line/models/tile.d.ts +2 -11
  93. package/es/line/models/tile.js +45 -39
  94. package/es/line/models/tile.js.map +1 -1
  95. package/es/line/models/wall.d.ts +2 -2
  96. package/es/line/models/wall.js +13 -9
  97. package/es/line/models/wall.js.map +1 -1
  98. package/es/mask/index.js +12 -2
  99. package/es/mask/index.js.map +1 -1
  100. package/es/mask/models/fill.d.ts +2 -2
  101. package/es/mask/models/fill.js +53 -27
  102. package/es/mask/models/fill.js.map +1 -1
  103. package/es/plugins/DataMappingPlugin.js +29 -8
  104. package/es/plugins/DataMappingPlugin.js.map +1 -1
  105. package/es/plugins/DataSourcePlugin.js +14 -5
  106. package/es/plugins/DataSourcePlugin.js.map +1 -1
  107. package/es/plugins/LayerModelPlugin.d.ts +2 -0
  108. package/es/plugins/LayerModelPlugin.js +35 -7
  109. package/es/plugins/LayerModelPlugin.js.map +1 -1
  110. package/es/plugins/PixelPickingPlugin.js +16 -13
  111. package/es/plugins/PixelPickingPlugin.js.map +1 -1
  112. package/es/point/index.d.ts +1 -1
  113. package/es/point/index.js +26 -15
  114. package/es/point/index.js.map +1 -1
  115. package/es/point/models/earthExtrude.d.ts +2 -2
  116. package/es/point/models/earthExtrude.js +16 -14
  117. package/es/point/models/earthExtrude.js.map +1 -1
  118. package/es/point/models/earthFill.d.ts +2 -11
  119. package/es/point/models/earthFill.js +13 -22
  120. package/es/point/models/earthFill.js.map +1 -1
  121. package/es/point/models/extrude.d.ts +2 -2
  122. package/es/point/models/extrude.js +49 -27
  123. package/es/point/models/extrude.js.map +1 -1
  124. package/es/point/models/fill.d.ts +2 -2
  125. package/es/point/models/fill.js +59 -41
  126. package/es/point/models/fill.js.map +1 -1
  127. package/es/point/models/fillmage.d.ts +2 -7
  128. package/es/point/models/fillmage.js +13 -22
  129. package/es/point/models/fillmage.js.map +1 -1
  130. package/es/point/models/image.d.ts +2 -2
  131. package/es/point/models/image.js +11 -6
  132. package/es/point/models/image.js.map +1 -1
  133. package/es/point/models/index.d.ts +1 -1
  134. package/es/point/models/index.js +0 -2
  135. package/es/point/models/index.js.map +1 -1
  136. package/es/point/models/normal.d.ts +2 -2
  137. package/es/point/models/normal.js +11 -6
  138. package/es/point/models/normal.js.map +1 -1
  139. package/es/point/models/radar.d.ts +2 -11
  140. package/es/point/models/radar.js +13 -22
  141. package/es/point/models/radar.js.map +1 -1
  142. package/es/point/models/simplePoint.d.ts +2 -2
  143. package/es/point/models/simplePoint.js +11 -6
  144. package/es/point/models/simplePoint.js.map +1 -1
  145. package/es/point/models/text.d.ts +3 -2
  146. package/es/point/models/text.js +110 -75
  147. package/es/point/models/text.js.map +1 -1
  148. package/es/point/models/tile.d.ts +2 -11
  149. package/es/point/models/tile.js +22 -25
  150. package/es/point/models/tile.js.map +1 -1
  151. package/es/polygon/index.js +12 -2
  152. package/es/polygon/index.js.map +1 -1
  153. package/es/polygon/models/extrude.d.ts +2 -2
  154. package/es/polygon/models/extrude.js +10 -5
  155. package/es/polygon/models/extrude.js.map +1 -1
  156. package/es/polygon/models/fill.d.ts +2 -2
  157. package/es/polygon/models/fill.js +27 -13
  158. package/es/polygon/models/fill.js.map +1 -1
  159. package/es/polygon/models/ocean.d.ts +2 -2
  160. package/es/polygon/models/ocean.js +12 -6
  161. package/es/polygon/models/ocean.js.map +1 -1
  162. package/es/polygon/models/tile.d.ts +2 -3
  163. package/es/polygon/models/tile.js +17 -27
  164. package/es/polygon/models/tile.js.map +1 -1
  165. package/es/polygon/models/water.d.ts +2 -2
  166. package/es/polygon/models/water.js +12 -6
  167. package/es/polygon/models/water.js.map +1 -1
  168. package/es/raster/index.js +12 -2
  169. package/es/raster/index.js.map +1 -1
  170. package/es/raster/models/raster.d.ts +3 -3
  171. package/es/raster/models/raster.js +11 -7
  172. package/es/raster/models/raster.js.map +1 -1
  173. package/es/tile/manager/tileLayerManager.js +3 -0
  174. package/es/tile/manager/tileLayerManager.js.map +1 -1
  175. package/es/tile/manager/tilePickerManager.js +1 -0
  176. package/es/tile/manager/tilePickerManager.js.map +1 -1
  177. package/es/tile/tileFactory/base.js.map +1 -1
  178. package/es/tile/tileFactory/point.js.map +1 -1
  179. package/es/tile/tileFactory/rasterDataLayer.js +12 -2
  180. package/es/tile/tileFactory/rasterDataLayer.js.map +1 -1
  181. package/es/tile/tileFactory/vectorLayer.js +12 -2
  182. package/es/tile/tileFactory/vectorLayer.js.map +1 -1
  183. package/es/wind/index.js +12 -2
  184. package/es/wind/index.js.map +1 -1
  185. package/es/wind/models/wind.d.ts +4 -2
  186. package/es/wind/models/wind.js +50 -18
  187. package/es/wind/models/wind.js.map +1 -1
  188. package/es/wind/models/windRender.js +1 -1
  189. package/es/wind/models/windRender.js.map +1 -1
  190. package/lib/Geometry/index.js +12 -2
  191. package/lib/Geometry/index.js.map +1 -1
  192. package/lib/Geometry/models/billboard.js +11 -6
  193. package/lib/Geometry/models/billboard.js.map +1 -1
  194. package/lib/Geometry/models/plane.js +12 -7
  195. package/lib/Geometry/models/plane.js.map +1 -1
  196. package/lib/Geometry/models/sprite.js +11 -6
  197. package/lib/Geometry/models/sprite.js.map +1 -1
  198. package/lib/canvas/index.js +12 -2
  199. package/lib/canvas/index.js.map +1 -1
  200. package/lib/citybuliding/building.js +12 -2
  201. package/lib/citybuliding/building.js.map +1 -1
  202. package/lib/citybuliding/models/build.js +16 -3
  203. package/lib/citybuliding/models/build.js.map +1 -1
  204. package/lib/core/BaseLayer.js +104 -61
  205. package/lib/core/BaseLayer.js.map +1 -1
  206. package/lib/core/BaseModel.js +2 -2
  207. package/lib/core/BaseModel.js.map +1 -1
  208. package/lib/core/interface.js.map +1 -1
  209. package/lib/core/triangulation.js +4 -6
  210. package/lib/core/triangulation.js.map +1 -1
  211. package/lib/earth/index.js +8 -2
  212. package/lib/earth/index.js.map +1 -1
  213. package/lib/earth/models/atmosphere.js +11 -6
  214. package/lib/earth/models/atmosphere.js.map +1 -1
  215. package/lib/earth/models/base.js +11 -6
  216. package/lib/earth/models/base.js.map +1 -1
  217. package/lib/earth/models/bloomsphere.js +11 -6
  218. package/lib/earth/models/bloomsphere.js.map +1 -1
  219. package/lib/heatmap/index.js +17 -5
  220. package/lib/heatmap/index.js.map +1 -1
  221. package/lib/heatmap/models/grid.js +12 -8
  222. package/lib/heatmap/models/grid.js.map +1 -1
  223. package/lib/heatmap/models/grid3d.js +12 -6
  224. package/lib/heatmap/models/grid3d.js.map +1 -1
  225. package/lib/heatmap/models/heatmap.js +113 -62
  226. package/lib/heatmap/models/heatmap.js.map +1 -1
  227. package/lib/heatmap/models/hexagon.js +11 -6
  228. package/lib/heatmap/models/hexagon.js.map +1 -1
  229. package/lib/image/index.js +12 -2
  230. package/lib/image/index.js.map +1 -1
  231. package/lib/image/models/dataImage.js +10 -5
  232. package/lib/image/models/dataImage.js.map +1 -1
  233. package/lib/image/models/image.js +11 -7
  234. package/lib/image/models/image.js.map +1 -1
  235. package/lib/line/index.js +12 -5
  236. package/lib/line/index.js.map +1 -1
  237. package/lib/line/models/arc.js +14 -9
  238. package/lib/line/models/arc.js.map +1 -1
  239. package/lib/line/models/arc_3d.js +13 -8
  240. package/lib/line/models/arc_3d.js.map +1 -1
  241. package/lib/line/models/earthArc_3d.js +17 -9
  242. package/lib/line/models/earthArc_3d.js.map +1 -1
  243. package/lib/line/models/great_circle.js +11 -6
  244. package/lib/line/models/great_circle.js.map +1 -1
  245. package/lib/line/models/half.js +48 -29
  246. package/lib/line/models/half.js.map +1 -1
  247. package/lib/line/models/index.js +0 -3
  248. package/lib/line/models/index.js.map +1 -1
  249. package/lib/line/models/line.js +28 -17
  250. package/lib/line/models/line.js.map +1 -1
  251. package/lib/line/models/linearline.js +14 -24
  252. package/lib/line/models/linearline.js.map +1 -1
  253. package/lib/line/models/simpleLine.js +13 -8
  254. package/lib/line/models/simpleLine.js.map +1 -1
  255. package/lib/line/models/tile.js +47 -39
  256. package/lib/line/models/tile.js.map +1 -1
  257. package/lib/line/models/wall.js +13 -9
  258. package/lib/line/models/wall.js.map +1 -1
  259. package/lib/mask/index.js +12 -2
  260. package/lib/mask/index.js.map +1 -1
  261. package/lib/mask/models/fill.js +55 -27
  262. package/lib/mask/models/fill.js.map +1 -1
  263. package/lib/plugins/DataMappingPlugin.js +29 -8
  264. package/lib/plugins/DataMappingPlugin.js.map +1 -1
  265. package/lib/plugins/DataSourcePlugin.js +13 -4
  266. package/lib/plugins/DataSourcePlugin.js.map +1 -1
  267. package/lib/plugins/LayerModelPlugin.js +35 -7
  268. package/lib/plugins/LayerModelPlugin.js.map +1 -1
  269. package/lib/plugins/PixelPickingPlugin.js +16 -13
  270. package/lib/plugins/PixelPickingPlugin.js.map +1 -1
  271. package/lib/point/index.js +26 -15
  272. package/lib/point/index.js.map +1 -1
  273. package/lib/point/models/earthExtrude.js +16 -15
  274. package/lib/point/models/earthExtrude.js.map +1 -1
  275. package/lib/point/models/earthFill.js +13 -22
  276. package/lib/point/models/earthFill.js.map +1 -1
  277. package/lib/point/models/extrude.js +51 -28
  278. package/lib/point/models/extrude.js.map +1 -1
  279. package/lib/point/models/fill.js +61 -42
  280. package/lib/point/models/fill.js.map +1 -1
  281. package/lib/point/models/fillmage.js +13 -22
  282. package/lib/point/models/fillmage.js.map +1 -1
  283. package/lib/point/models/image.js +11 -6
  284. package/lib/point/models/image.js.map +1 -1
  285. package/lib/point/models/index.js +0 -3
  286. package/lib/point/models/index.js.map +1 -1
  287. package/lib/point/models/normal.js +11 -6
  288. package/lib/point/models/normal.js.map +1 -1
  289. package/lib/point/models/radar.js +13 -22
  290. package/lib/point/models/radar.js.map +1 -1
  291. package/lib/point/models/simplePoint.js +11 -6
  292. package/lib/point/models/simplePoint.js.map +1 -1
  293. package/lib/point/models/text.js +112 -78
  294. package/lib/point/models/text.js.map +1 -1
  295. package/lib/point/models/tile.js +22 -25
  296. package/lib/point/models/tile.js.map +1 -1
  297. package/lib/polygon/index.js +12 -2
  298. package/lib/polygon/index.js.map +1 -1
  299. package/lib/polygon/models/extrude.js +10 -5
  300. package/lib/polygon/models/extrude.js.map +1 -1
  301. package/lib/polygon/models/fill.js +25 -11
  302. package/lib/polygon/models/fill.js.map +1 -1
  303. package/lib/polygon/models/ocean.js +12 -6
  304. package/lib/polygon/models/ocean.js.map +1 -1
  305. package/lib/polygon/models/tile.js +17 -27
  306. package/lib/polygon/models/tile.js.map +1 -1
  307. package/lib/polygon/models/water.js +12 -6
  308. package/lib/polygon/models/water.js.map +1 -1
  309. package/lib/raster/index.js +12 -2
  310. package/lib/raster/index.js.map +1 -1
  311. package/lib/raster/models/raster.js +11 -7
  312. package/lib/raster/models/raster.js.map +1 -1
  313. package/lib/tile/manager/tileLayerManager.js +3 -0
  314. package/lib/tile/manager/tileLayerManager.js.map +1 -1
  315. package/lib/tile/manager/tilePickerManager.js +1 -0
  316. package/lib/tile/manager/tilePickerManager.js.map +1 -1
  317. package/lib/tile/tileFactory/base.js.map +1 -1
  318. package/lib/tile/tileFactory/point.js.map +1 -1
  319. package/lib/tile/tileFactory/rasterDataLayer.js +12 -2
  320. package/lib/tile/tileFactory/rasterDataLayer.js.map +1 -1
  321. package/lib/tile/tileFactory/vectorLayer.js +12 -2
  322. package/lib/tile/tileFactory/vectorLayer.js.map +1 -1
  323. package/lib/wind/index.js +12 -2
  324. package/lib/wind/index.js.map +1 -1
  325. package/lib/wind/models/wind.js +49 -18
  326. package/lib/wind/models/wind.js.map +1 -1
  327. package/lib/wind/models/windRender.js +1 -1
  328. package/lib/wind/models/windRender.js.map +1 -1
  329. package/package.json +9 -8
  330. package/es/line/models/arcmini.d.ts +0 -9
  331. package/es/line/models/arcmini.js +0 -145
  332. package/es/line/models/arcmini.js.map +0 -1
  333. package/es/point/models/icon-font.d.ts +0 -11
  334. package/es/point/models/icon-font.js +0 -181
  335. package/es/point/models/icon-font.js.map +0 -1
  336. package/es/raster/image.d.ts +0 -0
  337. package/es/raster/image.js +0 -2
  338. package/es/raster/image.js.map +0 -1
  339. package/es/raster/raster2d.d.ts +0 -27
  340. package/es/raster/raster2d.js +0 -158
  341. package/es/raster/raster2d.js.map +0 -1
  342. package/es/utils/geo.d.ts +0 -12
  343. package/es/utils/geo.js +0 -53
  344. package/es/utils/geo.js.map +0 -1
  345. package/lib/line/models/arcmini.js +0 -161
  346. package/lib/line/models/arcmini.js.map +0 -1
  347. package/lib/point/models/icon-font.js +0 -196
  348. package/lib/point/models/icon-font.js.map +0 -1
  349. package/lib/raster/image.js +0 -2
  350. package/lib/raster/image.js.map +0 -1
  351. package/lib/raster/raster2d.js +0 -172
  352. package/lib/raster/raster2d.js.map +0 -1
  353. package/lib/utils/geo.js +0 -65
  354. package/lib/utils/geo.js.map +0 -1
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
10
14
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
15
 
12
16
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -31,8 +35,6 @@ var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
31
35
 
32
36
  var _triangulation = require("../../core/triangulation");
33
37
 
34
- var _geo = require("../../utils/geo");
35
-
36
38
  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); }; }
37
39
 
38
40
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -163,34 +165,55 @@ var ExtrudeModel = function (_BaseModel) {
163
165
  }
164
166
  }, {
165
167
  key: "initModels",
166
- value: function initModels() {
167
- return this.buildModels();
168
+ value: function initModels(callbackModel) {
169
+ this.buildModels(callbackModel);
168
170
  }
169
171
  }, {
170
172
  key: "buildModels",
171
- value: function buildModels() {
172
- var _ref2 = this.layer.getLayerConfig(),
173
- _ref2$depth = _ref2.depth,
174
- depth = _ref2$depth === void 0 ? true : _ref2$depth,
175
- _ref2$animateOption$r = _ref2.animateOption.repeat,
176
- repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
177
-
178
- this.raiserepeat = repeat;
179
- return [this.layer.buildLayerModel({
180
- moduleName: 'pointExtrude2',
181
- vertexShader: pointExtrudeVert,
182
- fragmentShader: pointExtrudeFrag,
183
- triangulation: _triangulation.PointExtrudeTriangulation,
184
- blend: this.getBlend(),
185
- cull: {
186
- enable: true,
187
- face: (0, _l7Utils.getCullFace)(this.mapService.version)
188
- },
189
- depth: {
190
- enable: depth
191
- }
192
- })];
193
- }
173
+ value: function () {
174
+ var _buildModels = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(callbackModel) {
175
+ var _ref2, _ref2$depth, depth, _ref2$animateOption$r, repeat;
176
+
177
+ return _regenerator.default.wrap(function _callee$(_context) {
178
+ while (1) {
179
+ switch (_context.prev = _context.next) {
180
+ case 0:
181
+ _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
182
+ this.raiserepeat = repeat;
183
+ this.layer.buildLayerModel({
184
+ moduleName: 'pointExtrude',
185
+ vertexShader: pointExtrudeVert,
186
+ fragmentShader: pointExtrudeFrag,
187
+ triangulation: _triangulation.PointExtrudeTriangulation,
188
+ blend: this.getBlend(),
189
+ cull: {
190
+ enable: true,
191
+ face: (0, _l7Utils.getCullFace)(this.mapService.version)
192
+ },
193
+ depth: {
194
+ enable: depth
195
+ }
196
+ }).then(function (model) {
197
+ callbackModel([model]);
198
+ }).catch(function (err) {
199
+ console.warn(err);
200
+ callbackModel([]);
201
+ });
202
+
203
+ case 3:
204
+ case "end":
205
+ return _context.stop();
206
+ }
207
+ }
208
+ }, _callee, this);
209
+ }));
210
+
211
+ function buildModels(_x) {
212
+ return _buildModels.apply(this, arguments);
213
+ }
214
+
215
+ return buildModels;
216
+ }()
194
217
  }, {
195
218
  key: "clearModels",
196
219
  value: function clearModels() {
@@ -261,7 +284,7 @@ var ExtrudeModel = function (_BaseModel) {
261
284
  },
262
285
  size: 3,
263
286
  update: function update(feature, featureIdx) {
264
- var coordinates = (0, _geo.calculateCentroid)(feature.coordinates);
287
+ var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
265
288
  return [coordinates[0], coordinates[1], 0];
266
289
  }
267
290
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/point/models/extrude.ts"],"names":["ExtrudeModel","layer","getLayerConfig","animateOption","enable","speed","repeat","opacity","sourceColor","targetColor","pickLight","heightfixed","opacityLinear","dir","lightEnable","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","gl","LUMINANCE","type","FLOAT","useLinearColor","sourceColorArr","targetColorArr","raiseCount","raiserepeat","u_pickLight","Number","u_heightfixed","u_r","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_linearColor","u_sourceColor","u_targetColor","u_opacitylinear","u_opacitylinear_dir","u_lightEnable","buildModels","depth","buildLayerModel","moduleName","vertexShader","pointExtrudeVert","fragmentShader","pointExtrudeFrag","triangulation","PointExtrudeTriangulation","blend","getBlend","cull","face","mapService","version","destroy","styleAttributeService","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","buffersize","Array","isArray","STATIC_DRAW","normal","coordinates","BaseModel"],"mappings":"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","sourcesContent":["import {\n AttributeType,\n gl,\n IEncodeFeature,\n ILayerConfig,\n IModel,\n} from '@antv/l7-core';\nimport { getCullFace, rgb2arr } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport { calculateCentroid } from '../../utils/geo';\nimport pointExtrudeFrag from '../shaders/extrude/extrude_frag.glsl';\nimport pointExtrudeVert from '../shaders/extrude/extrude_vert.glsl';\n\nexport default class ExtrudeModel extends BaseModel {\n private raiseCount: number = 0;\n private raiserepeat: number = 0;\n public getUninforms() {\n const {\n animateOption = {\n enable: false,\n speed: 0.01,\n repeat: false,\n },\n opacity = 1,\n\n sourceColor,\n targetColor,\n\n pickLight = false,\n heightfixed = false,\n\n opacityLinear = {\n enable: false,\n dir: 'up',\n },\n\n lightEnable = true,\n } = this.layer.getLayerConfig() as Partial<\n ILayerConfig & IPointLayerStyleOptions\n >;\n if (\n this.dataTextureTest &&\n this.dataTextureNeedUpdate({\n opacity,\n })\n ) {\n this.judgeStyleAttributes({\n opacity,\n });\n const encodeData = this.layer.getEncodedData();\n const { data, width, height } = this.calDataFrame(\n this.cellLength,\n encodeData,\n this.cellProperties,\n );\n this.rowCount = height; // 当前数据纹理有多少行\n\n this.dataTexture =\n this.cellLength > 0 && data.length > 0\n ? this.createTexture2D({\n flipY: true,\n data,\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width,\n height,\n })\n : this.createTexture2D({\n flipY: true,\n data: [1],\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width: 1,\n height: 1,\n });\n }\n\n // 转化渐变色\n let useLinearColor = 0; // 默认不生效\n let sourceColorArr = [0, 0, 0, 0];\n let targetColorArr = [0, 0, 0, 0];\n if (sourceColor && targetColor) {\n sourceColorArr = rgb2arr(sourceColor);\n targetColorArr = rgb2arr(targetColor);\n useLinearColor = 1;\n }\n\n if (this.raiseCount < 1 && this.raiserepeat > 0) {\n if (animateOption.enable) {\n const { speed = 0.01, repeat = false } = animateOption;\n this.raiseCount += speed;\n if (this.raiseCount >= 1) {\n if (this.raiserepeat > 1) {\n this.raiseCount = 0;\n this.raiserepeat--;\n } else {\n this.raiseCount = 1;\n }\n }\n }\n }\n return {\n // 圆柱体的拾取高亮是否要计算光照\n u_pickLight: Number(pickLight),\n // 圆柱体是否固定高度\n u_heightfixed: Number(heightfixed),\n\n u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,\n\n u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据,若没有任何数据映射时纹理是 [1]\n u_cellTypeLayout: this.getCellTypeLayout(),\n\n u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n // 渐变色支持参数\n u_linearColor: useLinearColor,\n u_sourceColor: sourceColorArr,\n u_targetColor: targetColorArr,\n\n // 透明度渐变\n u_opacitylinear: Number(opacityLinear.enable),\n u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,\n\n // 光照计算开关\n u_lightEnable: Number(lightEnable),\n };\n }\n public initModels(): IModel[] {\n return this.buildModels();\n }\n\n public buildModels(): IModel[] {\n // GAODE1.x GAODE2.x MAPBOX\n const {\n depth = true,\n animateOption: { repeat = 1 },\n } = this.layer.getLayerConfig() as ILayerConfig;\n this.raiserepeat = repeat;\n return [\n this.layer.buildLayerModel({\n moduleName: 'pointExtrude2',\n vertexShader: pointExtrudeVert,\n fragmentShader: pointExtrudeFrag,\n triangulation: PointExtrudeTriangulation,\n blend: this.getBlend(),\n cull: {\n enable: true,\n face: getCullFace(this.mapService.version),\n },\n depth: {\n enable: depth,\n },\n }),\n ];\n }\n public clearModels() {\n this.dataTexture?.destroy();\n }\n protected registerBuiltinAttributes() {\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'size',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Size',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { size } = feature;\n if (size) {\n let buffersize: number[] = [];\n if (Array.isArray(size)) {\n buffersize =\n size.length === 2 ? [size[0], size[0], size[1]] : size;\n }\n if (!Array.isArray(size)) {\n buffersize = [size, size, size];\n }\n return buffersize;\n } else {\n return [2, 2, 2];\n }\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'normal',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Normal',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.STATIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n normal: number[],\n ) => {\n return normal;\n },\n },\n });\n this.styleAttributeService.registerStyleAttribute({\n name: 'pos',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Pos',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (feature: IEncodeFeature, featureIdx: number) => {\n const coordinates = calculateCentroid(feature.coordinates);\n return [coordinates[0], coordinates[1], 0];\n },\n },\n });\n }\n}\n"],"file":"extrude.js"}
1
+ {"version":3,"sources":["../../../src/point/models/extrude.ts"],"names":["ExtrudeModel","layer","getLayerConfig","animateOption","enable","speed","repeat","opacity","sourceColor","targetColor","pickLight","heightfixed","opacityLinear","dir","lightEnable","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","gl","LUMINANCE","type","FLOAT","useLinearColor","sourceColorArr","targetColorArr","raiseCount","raiserepeat","u_pickLight","Number","u_heightfixed","u_r","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_linearColor","u_sourceColor","u_targetColor","u_opacitylinear","u_opacitylinear_dir","u_lightEnable","callbackModel","buildModels","depth","buildLayerModel","moduleName","vertexShader","pointExtrudeVert","fragmentShader","pointExtrudeFrag","triangulation","PointExtrudeTriangulation","blend","getBlend","cull","face","mapService","version","then","model","catch","err","console","warn","destroy","styleAttributeService","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","buffersize","Array","isArray","STATIC_DRAW","normal","coordinates","BaseModel"],"mappings":"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","sourcesContent":["import {\n AttributeType,\n gl,\n IEncodeFeature,\n ILayerConfig,\n IModel,\n} from '@antv/l7-core';\nimport { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport pointExtrudeFrag from '../shaders/extrude/extrude_frag.glsl';\nimport pointExtrudeVert from '../shaders/extrude/extrude_vert.glsl';\n\nexport default class ExtrudeModel extends BaseModel {\n private raiseCount: number = 0;\n private raiserepeat: number = 0;\n public getUninforms() {\n const {\n animateOption = {\n enable: false,\n speed: 0.01,\n repeat: false,\n },\n opacity = 1,\n\n sourceColor,\n targetColor,\n\n pickLight = false,\n heightfixed = false,\n\n opacityLinear = {\n enable: false,\n dir: 'up',\n },\n\n lightEnable = true,\n } = this.layer.getLayerConfig() as Partial<\n ILayerConfig & IPointLayerStyleOptions\n >;\n if (\n this.dataTextureTest &&\n this.dataTextureNeedUpdate({\n opacity,\n })\n ) {\n this.judgeStyleAttributes({\n opacity,\n });\n const encodeData = this.layer.getEncodedData();\n const { data, width, height } = this.calDataFrame(\n this.cellLength,\n encodeData,\n this.cellProperties,\n );\n this.rowCount = height; // 当前数据纹理有多少行\n\n this.dataTexture =\n this.cellLength > 0 && data.length > 0\n ? this.createTexture2D({\n flipY: true,\n data,\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width,\n height,\n })\n : this.createTexture2D({\n flipY: true,\n data: [1],\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width: 1,\n height: 1,\n });\n }\n\n // 转化渐变色\n let useLinearColor = 0; // 默认不生效\n let sourceColorArr = [0, 0, 0, 0];\n let targetColorArr = [0, 0, 0, 0];\n if (sourceColor && targetColor) {\n sourceColorArr = rgb2arr(sourceColor);\n targetColorArr = rgb2arr(targetColor);\n useLinearColor = 1;\n }\n\n if (this.raiseCount < 1 && this.raiserepeat > 0) {\n if (animateOption.enable) {\n const { speed = 0.01, repeat = false } = animateOption;\n this.raiseCount += speed;\n if (this.raiseCount >= 1) {\n if (this.raiserepeat > 1) {\n this.raiseCount = 0;\n this.raiserepeat--;\n } else {\n this.raiseCount = 1;\n }\n }\n }\n }\n return {\n // 圆柱体的拾取高亮是否要计算光照\n u_pickLight: Number(pickLight),\n // 圆柱体是否固定高度\n u_heightfixed: Number(heightfixed),\n\n u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,\n\n u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据,若没有任何数据映射时纹理是 [1]\n u_cellTypeLayout: this.getCellTypeLayout(),\n\n u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n // 渐变色支持参数\n u_linearColor: useLinearColor,\n u_sourceColor: sourceColorArr,\n u_targetColor: targetColorArr,\n\n // 透明度渐变\n u_opacitylinear: Number(opacityLinear.enable),\n u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,\n\n // 光照计算开关\n u_lightEnable: Number(lightEnable),\n };\n }\n public initModels(callbackModel: (models: IModel[]) => void) {\n this.buildModels(callbackModel);\n }\n\n public async buildModels(callbackModel: (models: IModel[]) => void) {\n // GAODE1.x GAODE2.x MAPBOX\n const {\n depth = true,\n animateOption: { repeat = 1 },\n } = this.layer.getLayerConfig() as ILayerConfig;\n this.raiserepeat = repeat;\n\n this.layer\n .buildLayerModel({\n moduleName: 'pointExtrude',\n vertexShader: pointExtrudeVert,\n fragmentShader: pointExtrudeFrag,\n triangulation: PointExtrudeTriangulation,\n blend: this.getBlend(),\n cull: {\n enable: true,\n face: getCullFace(this.mapService.version),\n },\n depth: {\n enable: depth,\n },\n })\n .then((model) => {\n callbackModel([model]);\n })\n .catch((err) => {\n console.warn(err);\n callbackModel([]);\n });\n }\n public clearModels() {\n this.dataTexture?.destroy();\n }\n protected registerBuiltinAttributes() {\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'size',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Size',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { size } = feature;\n if (size) {\n let buffersize: number[] = [];\n if (Array.isArray(size)) {\n buffersize =\n size.length === 2 ? [size[0], size[0], size[1]] : size;\n }\n if (!Array.isArray(size)) {\n buffersize = [size, size, size];\n }\n return buffersize;\n } else {\n return [2, 2, 2];\n }\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'normal',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Normal',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.STATIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n normal: number[],\n ) => {\n return normal;\n },\n },\n });\n this.styleAttributeService.registerStyleAttribute({\n name: 'pos',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Pos',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (feature: IEncodeFeature, featureIdx: number) => {\n const coordinates = calculateCentroid(feature.coordinates);\n return [coordinates[0], coordinates[1], 0];\n },\n },\n });\n }\n}\n"],"file":"extrude.js"}
@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
10
14
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
11
15
 
12
16
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -31,8 +35,6 @@ var _l7Utils = require("@antv/l7-utils");
31
35
 
32
36
  var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
33
37
 
34
- var _triangulation = require("../../core/triangulation");
35
-
36
38
  var _l7Maps = require("@antv/l7-maps");
37
39
 
38
40
  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); }; }
@@ -161,13 +163,13 @@ var FillModel = function (_BaseModel) {
161
163
  }, {
162
164
  key: "getAttribute",
163
165
  value: function getAttribute() {
164
- return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _triangulation.PointFillTriangulation);
166
+ return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _l7Utils.PointFillTriangulation);
165
167
  }
166
168
  }, {
167
169
  key: "initModels",
168
- value: function initModels() {
170
+ value: function initModels(callbackModel) {
169
171
  this.updateUnit('l7size');
170
- return this.buildModels();
172
+ this.buildModels(callbackModel);
171
173
  }
172
174
  }, {
173
175
  key: "calMeter2Coord",
@@ -207,35 +209,56 @@ var FillModel = function (_BaseModel) {
207
209
  }
208
210
  }, {
209
211
  key: "buildModels",
210
- value: function buildModels() {
211
- var _ref3 = this.layer.getLayerConfig(),
212
- _ref3$mask = _ref3.mask,
213
- mask = _ref3$mask === void 0 ? false : _ref3$mask,
214
- _ref3$maskInside = _ref3.maskInside,
215
- maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside,
216
- _ref3$animateOption = _ref3.animateOption,
217
- animateOption = _ref3$animateOption === void 0 ? {
218
- enable: false
219
- } : _ref3$animateOption;
220
-
221
- var _this$getShaders = this.getShaders(animateOption),
222
- frag = _this$getShaders.frag,
223
- vert = _this$getShaders.vert,
224
- type = _this$getShaders.type;
225
-
226
- this.layer.triangulation = _triangulation.PointFillTriangulation;
227
- return [this.layer.buildLayerModel({
228
- moduleName: 'pointfill_' + type,
229
- vertexShader: vert,
230
- fragmentShader: frag,
231
- triangulation: _triangulation.PointFillTriangulation,
232
- depth: {
233
- enable: false
234
- },
235
- blend: this.getBlend(),
236
- stencil: (0, _l7Utils.getMask)(mask, maskInside)
237
- })];
238
- }
212
+ value: function () {
213
+ var _buildModels = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(callbackModel) {
214
+ var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$animateOption, animateOption, _ref3$workerEnabled, workerEnabled, enablePicking, shape2d, _this$getShaders, frag, vert, type;
215
+
216
+ return _regenerator.default.wrap(function _callee$(_context) {
217
+ while (1) {
218
+ switch (_context.prev = _context.next) {
219
+ case 0:
220
+ _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
221
+ enable: false
222
+ } : _ref3$animateOption, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking, shape2d = _ref3.shape2d;
223
+ _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
224
+ this.layer.triangulation = _l7Utils.PointFillTriangulation;
225
+ this.layer.buildLayerModel({
226
+ moduleName: type,
227
+ vertexShader: vert,
228
+ fragmentShader: frag,
229
+ triangulation: _l7Utils.PointFillTriangulation,
230
+ depth: {
231
+ enable: false
232
+ },
233
+ blend: this.getBlend(),
234
+ stencil: (0, _l7Utils.getMask)(mask, maskInside),
235
+ workerEnabled: workerEnabled,
236
+ workerOptions: {
237
+ modelType: type,
238
+ enablePicking: enablePicking,
239
+ shape2d: shape2d
240
+ }
241
+ }).then(function (model) {
242
+ callbackModel([model]);
243
+ }).catch(function (err) {
244
+ console.warn(err);
245
+ callbackModel([]);
246
+ });
247
+
248
+ case 4:
249
+ case "end":
250
+ return _context.stop();
251
+ }
252
+ }
253
+ }, _callee, this);
254
+ }));
255
+
256
+ function buildModels(_x) {
257
+ return _buildModels.apply(this, arguments);
258
+ }
259
+
260
+ return buildModels;
261
+ }()
239
262
  }, {
240
263
  key: "getShaders",
241
264
  value: function getShaders(animateOption) {
@@ -245,21 +268,21 @@ var FillModel = function (_BaseModel) {
245
268
  return {
246
269
  frag: waveFillFrag,
247
270
  vert: pointFillVert,
248
- type: 'wave'
271
+ type: 'pointWave'
249
272
  };
250
273
 
251
274
  default:
252
275
  return {
253
276
  frag: waveFillFrag,
254
277
  vert: pointFillVert,
255
- type: 'wave'
278
+ type: 'pointWave'
256
279
  };
257
280
  }
258
281
  } else {
259
282
  return {
260
283
  frag: pointFillFrag,
261
284
  vert: pointFillVert,
262
- type: 'normal'
285
+ type: 'pointFill'
263
286
  };
264
287
  }
265
288
  }
@@ -278,8 +301,7 @@ var FillModel = function (_BaseModel) {
278
301
  }, {
279
302
  key: "registerBuiltinAttributes",
280
303
  value: function registerBuiltinAttributes() {
281
- var _this2 = this;
282
-
304
+ var shape2d = this.layer.getLayerConfig().shape2d;
283
305
  this.styleAttributeService.registerStyleAttribute({
284
306
  name: 'extrude',
285
307
  type: _l7Core.AttributeType.Attribute,
@@ -330,9 +352,6 @@ var FillModel = function (_BaseModel) {
330
352
  update: function update(feature, featureIdx, vertex, attributeIdx) {
331
353
  var _feature$shape = feature.shape,
332
354
  shape = _feature$shape === void 0 ? 2 : _feature$shape;
333
-
334
- var shape2d = _this2.layer.getLayerConfig().shape2d;
335
-
336
355
  var shapeIndex = shape2d.indexOf(shape);
337
356
  return [shapeIndex];
338
357
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/point/models/fill.ts"],"names":["FillModel","layer","getLayerConfig","opacity","strokeOpacity","strokeWidth","stroke","offsets","blend","blur","raisingHeight","unit","updateUnit","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","gl","LUMINANCE","type","FLOAT","u_raisingHeight","Number","u_meter2coord","meter2coord","u_meteryScale","meteryScale","u_isMeter","isMeter","u_blur","u_additive","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_stroke_opacity","u_stroke_width","u_stroke_color","getStrokeColor","u_offsets","isOffsetStatic","animateOption","enable","u_aimate","animateOption2Array","u_time","getLayerAnimateTime","styleAttributeService","createAttributesAndIndices","PointFillTriangulation","buildModels","getSource","extent","minLng","minLat","maxLng","maxLat","center","version","mapService","mapboxContext","$window","mapboxgl","Version","MAPBOX","MercatorCoordinate","coord","fromLngLat","lng","lat","offsetInMercatorCoordinateUnits","meterInMercatorCoordinateUnits","westCoord","x","y","z","westLnglat","toLngLat","southCoord","southLnglat","m1","meterToCoord","m2","Boolean","mask","maskInside","getShaders","frag","vert","triangulation","buildLayerModel","moduleName","vertexShader","fragmentShader","depth","getBlend","stencil","waveFillFrag","pointFillVert","pointFillFrag","destroy","option","speed","rings","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","extrude","extrudeIndex","Array","isArray","shape","shape2d","shapeIndex","indexOf","L7MAP","GLOBEL","calMeter2Coord","BaseModel"],"mappings":"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","sourcesContent":["import {\n AttributeType,\n gl,\n IAnimateOption,\n IAttribute,\n IElements,\n IEncodeFeature,\n ILayerConfig,\n IModel,\n IModelUniform,\n} from '@antv/l7-core';\nimport { $window, getMask } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointFillTriangulation } from '../../core/triangulation';\n// animate pointLayer shader - support animate\nimport waveFillFrag from '../shaders/animate/wave_frag.glsl';\n// static pointLayer shader - not support animate\nimport pointFillFrag from '../shaders/fill_frag.glsl';\nimport pointFillVert from '../shaders/fill_vert.glsl';\n\nimport { Version } from '@antv/l7-maps';\nexport default class FillModel extends BaseModel {\n private meter2coord: number = 1;\n private meteryScale: number = 1; // 兼容 mapbox\n private isMeter: boolean = false;\n\n private unit: string = 'l7size';\n public getUninforms(): IModelUniform {\n const {\n opacity = 1,\n strokeOpacity = 1,\n strokeWidth = 0,\n stroke = 'rgba(0,0,0,0)',\n offsets = [0, 0],\n blend,\n blur = 0,\n raisingHeight = 0,\n unit = 'l7size',\n } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n this.updateUnit(unit);\n\n if (\n this.dataTextureTest &&\n this.dataTextureNeedUpdate({\n opacity,\n strokeOpacity,\n strokeWidth,\n stroke,\n offsets,\n })\n ) {\n // 判断当前的样式中哪些是需要进行数据映射的,哪些是常量,同时计算用于构建数据纹理的一些中间变量\n this.judgeStyleAttributes({\n opacity,\n strokeOpacity,\n strokeWidth,\n stroke,\n offsets,\n });\n\n const encodeData = this.layer.getEncodedData();\n const { data, width, height } = this.calDataFrame(\n this.cellLength,\n encodeData,\n this.cellProperties,\n );\n this.rowCount = height; // 当前数据纹理有多少行\n\n this.dataTexture =\n this.cellLength > 0 && data.length > 0\n ? this.createTexture2D({\n flipY: true,\n data,\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width,\n height,\n })\n : this.createTexture2D({\n flipY: true,\n data: [1],\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width: 1,\n height: 1,\n });\n }\n return {\n u_raisingHeight: Number(raisingHeight),\n\n u_meter2coord: this.meter2coord,\n u_meteryScale: this.meteryScale,\n u_isMeter: Number(this.isMeter),\n u_blur: blur,\n\n u_additive: blend === 'additive' ? 1.0 : 0.0,\n u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据,若没有任何数据映射时纹理是 [1]\n u_cellTypeLayout: this.getCellTypeLayout(),\n\n u_opacity: isNumber(opacity) ? opacity : 1.0,\n u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,\n u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,\n u_stroke_color: this.getStrokeColor(stroke),\n u_offsets: this.isOffsetStatic(offsets)\n ? (offsets as [number, number])\n : [0, 0],\n };\n }\n public getAnimateUniforms(): IModelUniform {\n const {\n animateOption = { enable: false },\n } = this.layer.getLayerConfig() as ILayerConfig;\n return {\n u_aimate: this.animateOption2Array(animateOption),\n u_time: this.layer.getLayerAnimateTime(),\n };\n }\n\n public getAttribute(): {\n attributes: {\n [attributeName: string]: IAttribute;\n };\n elements: IElements;\n } {\n return this.styleAttributeService.createAttributesAndIndices(\n this.layer.getEncodedData(),\n PointFillTriangulation,\n );\n }\n\n public initModels(): IModel[] {\n this.updateUnit('l7size');\n\n return this.buildModels();\n }\n\n /**\n * 计算等面积点图层(unit meter)笛卡尔坐标标度与世界坐标标度的比例\n * @returns\n */\n public calMeter2Coord() {\n const [minLng, minLat, maxLng, maxLat] = this.layer.getSource().extent;\n const center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];\n\n const { version } = this.mapService;\n const mapboxContext = $window?.mapboxgl;\n if (version === Version.MAPBOX && mapboxContext?.MercatorCoordinate) {\n // 参考:\n // https://docs.mapbox.com/mapbox-gl-js/api/geography/#mercatorcoordinate#meterinmercatorcoordinateunits\n const coord = mapboxContext.MercatorCoordinate.fromLngLat(\n { lng: center[0], lat: center[1] },\n 0,\n );\n const offsetInMercatorCoordinateUnits = coord.meterInMercatorCoordinateUnits();\n const westCoord = new mapboxContext.MercatorCoordinate(\n coord.x - offsetInMercatorCoordinateUnits,\n coord.y,\n coord.z,\n );\n const westLnglat = westCoord.toLngLat();\n\n const southCoord = new mapboxContext.MercatorCoordinate(\n coord.x,\n coord.y - offsetInMercatorCoordinateUnits,\n coord.z,\n );\n const southLnglat = southCoord.toLngLat();\n\n this.meter2coord = center[0] - westLnglat.lng;\n\n this.meteryScale = (southLnglat.lat - center[1]) / this.meter2coord;\n return;\n }\n\n const m1 = this.mapService.meterToCoord(center, [minLng, minLat]);\n const m2 = this.mapService.meterToCoord(center, [\n maxLng === minLng ? maxLng + 0.1 : maxLng,\n maxLat === minLat ? minLat + 0.1 : maxLat,\n ]);\n this.meter2coord = (m1 + m2) / 2;\n if (!Boolean(this.meter2coord)) {\n // Tip: 兼容单个数据导致的 m1、m2 为 NaN\n this.meter2coord = 7.70681090738883;\n }\n }\n\n public buildModels(): IModel[] {\n const {\n mask = false,\n maskInside = true,\n animateOption = { enable: false },\n } = this.layer.getLayerConfig() as Partial<\n ILayerConfig & IPointLayerStyleOptions\n >;\n const { frag, vert, type } = this.getShaders(animateOption);\n\n this.layer.triangulation = PointFillTriangulation;\n return [\n this.layer.buildLayerModel({\n moduleName: 'pointfill_' + type,\n vertexShader: vert,\n fragmentShader: frag,\n triangulation: PointFillTriangulation,\n depth: { enable: false },\n blend: this.getBlend(),\n stencil: getMask(mask, maskInside),\n }),\n ];\n }\n\n /**\n * 根据 animateOption 的值返回对应的 shader 代码\n * @returns\n */\n public getShaders(\n animateOption: Partial<IAnimateOption>,\n ): { frag: string; vert: string; type: string } {\n if (animateOption.enable) {\n switch (animateOption.type) {\n case 'wave':\n return {\n frag: waveFillFrag,\n vert: pointFillVert,\n type: 'wave',\n };\n default:\n return {\n frag: waveFillFrag,\n vert: pointFillVert,\n type: 'wave',\n };\n }\n } else {\n return {\n frag: pointFillFrag,\n vert: pointFillVert,\n type: 'normal',\n };\n }\n }\n\n public clearModels() {\n this.dataTexture?.destroy();\n }\n\n // overwrite baseModel func\n protected animateOption2Array(option: Partial<IAnimateOption>): number[] {\n return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];\n }\n protected registerBuiltinAttributes() {\n this.styleAttributeService.registerStyleAttribute({\n name: 'extrude',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Extrude',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];\n const extrudeIndex = (attributeIdx % 4) * 3;\n return [\n extrude[extrudeIndex],\n extrude[extrudeIndex + 1],\n extrude[extrudeIndex + 2],\n ];\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'size',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Size',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 1,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { size = 5 } = feature;\n return Array.isArray(size) ? [size[0]] : [size as number];\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'shape',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Shape',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 1,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { shape = 2 } = feature;\n const shape2d = this.layer.getLayerConfig().shape2d as string[];\n const shapeIndex = shape2d.indexOf(shape as string);\n return [shapeIndex];\n },\n },\n });\n }\n\n /**\n * 判断是否更新点图层的计量单位\n * @param unit\n */\n private updateUnit(unit: string) {\n const { version } = this.mapService;\n if (this.unit !== unit) {\n // l7size => meter\n if (\n this.unit !== 'meter' &&\n unit === 'meter' &&\n version !== Version.L7MAP &&\n version !== Version.GLOBEL\n ) {\n this.isMeter = true;\n this.calMeter2Coord();\n // meter => l7size\n } else if (this.unit === 'meter' && unit !== 'meter') {\n this.isMeter = false;\n this.meter2coord = 1;\n }\n this.unit = unit;\n }\n }\n}\n"],"file":"fill.js"}
1
+ {"version":3,"sources":["../../../src/point/models/fill.ts"],"names":["FillModel","layer","getLayerConfig","opacity","strokeOpacity","strokeWidth","stroke","offsets","blend","blur","raisingHeight","unit","updateUnit","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","gl","LUMINANCE","type","FLOAT","u_raisingHeight","Number","u_meter2coord","meter2coord","u_meteryScale","meteryScale","u_isMeter","isMeter","u_blur","u_additive","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_stroke_opacity","u_stroke_width","u_stroke_color","getStrokeColor","u_offsets","isOffsetStatic","animateOption","enable","u_aimate","animateOption2Array","u_time","getLayerAnimateTime","styleAttributeService","createAttributesAndIndices","PointFillTriangulation","callbackModel","buildModels","getSource","extent","minLng","minLat","maxLng","maxLat","center","version","mapService","mapboxContext","$window","mapboxgl","Version","MAPBOX","MercatorCoordinate","coord","fromLngLat","lng","lat","offsetInMercatorCoordinateUnits","meterInMercatorCoordinateUnits","westCoord","x","y","z","westLnglat","toLngLat","southCoord","southLnglat","m1","meterToCoord","m2","Boolean","mask","maskInside","workerEnabled","enablePicking","shape2d","getShaders","frag","vert","triangulation","buildLayerModel","moduleName","vertexShader","fragmentShader","depth","getBlend","stencil","workerOptions","modelType","then","model","catch","err","console","warn","waveFillFrag","pointFillVert","pointFillFrag","destroy","option","speed","rings","registerStyleAttribute","name","AttributeType","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","extrude","extrudeIndex","Array","isArray","shape","shapeIndex","indexOf","L7MAP","GLOBEL","calMeter2Coord","BaseModel"],"mappings":"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","sourcesContent":["import {\n AttributeType,\n gl,\n IAnimateOption,\n IAttribute,\n IElements,\n IEncodeFeature,\n ILayerConfig,\n IModel,\n IModelUniform,\n} from '@antv/l7-core';\nimport { $window, getMask, PointFillTriangulation } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\n// import { PointFillTriangulation } from '../../core/triangulation';\n// animate pointLayer shader - support animate\nimport waveFillFrag from '../shaders/animate/wave_frag.glsl';\n// static pointLayer shader - not support animate\nimport pointFillFrag from '../shaders/fill_frag.glsl';\nimport pointFillVert from '../shaders/fill_vert.glsl';\n\nimport { Version } from '@antv/l7-maps';\n\nexport default class FillModel extends BaseModel {\n private meter2coord: number = 1;\n private meteryScale: number = 1; // 兼容 mapbox\n private isMeter: boolean = false;\n\n private unit: string = 'l7size';\n public getUninforms(): IModelUniform {\n const {\n opacity = 1,\n strokeOpacity = 1,\n strokeWidth = 0,\n stroke = 'rgba(0,0,0,0)',\n offsets = [0, 0],\n blend,\n blur = 0,\n raisingHeight = 0,\n unit = 'l7size',\n } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n this.updateUnit(unit);\n\n if (\n this.dataTextureTest &&\n this.dataTextureNeedUpdate({\n opacity,\n strokeOpacity,\n strokeWidth,\n stroke,\n offsets,\n })\n ) {\n // 判断当前的样式中哪些是需要进行数据映射的,哪些是常量,同时计算用于构建数据纹理的一些中间变量\n this.judgeStyleAttributes({\n opacity,\n strokeOpacity,\n strokeWidth,\n stroke,\n offsets,\n });\n\n const encodeData = this.layer.getEncodedData();\n const { data, width, height } = this.calDataFrame(\n this.cellLength,\n encodeData,\n this.cellProperties,\n );\n this.rowCount = height; // 当前数据纹理有多少行\n\n this.dataTexture =\n this.cellLength > 0 && data.length > 0\n ? this.createTexture2D({\n flipY: true,\n data,\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width,\n height,\n })\n : this.createTexture2D({\n flipY: true,\n data: [1],\n format: gl.LUMINANCE,\n type: gl.FLOAT,\n width: 1,\n height: 1,\n });\n }\n return {\n u_raisingHeight: Number(raisingHeight),\n\n u_meter2coord: this.meter2coord,\n u_meteryScale: this.meteryScale,\n u_isMeter: Number(this.isMeter),\n u_blur: blur,\n\n u_additive: blend === 'additive' ? 1.0 : 0.0,\n u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据,若没有任何数据映射时纹理是 [1]\n u_cellTypeLayout: this.getCellTypeLayout(),\n\n u_opacity: isNumber(opacity) ? opacity : 1.0,\n u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,\n u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,\n u_stroke_color: this.getStrokeColor(stroke),\n u_offsets: this.isOffsetStatic(offsets)\n ? (offsets as [number, number])\n : [0, 0],\n };\n }\n public getAnimateUniforms(): IModelUniform {\n const {\n animateOption = { enable: false },\n } = this.layer.getLayerConfig() as ILayerConfig;\n return {\n u_aimate: this.animateOption2Array(animateOption),\n u_time: this.layer.getLayerAnimateTime(),\n };\n }\n\n public getAttribute(): {\n attributes: {\n [attributeName: string]: IAttribute;\n };\n elements: IElements;\n } {\n return this.styleAttributeService.createAttributesAndIndices(\n this.layer.getEncodedData(),\n PointFillTriangulation,\n );\n }\n\n public initModels(callbackModel: (models: IModel[]) => void) {\n this.updateUnit('l7size');\n this.buildModels(callbackModel);\n }\n\n /**\n * 计算等面积点图层(unit meter)笛卡尔坐标标度与世界坐标标度的比例\n * @returns\n */\n public calMeter2Coord() {\n const [minLng, minLat, maxLng, maxLat] = this.layer.getSource().extent;\n const center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];\n\n const { version } = this.mapService;\n const mapboxContext = $window?.mapboxgl;\n if (version === Version.MAPBOX && mapboxContext?.MercatorCoordinate) {\n // 参考:\n // https://docs.mapbox.com/mapbox-gl-js/api/geography/#mercatorcoordinate#meterinmercatorcoordinateunits\n const coord = mapboxContext.MercatorCoordinate.fromLngLat(\n { lng: center[0], lat: center[1] },\n 0,\n );\n const offsetInMercatorCoordinateUnits = coord.meterInMercatorCoordinateUnits();\n const westCoord = new mapboxContext.MercatorCoordinate(\n coord.x - offsetInMercatorCoordinateUnits,\n coord.y,\n coord.z,\n );\n const westLnglat = westCoord.toLngLat();\n\n const southCoord = new mapboxContext.MercatorCoordinate(\n coord.x,\n coord.y - offsetInMercatorCoordinateUnits,\n coord.z,\n );\n const southLnglat = southCoord.toLngLat();\n\n this.meter2coord = center[0] - westLnglat.lng;\n\n this.meteryScale = (southLnglat.lat - center[1]) / this.meter2coord;\n return;\n }\n\n const m1 = this.mapService.meterToCoord(center, [minLng, minLat]);\n const m2 = this.mapService.meterToCoord(center, [\n maxLng === minLng ? maxLng + 0.1 : maxLng,\n maxLat === minLat ? minLat + 0.1 : maxLat,\n ]);\n this.meter2coord = (m1 + m2) / 2;\n if (!Boolean(this.meter2coord)) {\n // Tip: 兼容单个数据导致的 m1、m2 为 NaN\n this.meter2coord = 7.70681090738883;\n }\n }\n\n public async buildModels(callbackModel: (models: IModel[]) => void) {\n const {\n mask = false,\n maskInside = true,\n animateOption = { enable: false },\n workerEnabled = false,\n enablePicking,\n shape2d,\n } = this.layer.getLayerConfig() as Partial<\n ILayerConfig & IPointLayerStyleOptions\n >;\n const { frag, vert, type } = this.getShaders(animateOption);\n\n this.layer.triangulation = PointFillTriangulation;\n\n this.layer\n .buildLayerModel({\n moduleName: type,\n vertexShader: vert,\n fragmentShader: frag,\n triangulation: PointFillTriangulation,\n depth: { enable: false },\n blend: this.getBlend(),\n stencil: getMask(mask, maskInside),\n workerEnabled,\n workerOptions: {\n modelType: type,\n enablePicking,\n shape2d,\n },\n })\n .then((model) => {\n callbackModel([model]);\n })\n .catch((err) => {\n console.warn(err);\n callbackModel([]);\n });\n }\n\n /**\n * 根据 animateOption 的值返回对应的 shader 代码\n * @returns\n */\n public getShaders(\n animateOption: Partial<IAnimateOption>,\n ): { frag: string; vert: string; type: string } {\n if (animateOption.enable) {\n switch (animateOption.type) {\n case 'wave':\n return {\n frag: waveFillFrag,\n vert: pointFillVert,\n type: 'pointWave',\n };\n default:\n return {\n frag: waveFillFrag,\n vert: pointFillVert,\n type: 'pointWave',\n };\n }\n } else {\n return {\n frag: pointFillFrag,\n vert: pointFillVert,\n type: 'pointFill',\n };\n }\n }\n\n public clearModels() {\n this.dataTexture?.destroy();\n }\n\n // overwrite baseModel func\n protected animateOption2Array(option: Partial<IAnimateOption>): number[] {\n return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];\n }\n protected registerBuiltinAttributes() {\n const shape2d = this.layer.getLayerConfig().shape2d as string[];\n\n this.styleAttributeService.registerStyleAttribute({\n name: 'extrude',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Extrude',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 3,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];\n const extrudeIndex = (attributeIdx % 4) * 3;\n return [\n extrude[extrudeIndex],\n extrude[extrudeIndex + 1],\n extrude[extrudeIndex + 2],\n ];\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'size',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Size',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 1,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { size = 5 } = feature;\n return Array.isArray(size) ? [size[0]] : [size];\n },\n },\n });\n\n // point layer size;\n this.styleAttributeService.registerStyleAttribute({\n name: 'shape',\n type: AttributeType.Attribute,\n descriptor: {\n name: 'a_Shape',\n buffer: {\n // give the WebGL driver a hint that this buffer may change\n usage: gl.DYNAMIC_DRAW,\n data: [],\n type: gl.FLOAT,\n },\n size: 1,\n update: (\n feature: IEncodeFeature,\n featureIdx: number,\n vertex: number[],\n attributeIdx: number,\n ) => {\n const { shape = 2 } = feature;\n const shapeIndex = shape2d.indexOf(shape as string);\n return [shapeIndex];\n },\n },\n });\n }\n\n /**\n * 判断是否更新点图层的计量单位\n * @param unit\n */\n private updateUnit(unit: string) {\n const { version } = this.mapService;\n if (this.unit !== unit) {\n // l7size => meter\n if (\n this.unit !== 'meter' &&\n unit === 'meter' &&\n version !== Version.L7MAP &&\n version !== Version.GLOBEL\n ) {\n this.isMeter = true;\n this.calMeter2Coord();\n // meter => l7size\n } else if (this.unit === 'meter' && unit !== 'meter') {\n this.isMeter = false;\n this.meter2coord = 1;\n }\n this.unit = unit;\n }\n }\n}\n"],"file":"fill.js"}
@@ -163,7 +163,7 @@ var FillImageModel = function (_BaseModel) {
163
163
  }
164
164
  }, {
165
165
  key: "initModels",
166
- value: function initModels() {
166
+ value: function initModels(callbackModel) {
167
167
  this.updateTexture();
168
168
  this.iconService.on('imageUpdate', this.updateTexture);
169
169
 
@@ -178,7 +178,7 @@ var FillImageModel = function (_BaseModel) {
178
178
  this.calMeter2Coord();
179
179
  }
180
180
 
181
- return this.buildModels();
181
+ this.buildModels(callbackModel);
182
182
  }
183
183
  }, {
184
184
  key: "calMeter2Coord",
@@ -215,22 +215,17 @@ var FillImageModel = function (_BaseModel) {
215
215
  }
216
216
  }, {
217
217
  key: "buildModels",
218
- value: function buildModels() {
218
+ value: function buildModels(callbackModel) {
219
219
  var _ref3 = this.layer.getLayerConfig(),
220
220
  _ref3$mask = _ref3.mask,
221
221
  mask = _ref3$mask === void 0 ? false : _ref3$mask,
222
222
  _ref3$maskInside = _ref3.maskInside,
223
223
  maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside;
224
224
 
225
- var _this$getShaders = this.getShaders(),
226
- frag = _this$getShaders.frag,
227
- vert = _this$getShaders.vert,
228
- type = _this$getShaders.type;
229
-
230
- return [this.layer.buildLayerModel({
231
- moduleName: type,
232
- vertexShader: vert,
233
- fragmentShader: frag,
225
+ this.layer.buildLayerModel({
226
+ moduleName: 'pointFillImage',
227
+ vertexShader: pointFillVert,
228
+ fragmentShader: pointFillFrag,
234
229
  triangulation: _triangulation.PointFillTriangulation,
235
230
  depth: {
236
231
  enable: false
@@ -241,16 +236,12 @@ var FillImageModel = function (_BaseModel) {
241
236
  enable: true,
242
237
  face: (0, _l7Utils.getCullFace)(this.mapService.version)
243
238
  }
244
- })];
245
- }
246
- }, {
247
- key: "getShaders",
248
- value: function getShaders() {
249
- return {
250
- frag: pointFillFrag,
251
- vert: pointFillVert,
252
- type: 'point_fillImage'
253
- };
239
+ }).then(function (model) {
240
+ callbackModel([model]);
241
+ }).catch(function (err) {
242
+ console.warn(err);
243
+ callbackModel([]);
244
+ });
254
245
  }
255
246
  }, {
256
247
  key: "clearModels",