@antv/l7-layers 2.17.4 → 2.17.6

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 (250) hide show
  1. package/es/Geometry/index.js +9 -31
  2. package/es/Geometry/models/billboard.js +51 -89
  3. package/es/Geometry/models/plane.js +81 -143
  4. package/es/Geometry/models/sprite.js +60 -118
  5. package/es/canvas/index.js +10 -33
  6. package/es/canvas/models/canvas.js +41 -97
  7. package/es/citybuliding/building.js +8 -27
  8. package/es/citybuliding/models/build.js +57 -82
  9. package/es/core/BaseLayer.js +325 -483
  10. package/es/core/BaseModel.js +51 -80
  11. package/es/core/CommonStyleAttribute.js +2 -5
  12. package/es/core/LayerPickService.js +21 -32
  13. package/es/core/TextureService.js +0 -13
  14. package/es/core/interface.js +17 -24
  15. package/es/core/shape/Path.js +13 -20
  16. package/es/core/shape/extrude.js +27 -39
  17. package/es/core/triangulation.js +99 -136
  18. package/es/earth/index.js +9 -33
  19. package/es/earth/models/atmosphere.js +30 -54
  20. package/es/earth/models/base.js +47 -85
  21. package/es/earth/models/bloomsphere.js +30 -54
  22. package/es/earth/utils.js +9 -13
  23. package/es/heatmap/index.js +10 -40
  24. package/es/heatmap/models/grid.js +28 -52
  25. package/es/heatmap/models/grid3d.js +28 -52
  26. package/es/heatmap/models/heatmap.js +92 -149
  27. package/es/heatmap/models/hexagon.js +28 -52
  28. package/es/heatmap/triangulation.js +0 -4
  29. package/es/image/index.js +9 -28
  30. package/es/image/models/image.js +66 -100
  31. package/es/index.js +9 -17
  32. package/es/line/index.js +9 -35
  33. package/es/line/models/arc.js +63 -112
  34. package/es/line/models/arc_3d.js +58 -102
  35. package/es/line/models/earthArc_3d.js +60 -105
  36. package/es/line/models/flow.js +36 -60
  37. package/es/line/models/great_circle.js +53 -94
  38. package/es/line/models/line.js +92 -144
  39. package/es/line/models/linearline.js +42 -74
  40. package/es/line/models/simpleLine.js +38 -67
  41. package/es/line/models/wall.js +52 -92
  42. package/es/line/shaders/dash/line_dash_vert.glsl +1 -2
  43. package/es/line/shaders/line_frag.glsl +1 -3
  44. package/es/line/shaders/line_vert.glsl +2 -0
  45. package/es/line/shaders/linear/line_linear_frag.glsl +1 -1
  46. package/es/mask/index.js +9 -28
  47. package/es/mask/models/fill.js +29 -54
  48. package/es/plugins/DataMappingPlugin.js +78 -114
  49. package/es/plugins/DataSourcePlugin.js +45 -68
  50. package/es/plugins/FeatureScalePlugin.js +67 -122
  51. package/es/plugins/LayerAnimateStylePlugin.js +0 -5
  52. package/es/plugins/LayerMaskPlugin.js +3 -11
  53. package/es/plugins/LayerModelPlugin.js +69 -118
  54. package/es/plugins/LayerStylePlugin.js +4 -9
  55. package/es/plugins/LightingPlugin.js +12 -18
  56. package/es/plugins/MultiPassRendererPlugin.js +11 -16
  57. package/es/plugins/PixelPickingPlugin.js +12 -21
  58. package/es/plugins/RegisterStyleAttributePlugin.js +5 -12
  59. package/es/plugins/ShaderUniformPlugin.js +13 -27
  60. package/es/plugins/UpdateModelPlugin.js +0 -5
  61. package/es/plugins/UpdateStyleAttributePlugin.js +5 -11
  62. package/es/point/index.js +26 -78
  63. package/es/point/models/earthExtrude.js +58 -95
  64. package/es/point/models/earthFill.js +52 -80
  65. package/es/point/models/extrude.js +57 -94
  66. package/es/point/models/fill.js +56 -81
  67. package/es/point/models/fillmage.js +60 -100
  68. package/es/point/models/image.js +47 -83
  69. package/es/point/models/index.js +2 -2
  70. package/es/point/models/normal.js +30 -54
  71. package/es/point/models/radar.js +38 -63
  72. package/es/point/models/simplePoint.js +38 -62
  73. package/es/point/models/text.js +199 -296
  74. package/es/point/shape/extrude.js +4 -13
  75. package/es/polygon/index.js +11 -41
  76. package/es/polygon/models/extrude.js +87 -135
  77. package/es/polygon/models/fill.js +50 -79
  78. package/es/polygon/models/index.js +3 -2
  79. package/es/polygon/models/ocean.js +42 -76
  80. package/es/polygon/models/water.js +37 -71
  81. package/es/raster/buffers/triangulation.js +2 -4
  82. package/es/raster/index.js +9 -32
  83. package/es/raster/models/raster.js +80 -116
  84. package/es/raster/models/rasterRgb.js +84 -127
  85. package/es/raster/models/rasterTerrainRgb.js +56 -84
  86. package/es/tile/interaction/getRasterData.js +14 -20
  87. package/es/tile/interaction/utils.js +7 -9
  88. package/es/tile/manager/base.js +63 -96
  89. package/es/tile/service/TileLayerService.js +33 -55
  90. package/es/tile/service/TilePickService.js +26 -40
  91. package/es/tile/service/TileSourceService.js +3 -7
  92. package/es/tile/tileFactory/DebugTile.js +29 -46
  93. package/es/tile/tileFactory/ImageTile.js +20 -38
  94. package/es/tile/tileFactory/MaskTile.js +22 -43
  95. package/es/tile/tileFactory/RasterRGBTile.js +22 -42
  96. package/es/tile/tileFactory/RasterTerrainRGBTile.js +20 -38
  97. package/es/tile/tileFactory/RasterTile.js +30 -53
  98. package/es/tile/tileFactory/Tile.js +63 -97
  99. package/es/tile/tileFactory/VectorTile.js +41 -68
  100. package/es/tile/tileFactory/index.js +0 -11
  101. package/es/tile/tileFactory/layers/TileDebugLayer.js +6 -27
  102. package/es/tile/tileFactory/util.js +0 -3
  103. package/es/tile/tileLayer/BaseLayer.js +105 -146
  104. package/es/tile/utils.js +1 -1
  105. package/es/utils/blend.js +0 -2
  106. package/es/utils/collision-index.js +9 -16
  107. package/es/utils/extrude_polyline.js +101 -149
  108. package/es/utils/grid-index.js +2 -27
  109. package/es/utils/identityScale.js +0 -8
  110. package/es/utils/layerData.js +30 -44
  111. package/es/utils/multiPassRender.js +11 -13
  112. package/es/utils/polylineNormal.js +31 -37
  113. package/es/utils/simpleLine.js +2 -16
  114. package/es/utils/stencil.js +2 -3
  115. package/es/utils/symbol-layout.js +27 -53
  116. package/es/wind/index.js +9 -29
  117. package/es/wind/models/utils.js +26 -51
  118. package/es/wind/models/wind.js +101 -147
  119. package/es/wind/models/windRender.js +53 -66
  120. package/lib/Geometry/index.js +9 -38
  121. package/lib/Geometry/models/billboard.js +51 -97
  122. package/lib/Geometry/models/index.js +0 -5
  123. package/lib/Geometry/models/plane.js +79 -151
  124. package/lib/Geometry/models/sprite.js +60 -127
  125. package/lib/canvas/index.js +10 -40
  126. package/lib/canvas/models/canvas.js +41 -101
  127. package/lib/canvas/models/index.js +0 -3
  128. package/lib/citybuliding/building.js +8 -35
  129. package/lib/citybuliding/models/build.js +57 -92
  130. package/lib/core/BaseLayer.js +325 -474
  131. package/lib/core/BaseModel.js +51 -90
  132. package/lib/core/CommonStyleAttribute.js +2 -7
  133. package/lib/core/LayerPickService.js +21 -37
  134. package/lib/core/TextureService.js +0 -16
  135. package/lib/core/interface.js +21 -31
  136. package/lib/core/schema.js +0 -1
  137. package/lib/core/shape/Path.js +14 -31
  138. package/lib/core/shape/extrude.js +27 -62
  139. package/lib/core/triangulation.js +98 -177
  140. package/lib/earth/index.js +9 -43
  141. package/lib/earth/models/atmosphere.js +30 -63
  142. package/lib/earth/models/base.js +47 -90
  143. package/lib/earth/models/bloomsphere.js +30 -63
  144. package/lib/earth/utils.js +7 -31
  145. package/lib/heatmap/index.js +10 -48
  146. package/lib/heatmap/models/grid.js +28 -60
  147. package/lib/heatmap/models/grid3d.js +28 -60
  148. package/lib/heatmap/models/heatmap.js +92 -166
  149. package/lib/heatmap/models/hexagon.js +28 -60
  150. package/lib/heatmap/models/index.js +0 -6
  151. package/lib/heatmap/triangulation.js +0 -5
  152. package/lib/image/index.js +9 -36
  153. package/lib/image/models/image.js +66 -109
  154. package/lib/image/models/index.js +0 -3
  155. package/lib/index.js +7 -61
  156. package/lib/line/index.js +9 -40
  157. package/lib/line/models/arc.js +61 -122
  158. package/lib/line/models/arc_3d.js +56 -113
  159. package/lib/line/models/earthArc_3d.js +58 -115
  160. package/lib/line/models/flow.js +36 -70
  161. package/lib/line/models/great_circle.js +53 -104
  162. package/lib/line/models/index.js +0 -11
  163. package/lib/line/models/line.js +90 -152
  164. package/lib/line/models/linearline.js +42 -86
  165. package/lib/line/models/simpleLine.js +38 -77
  166. package/lib/line/models/wall.js +52 -103
  167. package/lib/line/shaders/dash/line_dash_vert.glsl +1 -2
  168. package/lib/line/shaders/line_frag.glsl +1 -3
  169. package/lib/line/shaders/line_vert.glsl +2 -0
  170. package/lib/line/shaders/linear/line_linear_frag.glsl +1 -1
  171. package/lib/mask/index.js +9 -36
  172. package/lib/mask/models/fill.js +29 -63
  173. package/lib/mask/models/index.js +0 -3
  174. package/lib/plugins/DataMappingPlugin.js +78 -125
  175. package/lib/plugins/DataSourcePlugin.js +45 -76
  176. package/lib/plugins/FeatureScalePlugin.js +67 -138
  177. package/lib/plugins/LayerAnimateStylePlugin.js +0 -10
  178. package/lib/plugins/LayerMaskPlugin.js +4 -17
  179. package/lib/plugins/LayerModelPlugin.js +70 -127
  180. package/lib/plugins/LayerStylePlugin.js +5 -14
  181. package/lib/plugins/LightingPlugin.js +12 -25
  182. package/lib/plugins/MultiPassRendererPlugin.js +11 -22
  183. package/lib/plugins/PixelPickingPlugin.js +12 -27
  184. package/lib/plugins/RegisterStyleAttributePlugin.js +5 -19
  185. package/lib/plugins/ShaderUniformPlugin.js +13 -34
  186. package/lib/plugins/UpdateModelPlugin.js +1 -10
  187. package/lib/plugins/UpdateStyleAttributePlugin.js +5 -16
  188. package/lib/point/index.js +26 -83
  189. package/lib/point/models/earthExtrude.js +58 -106
  190. package/lib/point/models/earthFill.js +52 -110
  191. package/lib/point/models/extrude.js +57 -103
  192. package/lib/point/models/fill.js +54 -90
  193. package/lib/point/models/fillmage.js +58 -107
  194. package/lib/point/models/image.js +47 -92
  195. package/lib/point/models/index.js +1 -12
  196. package/lib/point/models/normal.js +30 -64
  197. package/lib/point/models/radar.js +38 -72
  198. package/lib/point/models/simplePoint.js +38 -72
  199. package/lib/point/models/text.js +199 -305
  200. package/lib/point/shape/extrude.js +4 -20
  201. package/lib/polygon/index.js +11 -48
  202. package/lib/polygon/models/extrude.js +87 -146
  203. package/lib/polygon/models/fill.js +50 -89
  204. package/lib/polygon/models/index.js +2 -14
  205. package/lib/polygon/models/ocean.js +42 -88
  206. package/lib/polygon/models/water.js +37 -82
  207. package/lib/raster/buffers/triangulation.js +3 -7
  208. package/lib/raster/index.js +9 -40
  209. package/lib/raster/models/index.js +0 -5
  210. package/lib/raster/models/raster.js +80 -125
  211. package/lib/raster/models/rasterRgb.js +84 -139
  212. package/lib/raster/models/rasterTerrainRgb.js +56 -93
  213. package/lib/tile/interaction/getRasterData.js +14 -25
  214. package/lib/tile/interaction/utils.js +7 -19
  215. package/lib/tile/manager/base.js +63 -104
  216. package/lib/tile/service/TileLayerService.js +33 -60
  217. package/lib/tile/service/TilePickService.js +26 -48
  218. package/lib/tile/service/TileSourceService.js +2 -16
  219. package/lib/tile/style/utils.js +0 -3
  220. package/lib/tile/tileFactory/DebugTile.js +29 -54
  221. package/lib/tile/tileFactory/ImageTile.js +20 -46
  222. package/lib/tile/tileFactory/MaskTile.js +22 -51
  223. package/lib/tile/tileFactory/RasterRGBTile.js +22 -50
  224. package/lib/tile/tileFactory/RasterTerrainRGBTile.js +20 -46
  225. package/lib/tile/tileFactory/RasterTile.js +30 -63
  226. package/lib/tile/tileFactory/Tile.js +63 -102
  227. package/lib/tile/tileFactory/VectorTile.js +41 -76
  228. package/lib/tile/tileFactory/index.js +0 -25
  229. package/lib/tile/tileFactory/layers/TileDebugLayer.js +6 -32
  230. package/lib/tile/tileFactory/util.js +0 -9
  231. package/lib/tile/tileLayer/BaseLayer.js +105 -153
  232. package/lib/tile/utils.js +1 -5
  233. package/lib/utils/blend.js +0 -5
  234. package/lib/utils/collision-index.js +9 -25
  235. package/lib/utils/extrude_polyline.js +101 -181
  236. package/lib/utils/grid-index.js +2 -28
  237. package/lib/utils/identityScale.js +0 -9
  238. package/lib/utils/layerData.js +30 -49
  239. package/lib/utils/multiPassRender.js +11 -16
  240. package/lib/utils/polylineNormal.js +31 -66
  241. package/lib/utils/simpleLine.js +2 -21
  242. package/lib/utils/stencil.js +0 -4
  243. package/lib/utils/symbol-layout.js +27 -55
  244. package/lib/wind/index.js +9 -37
  245. package/lib/wind/models/index.js +0 -3
  246. package/lib/wind/models/utils.js +26 -62
  247. package/lib/wind/models/wind.js +101 -157
  248. package/lib/wind/models/windRender.js +53 -71
  249. package/lib/wind/models/windShader.js +0 -1
  250. package/package.json +7 -7
@@ -1,77 +1,48 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.default = void 0;
9
-
10
8
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
9
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
-
14
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
15
-
16
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
17
-
18
12
  var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
19
-
20
13
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
21
-
22
14
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
23
-
24
15
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
25
-
26
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
27
-
28
17
  var _l7Core = require("@antv/l7-core");
29
-
30
18
  var _l7Utils = require("@antv/l7-utils");
31
-
32
19
  var _lodash = require("lodash");
33
-
34
20
  var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
35
-
36
21
  var _interface = require("../../core/interface");
37
-
38
22
  var _triangulation = require("../../core/triangulation");
39
-
40
23
  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); }; }
41
-
42
24
  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; } }
43
-
44
25
  /* babel-plugin-inline-import '../shaders/linearLine/line_linear_frag.glsl' */
45
26
  var linear_line_frag = "\nvarying vec4 v_Color;\n#pragma include \"picking\"\nvoid main() {\n\n gl_FragColor = v_Color; // \u5168\u5C40\u900F\u660E\u5EA6\n gl_FragColor = filterColor(gl_FragColor);\n}\n";
46
-
47
27
  /* babel-plugin-inline-import '../shaders/linearLine/line_linear_vert.glsl' */
48
28
  var linear_line_vert = "\nattribute float a_Miter;\nattribute vec2 a_Size;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\n// dash line\nattribute float a_Total_Distance;\nattribute vec2 a_DistanceAndIndex;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_heightfixed: 0.0;\nuniform float u_vertexScale: 1.0;\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity : 1.0;\nuniform sampler2D u_texture;\nuniform float u_linearDir: 1.0;\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n\n\n vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);\n \n vec2 offset = project_pixel(size.xy);\n\n float lineDistance = a_DistanceAndIndex.x;\n float currentLinePointRatio = lineDistance / a_Total_Distance;\n \n\n float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // \u7EBF\u6A2A\u5411\u504F\u79FB\u7684\u8DDD\u79BB\uFF08\u5411\u4E24\u4FA7\u504F\u79FB\u7684\u548C\uFF09\n float linePixelSize = project_pixel(a_Size.x) * 2.0; // \u5B9A\u70B9\u4F4D\u7F6E\u504F\u79FB\uFF0C\u6309\u5730\u56FE\u7B49\u7EA7\u7F29\u653E\u540E\u7684\u8DDD\u79BB \u5355\u4FA7 * 2\n float texV = lineOffsetWidth/linePixelSize; // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n float linearRadio =currentLinePointRatio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n if(u_linearDir < 1.0) {\n linearRadio = texV;\n }\n\n v_Color = texture2D(u_texture, vec2(linearRadio, 0.5));\n\n v_Color.a *= u_opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n\n\n\n vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));\n\n float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5 vertex height\n float lineHeight = a_Size.y; // size \u7B2C\u4E8C\u4E2A\u53C2\u6570\u4EE3\u8868\u7684\u9AD8\u5EA6 [linewidth, lineheight]\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n lineHeight *= 0.2; // \u4FDD\u6301\u548C amap/mapbox \u4E00\u81F4\u7684\u6548\u679C\n h *= 0.2;\n if(u_heightfixed < 1.0) {\n lineHeight = project_pixel(a_Size.y);\n }\n gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));\n } else {\n // mapbox - amap\n \n // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n // mapbox\n // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n h *= mapboxZoomScale;\n h += u_raisingHeight * mapboxZoomScale;\n if(u_heightfixed > 0.0) {\n lineHeight *= mapboxZoomScale;\n }\n \n } else {\n // amap\n h += u_raisingHeight;\n // lineHeight \u9876\u70B9\u504F\u79FB\u9AD8\u5EA6\n if(u_heightfixed < 1.0) {\n lineHeight *= pow(2.0, 20.0 - u_Zoom);\n }\n }\n\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));\n }\n\n setPickingColor(a_PickingColor);\n}\n";
49
-
50
29
  var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
51
30
  (0, _inherits2.default)(LinearLineModel, _BaseModel);
52
-
53
31
  var _super = _createSuper(LinearLineModel);
54
-
55
32
  function LinearLineModel() {
56
33
  var _this;
57
-
58
34
  (0, _classCallCheck2.default)(this, LinearLineModel);
59
-
60
35
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
61
36
  args[_key] = arguments[_key];
62
37
  }
63
-
64
38
  _this = _super.call.apply(_super, [this].concat(args));
65
39
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateTexture", function () {
66
40
  var createTexture2D = _this.rendererService.createTexture2D;
67
-
68
41
  if (_this.colorTexture) {
69
42
  _this.colorTexture.destroy();
70
43
  }
71
-
72
44
  var _ref = _this.layer.getLayerConfig(),
73
- rampColors = _ref.rampColors;
74
-
45
+ rampColors = _ref.rampColors;
75
46
  var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
76
47
  _this.colorTexture = createTexture2D({
77
48
  data: new Uint8Array(imageData.data),
@@ -86,32 +57,30 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
86
57
  });
87
58
  return _this;
88
59
  }
89
-
90
60
  (0, _createClass2.default)(LinearLineModel, [{
91
61
  key: "getUninforms",
92
62
  value: function getUninforms() {
93
63
  var _ref2 = this.layer.getLayerConfig(),
94
- _ref2$opacity = _ref2.opacity,
95
- opacity = _ref2$opacity === void 0 ? 1 : _ref2$opacity,
96
- _ref2$vertexHeightSca = _ref2.vertexHeightScale,
97
- vertexHeightScale = _ref2$vertexHeightSca === void 0 ? 20.0 : _ref2$vertexHeightSca,
98
- _ref2$raisingHeight = _ref2.raisingHeight,
99
- raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight,
100
- _ref2$heightfixed = _ref2.heightfixed,
101
- heightfixed = _ref2$heightfixed === void 0 ? false : _ref2$heightfixed,
102
- _ref2$linearDir = _ref2.linearDir,
103
- linearDir = _ref2$linearDir === void 0 ? _interface.LinearDir.VERTICAL : _ref2$linearDir;
104
-
64
+ _ref2$opacity = _ref2.opacity,
65
+ opacity = _ref2$opacity === void 0 ? 1 : _ref2$opacity,
66
+ _ref2$vertexHeightSca = _ref2.vertexHeightScale,
67
+ vertexHeightScale = _ref2$vertexHeightSca === void 0 ? 20.0 : _ref2$vertexHeightSca,
68
+ _ref2$raisingHeight = _ref2.raisingHeight,
69
+ raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight,
70
+ _ref2$heightfixed = _ref2.heightfixed,
71
+ heightfixed = _ref2$heightfixed === void 0 ? false : _ref2$heightfixed,
72
+ _ref2$linearDir = _ref2.linearDir,
73
+ linearDir = _ref2$linearDir === void 0 ? _interface.LinearDir.VERTICAL : _ref2$linearDir;
105
74
  if (this.rendererService.getDirty()) {
106
75
  this.colorTexture.bind();
107
76
  }
108
-
109
77
  return {
110
78
  u_linearDir: linearDir === _interface.LinearDir.VERTICAL ? 1.0 : 0.0,
111
79
  u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
112
80
  // 纹理支持参数
113
81
  u_texture: this.colorTexture,
114
82
  // 贴图
83
+
115
84
  // 是否固定高度
116
85
  u_heightfixed: Number(heightfixed),
117
86
  // 顶点高度 scale
@@ -124,31 +93,25 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
124
93
  value: function () {
125
94
  var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
126
95
  return _regenerator.default.wrap(function _callee$(_context) {
127
- while (1) {
128
- switch (_context.prev = _context.next) {
129
- case 0:
130
- this.updateTexture();
131
- return _context.abrupt("return", this.buildModels());
132
-
133
- case 2:
134
- case "end":
135
- return _context.stop();
136
- }
96
+ while (1) switch (_context.prev = _context.next) {
97
+ case 0:
98
+ this.updateTexture();
99
+ return _context.abrupt("return", this.buildModels());
100
+ case 2:
101
+ case "end":
102
+ return _context.stop();
137
103
  }
138
104
  }, _callee, this);
139
105
  }));
140
-
141
106
  function initModels() {
142
107
  return _initModels.apply(this, arguments);
143
108
  }
144
-
145
109
  return initModels;
146
110
  }()
147
111
  }, {
148
112
  key: "clearModels",
149
113
  value: function clearModels() {
150
114
  var _this$colorTexture;
151
-
152
115
  (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
153
116
  }
154
117
  }, {
@@ -156,40 +119,33 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
156
119
  value: function () {
157
120
  var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
158
121
  var _ref3, _ref3$depth, depth, model;
159
-
160
122
  return _regenerator.default.wrap(function _callee2$(_context2) {
161
- while (1) {
162
- switch (_context2.prev = _context2.next) {
163
- case 0:
164
- _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
165
- this.layer.triangulation = _triangulation.LineTriangulation;
166
- _context2.next = 4;
167
- return this.layer.buildLayerModel({
168
- moduleName: 'lineRampColors',
169
- vertexShader: linear_line_vert,
170
- fragmentShader: linear_line_frag,
171
- triangulation: _triangulation.LineTriangulation,
172
- depth: {
173
- enable: depth
174
- }
175
- });
176
-
177
- case 4:
178
- model = _context2.sent;
179
- return _context2.abrupt("return", [model]);
180
-
181
- case 6:
182
- case "end":
183
- return _context2.stop();
184
- }
123
+ while (1) switch (_context2.prev = _context2.next) {
124
+ case 0:
125
+ _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
126
+ this.layer.triangulation = _triangulation.LineTriangulation;
127
+ _context2.next = 4;
128
+ return this.layer.buildLayerModel({
129
+ moduleName: 'lineRampColors',
130
+ vertexShader: linear_line_vert,
131
+ fragmentShader: linear_line_frag,
132
+ triangulation: _triangulation.LineTriangulation,
133
+ depth: {
134
+ enable: depth
135
+ }
136
+ });
137
+ case 4:
138
+ model = _context2.sent;
139
+ return _context2.abrupt("return", [model]);
140
+ case 6:
141
+ case "end":
142
+ return _context2.stop();
185
143
  }
186
144
  }, _callee2, this);
187
145
  }));
188
-
189
146
  function buildModels() {
190
147
  return _buildModels.apply(this, arguments);
191
148
  }
192
-
193
149
  return buildModels;
194
150
  }()
195
151
  }, {
@@ -243,12 +199,13 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
243
199
  size: 2,
244
200
  update: function update(feature) {
245
201
  var _feature$size = feature.size,
246
- size = _feature$size === void 0 ? 1 : _feature$size;
202
+ size = _feature$size === void 0 ? 1 : _feature$size;
247
203
  return Array.isArray(size) ? [size[0], size[1]] : [size, 0];
248
204
  }
249
205
  }
250
- }); // point layer size;
206
+ });
251
207
 
208
+ // point layer size;
252
209
  this.styleAttributeService.registerStyleAttribute({
253
210
  name: 'normal',
254
211
  type: _l7Core.AttributeType.Attribute,
@@ -287,5 +244,4 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
287
244
  }]);
288
245
  return LinearLineModel;
289
246
  }(_BaseModel2.default);
290
-
291
247
  exports.default = LinearLineModel;
@@ -1,82 +1,57 @@
1
1
  "use strict";
2
2
 
3
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports.default = void 0;
9
-
10
8
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
-
12
9
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
-
14
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
15
-
16
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
17
-
18
12
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
19
-
20
13
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
21
-
22
14
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
23
-
24
15
  var _l7Core = require("@antv/l7-core");
25
-
26
16
  var _l7Utils = require("@antv/l7-utils");
27
-
28
17
  var _lodash = require("lodash");
29
-
30
18
  var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
31
-
32
19
  var _triangulation = require("../../core/triangulation");
33
-
34
20
  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); }; }
35
-
36
21
  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; } }
37
-
38
22
  /* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
39
23
  var simple_line_frag = "\nvarying vec4 v_color;\nvoid main() {\n gl_FragColor = v_color;\n\n}\n"; // linear simple line shader
40
-
41
24
  /* babel-plugin-inline-import '../shaders/simple/simpleline_linear_frag.glsl' */
42
25
  var simle_linear_frag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float opacity;\nvoid main() {\n gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n gl_FragColor.a *= opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n}\n";
43
-
44
26
  /* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
45
27
  var simple_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Position;\n\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_opacity: 1.0;\nuniform float u_vertexScale: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\n\n\n#pragma include \"projection\"\n\nvarying vec4 v_color;\nvarying float v_distanceScale;\n\nvoid main() {\n\n v_color = a_Color; \n v_distanceScale = a_Distance / a_Total_Distance;\n v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); \n vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_Size.y) + h * 0.2, 1.0));\n } else {\n float lineHeight = a_Size.y;\n // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n }\n\n // #define COORDINATE_SYSTEM_P20 5.0\n // #define COORDINATE_SYSTEM_P20_OFFSET 6.0\n // amap1.x\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n lineHeight *= pow(2.0, 20.0 - u_Zoom);\n }\n\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n gl_PointSize = 10.0;\n }\n}\n";
46
-
47
28
  var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
48
29
  (0, _inherits2.default)(SimpleLineModel, _BaseModel);
49
-
50
30
  var _super = _createSuper(SimpleLineModel);
51
-
52
31
  function SimpleLineModel() {
53
32
  (0, _classCallCheck2.default)(this, SimpleLineModel);
54
33
  return _super.apply(this, arguments);
55
34
  }
56
-
57
35
  (0, _createClass2.default)(SimpleLineModel, [{
58
36
  key: "getUninforms",
59
37
  value: function getUninforms() {
60
38
  var _ref = this.layer.getLayerConfig(),
61
- _ref$opacity = _ref.opacity,
62
- opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
63
- sourceColor = _ref.sourceColor,
64
- targetColor = _ref.targetColor,
65
- _ref$vertexHeightScal = _ref.vertexHeightScale,
66
- vertexHeightScale = _ref$vertexHeightScal === void 0 ? 20.0 : _ref$vertexHeightScal; // 转化渐变色
67
-
68
-
39
+ _ref$opacity = _ref.opacity,
40
+ opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
41
+ sourceColor = _ref.sourceColor,
42
+ targetColor = _ref.targetColor,
43
+ _ref$vertexHeightScal = _ref.vertexHeightScale,
44
+ vertexHeightScale = _ref$vertexHeightScal === void 0 ? 20.0 : _ref$vertexHeightScal;
45
+
46
+ // 转化渐变色
69
47
  var useLinearColor = 0; // 默认不生效
70
-
71
48
  var sourceColorArr = [0, 0, 0, 0];
72
49
  var targetColorArr = [0, 0, 0, 0];
73
-
74
50
  if (sourceColor && targetColor) {
75
51
  sourceColorArr = (0, _l7Utils.rgb2arr)(sourceColor);
76
52
  targetColorArr = (0, _l7Utils.rgb2arr)(targetColor);
77
53
  useLinearColor = 1;
78
54
  }
79
-
80
55
  return {
81
56
  u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1,
82
57
  // 渐变色支持参数
@@ -92,32 +67,26 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
92
67
  value: function () {
93
68
  var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
94
69
  return _regenerator.default.wrap(function _callee$(_context) {
95
- while (1) {
96
- switch (_context.prev = _context.next) {
97
- case 0:
98
- return _context.abrupt("return", this.buildModels());
99
-
100
- case 1:
101
- case "end":
102
- return _context.stop();
103
- }
70
+ while (1) switch (_context.prev = _context.next) {
71
+ case 0:
72
+ return _context.abrupt("return", this.buildModels());
73
+ case 1:
74
+ case "end":
75
+ return _context.stop();
104
76
  }
105
77
  }, _callee, this);
106
78
  }));
107
-
108
79
  function initModels() {
109
80
  return _initModels.apply(this, arguments);
110
81
  }
111
-
112
82
  return initModels;
113
83
  }()
114
84
  }, {
115
85
  key: "getShaders",
116
86
  value: function getShaders() {
117
87
  var _ref2 = this.layer.getLayerConfig(),
118
- sourceColor = _ref2.sourceColor,
119
- targetColor = _ref2.targetColor;
120
-
88
+ sourceColor = _ref2.sourceColor,
89
+ targetColor = _ref2.targetColor;
121
90
  if (sourceColor && targetColor) {
122
91
  // 分离 linear 功能
123
92
  return {
@@ -138,41 +107,34 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
138
107
  value: function () {
139
108
  var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
140
109
  var _this$getShaders, frag, vert, type, model;
141
-
142
110
  return _regenerator.default.wrap(function _callee2$(_context2) {
143
- while (1) {
144
- switch (_context2.prev = _context2.next) {
145
- case 0:
146
- _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
147
- _context2.next = 3;
148
- return this.layer.buildLayerModel({
149
- moduleName: type,
150
- vertexShader: vert,
151
- fragmentShader: frag,
152
- triangulation: _triangulation.SimpleLineTriangulation,
153
- primitive: _l7Core.gl.LINES,
154
- depth: {
155
- enable: false
156
- },
157
- pick: false
158
- });
159
-
160
- case 3:
161
- model = _context2.sent;
162
- return _context2.abrupt("return", [model]);
163
-
164
- case 5:
165
- case "end":
166
- return _context2.stop();
167
- }
111
+ while (1) switch (_context2.prev = _context2.next) {
112
+ case 0:
113
+ _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
114
+ _context2.next = 3;
115
+ return this.layer.buildLayerModel({
116
+ moduleName: type,
117
+ vertexShader: vert,
118
+ fragmentShader: frag,
119
+ triangulation: _triangulation.SimpleLineTriangulation,
120
+ primitive: _l7Core.gl.LINES,
121
+ depth: {
122
+ enable: false
123
+ },
124
+ pick: false
125
+ });
126
+ case 3:
127
+ model = _context2.sent;
128
+ return _context2.abrupt("return", [model]);
129
+ case 5:
130
+ case "end":
131
+ return _context2.stop();
168
132
  }
169
133
  }, _callee2, this);
170
134
  }));
171
-
172
135
  function buildModels() {
173
136
  return _buildModels.apply(this, arguments);
174
137
  }
175
-
176
138
  return buildModels;
177
139
  }()
178
140
  }, {
@@ -226,7 +188,7 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
226
188
  size: 2,
227
189
  update: function update(feature) {
228
190
  var _feature$size = feature.size,
229
- size = _feature$size === void 0 ? 1 : _feature$size;
191
+ size = _feature$size === void 0 ? 1 : _feature$size;
230
192
  return Array.isArray(size) ? [size[0], size[1]] : [size, 0];
231
193
  }
232
194
  }
@@ -235,5 +197,4 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
235
197
  }]);
236
198
  return SimpleLineModel;
237
199
  }(_BaseModel2.default);
238
-
239
200
  exports.default = SimpleLineModel;