@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
@@ -7,91 +7,72 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
7
7
  import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
8
8
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
9
9
  import _regeneratorRuntime from "@babel/runtime/regenerator";
10
-
11
10
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
12
-
13
11
  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; } }
14
-
15
12
  import { AttributeType, gl } from '@antv/l7-core';
16
13
  import { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';
17
14
  import { isNumber } from 'lodash';
18
15
  import BaseModel from "../../core/BaseModel";
19
16
  import { PointExtrudeTriangulation } from "../../core/triangulation";
20
17
  import { lglt2xyz } from "../../earth/utils";
21
-
22
18
  /* babel-plugin-inline-import '../shaders/earth/extrude_frag.glsl' */
23
19
  var pointExtrudeFrag = "varying vec4 v_color;\nuniform float u_opacity: 1.0;\n\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\n\nuniform float u_linearColor: 0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\nuniform float u_opacitylinear: 0.0;\nuniform float u_opacitylinear_dir: 1.0;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\nvoid main() {\n\n gl_FragColor = v_color;\n\n // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n if(u_opacitylinear > 0.0) {\n gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - v_barLinearZ): v_barLinearZ;\n }\n\n // picking\n if(u_pickLight > 0.0) {\n gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);\n } else {\n gl_FragColor = filterColor(gl_FragColor);\n }\n}\n";
24
-
25
20
  /* babel-plugin-inline-import '../shaders/earth/extrude_vert.glsl' */
26
21
  var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_globel;\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\n// \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n if(x > 0.0 && z > 0.0) {\n return atan(x/z);\n } else if(x > 0.0 && z <= 0.0){\n return atan(-z/x) + pi/2.0;\n } else if(x <= 0.0 && z <= 0.0) {\n return pi + atan(x/z); //atan(x/z) + \n } else {\n return atan(z/-x) + pi*3.0/2.0;\n }\n}\n\nfloat getXRadian(float y, float r) {\n return atan(y/r);\n}\n\nvoid main() {\n\n \n float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n textureOffset = opacityAndOffset.g;\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n vec3 size = a_Size * a_Position;\n\n // a_Position.z \u662F\u5728\u6784\u5EFA\u7F51\u683C\u7684\u65F6\u5019\u4F20\u5165\u7684\u6807\u51C6\u503C 0 - 1\uFF0C\u5728\u63D2\u503C\u5668\u63D2\u503C\u53EF\u4EE5\u83B7\u53D6 0\uFF5E1 \u7EBF\u6027\u6E10\u53D8\u7684\u503C\n v_barLinearZ = a_Position.z;\n\n vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n \n if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n offset = offset * pow(2.0, (19.0 - u_Zoom));\n }\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n }\n } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n }\n }\n\n\n vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n // \u5706\u67F1\u5149\u7167\u6548\u679C\n float lightWeight = 1.0;\n if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n lightWeight = calc_lighting(pos);\n }\n v_lightWeight = lightWeight;\n // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n v_color = mix(u_sourceColor, u_targetColor, barLinearZ);\n v_color.rgb *= lightWeight;\n } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n v_color = a_Color;\n }\n v_color.a *= u_opacity;\n\n \n // \u5728\u5730\u7403\u6A21\u5F0F\u4E0B\uFF0C\u5C06\u539F\u672C\u5782\u76F4\u4E8E xy \u5E73\u9762\u7684\u5706\u67F1\u8C03\u6574\u59FF\u6001\u5230\u9002\u5E94\u5706\u7684\u89D2\u5EA6\n //\u65CB\u8F6C\u77E9\u9635mx\uFF0C\u521B\u5EFA\u7ED5x\u8F74\u65CB\u8F6C\u77E9\u9635\n float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);\n float xRadian = getXRadian(a_Pos.y, r);\n float xcos = cos(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n float xsin = sin(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n mat4 mx = mat4(\n 1,0,0,0, \n 0,xcos,-xsin,0, \n 0,xsin,xcos,0, \n 0,0,0,1);\n\n //\u65CB\u8F6C\u77E9\u9635my\uFF0C\u521B\u5EFA\u7ED5y\u8F74\u65CB\u8F6C\u77E9\u9635\n float yRadian = getYRadian(a_Pos.x, a_Pos.z);\n float ycos = cos(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n float ysin = sin(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n mat4 my = mat4(\n ycos,0,-ysin,0, \n 0,1,0,0, \n ysin,0,ycos,0, \n 0,0,0,1);\n\n gl_Position = u_ViewProjectionMatrix * vec4(( my * mx * vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);\n \n\n setPickingColor(a_PickingColor);\n}\n";
27
-
28
22
  var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
29
23
  _inherits(ExtrudeModel, _BaseModel);
30
-
31
24
  var _super = _createSuper(ExtrudeModel);
32
-
33
25
  function ExtrudeModel() {
34
26
  var _this;
35
-
36
27
  _classCallCheck(this, ExtrudeModel);
37
-
38
28
  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
39
29
  args[_key] = arguments[_key];
40
30
  }
41
-
42
31
  _this = _super.call.apply(_super, [this].concat(args));
43
-
44
32
  _defineProperty(_assertThisInitialized(_this), "raiseCount", 0);
45
-
46
33
  _defineProperty(_assertThisInitialized(_this), "raiseRepeat", 0);
47
-
48
34
  return _this;
49
35
  }
50
-
51
36
  _createClass(ExtrudeModel, [{
52
37
  key: "getUninforms",
53
38
  value: function getUninforms() {
54
39
  var _ref = this.layer.getLayerConfig(),
55
- _ref$animateOption = _ref.animateOption,
56
- animateOption = _ref$animateOption === void 0 ? {
57
- enable: false,
58
- speed: 0.01,
59
- repeat: false
60
- } : _ref$animateOption,
61
- _ref$opacity = _ref.opacity,
62
- opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
63
- sourceColor = _ref.sourceColor,
64
- targetColor = _ref.targetColor,
65
- _ref$pickLight = _ref.pickLight,
66
- pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
67
- _ref$heightfixed = _ref.heightfixed,
68
- heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
69
- _ref$opacityLinear = _ref.opacityLinear,
70
- opacityLinear = _ref$opacityLinear === void 0 ? {
71
- enable: false,
72
- dir: 'up'
73
- } : _ref$opacityLinear,
74
- _ref$lightEnable = _ref.lightEnable,
75
- lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable; // 转化渐变色
76
-
77
-
40
+ _ref$animateOption = _ref.animateOption,
41
+ animateOption = _ref$animateOption === void 0 ? {
42
+ enable: false,
43
+ speed: 0.01,
44
+ repeat: false
45
+ } : _ref$animateOption,
46
+ _ref$opacity = _ref.opacity,
47
+ opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
48
+ sourceColor = _ref.sourceColor,
49
+ targetColor = _ref.targetColor,
50
+ _ref$pickLight = _ref.pickLight,
51
+ pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
52
+ _ref$heightfixed = _ref.heightfixed,
53
+ heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
54
+ _ref$opacityLinear = _ref.opacityLinear,
55
+ opacityLinear = _ref$opacityLinear === void 0 ? {
56
+ enable: false,
57
+ dir: 'up'
58
+ } : _ref$opacityLinear,
59
+ _ref$lightEnable = _ref.lightEnable,
60
+ lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable;
61
+
62
+ // 转化渐变色
78
63
  var useLinearColor = 0; // 默认不生效
79
-
80
64
  var sourceColorArr = [0, 0, 0, 0];
81
65
  var targetColorArr = [0, 0, 0, 0];
82
-
83
66
  if (sourceColor && targetColor) {
84
67
  sourceColorArr = rgb2arr(sourceColor);
85
68
  targetColorArr = rgb2arr(targetColor);
86
69
  useLinearColor = 1;
87
70
  }
88
-
89
71
  if (this.raiseCount < 1 && this.raiseRepeat > 0) {
90
72
  if (animateOption.enable) {
91
73
  var _animateOption$speed = animateOption.speed,
92
- speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
74
+ speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
93
75
  this.raiseCount += speed;
94
-
95
76
  if (this.raiseCount >= 1) {
96
77
  if (this.raiseRepeat > 1) {
97
78
  this.raiseCount = 0;
@@ -102,7 +83,6 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
102
83
  }
103
84
  }
104
85
  }
105
-
106
86
  return {
107
87
  // 圆柱体的拾取高亮是否要计算光照
108
88
  u_pickLight: Number(pickLight),
@@ -126,23 +106,18 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
126
106
  value: function () {
127
107
  var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
128
108
  return _regeneratorRuntime.wrap(function _callee$(_context) {
129
- while (1) {
130
- switch (_context.prev = _context.next) {
131
- case 0:
132
- return _context.abrupt("return", this.buildModels());
133
-
134
- case 1:
135
- case "end":
136
- return _context.stop();
137
- }
109
+ while (1) switch (_context.prev = _context.next) {
110
+ case 0:
111
+ return _context.abrupt("return", this.buildModels());
112
+ case 1:
113
+ case "end":
114
+ return _context.stop();
138
115
  }
139
116
  }, _callee, this);
140
117
  }));
141
-
142
118
  function initModels() {
143
119
  return _initModels.apply(this, arguments);
144
120
  }
145
-
146
121
  return initModels;
147
122
  }()
148
123
  }, {
@@ -150,46 +125,39 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
150
125
  value: function () {
151
126
  var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
152
127
  var _ref2, _ref2$animateOption$r, repeat, model;
153
-
154
128
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
155
- while (1) {
156
- switch (_context2.prev = _context2.next) {
157
- case 0:
158
- // GAODE1.x GAODE2.x MAPBOX
159
- _ref2 = this.layer.getLayerConfig(), _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
160
- this.raiseRepeat = repeat;
161
- _context2.next = 4;
162
- return this.layer.buildLayerModel({
163
- moduleName: 'pointEarthExtrude',
164
- vertexShader: pointExtrudeVert,
165
- fragmentShader: pointExtrudeFrag,
166
- triangulation: PointExtrudeTriangulation,
167
- depth: {
168
- enable: true
169
- },
170
- cull: {
171
- enable: true,
172
- face: getCullFace(this.mapService.version)
173
- },
174
- blend: this.getBlend()
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
- }
129
+ while (1) switch (_context2.prev = _context2.next) {
130
+ case 0:
131
+ // GAODE1.x GAODE2.x MAPBOX
132
+ _ref2 = this.layer.getLayerConfig(), _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
133
+ this.raiseRepeat = repeat;
134
+ _context2.next = 4;
135
+ return this.layer.buildLayerModel({
136
+ moduleName: 'pointEarthExtrude',
137
+ vertexShader: pointExtrudeVert,
138
+ fragmentShader: pointExtrudeFrag,
139
+ triangulation: PointExtrudeTriangulation,
140
+ depth: {
141
+ enable: true
142
+ },
143
+ cull: {
144
+ enable: true,
145
+ face: getCullFace(this.mapService.version)
146
+ },
147
+ blend: this.getBlend()
148
+ });
149
+ case 4:
150
+ model = _context2.sent;
151
+ return _context2.abrupt("return", [model]);
152
+ case 6:
153
+ case "end":
154
+ return _context2.stop();
185
155
  }
186
156
  }, _callee2, this);
187
157
  }));
188
-
189
158
  function buildModels() {
190
159
  return _buildModels.apply(this, arguments);
191
160
  }
192
-
193
161
  return buildModels;
194
162
  }()
195
163
  }, {
@@ -208,26 +176,23 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
208
176
  size: 3,
209
177
  update: function update(feature) {
210
178
  var size = feature.size;
211
-
212
179
  if (size) {
213
180
  var buffersize = [];
214
-
215
181
  if (Array.isArray(size)) {
216
182
  buffersize = size.length === 2 ? [size[0], size[0], size[1]] : size;
217
183
  }
218
-
219
184
  if (!Array.isArray(size)) {
220
185
  buffersize = [size, size, size];
221
186
  }
222
-
223
187
  return buffersize;
224
188
  } else {
225
189
  return [2, 2, 2];
226
190
  }
227
191
  }
228
192
  }
229
- }); // point layer size;
193
+ });
230
194
 
195
+ // point layer size;
231
196
  this.styleAttributeService.registerStyleAttribute({
232
197
  name: 'normal',
233
198
  type: AttributeType.Attribute,
@@ -264,8 +229,6 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
264
229
  });
265
230
  }
266
231
  }]);
267
-
268
232
  return ExtrudeModel;
269
233
  }(BaseModel);
270
-
271
234
  export { ExtrudeModel as default };
@@ -7,69 +7,57 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
7
7
  import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
8
8
  import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
9
9
  import _regeneratorRuntime from "@babel/runtime/regenerator";
10
-
11
10
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
12
-
13
11
  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; } }
14
-
15
12
  import { AttributeType, gl } from '@antv/l7-core';
16
13
  import BaseModel from "../../core/BaseModel";
17
14
  import { GlobelPointFillTriangulation } from "../../core/triangulation";
18
-
19
15
  /* babel-plugin-inline-import '../shaders/earth/fill_frag.glsl' */
20
16
  var pointFillFrag = "uniform float u_additive;\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n int shape = int(floor(v_data.w + 0.5));\n\n vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n lowp float antialiasblur = v_data.z;\n float r = v_radius / (v_radius + strokeWidth);\n\n float outer_df;\n float inner_df;\n // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n if (shape == 0) {\n outer_df = sdCircle(v_data.xy, 1.0);\n inner_df = sdCircle(v_data.xy, r);\n } else if (shape == 1) {\n outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n } else if (shape == 2) {\n outer_df = sdBox(v_data.xy, vec2(1.));\n inner_df = sdBox(v_data.xy, vec2(r));\n } else if (shape == 3) {\n outer_df = sdPentagon(v_data.xy, 0.8);\n inner_df = sdPentagon(v_data.xy, r * 0.8);\n } else if (shape == 4) {\n outer_df = sdHexagon(v_data.xy, 0.8);\n inner_df = sdHexagon(v_data.xy, r * 0.8);\n } else if (shape == 5) {\n outer_df = sdOctogon(v_data.xy, 1.0);\n inner_df = sdOctogon(v_data.xy, r);\n } else if (shape == 6) {\n outer_df = sdHexagram(v_data.xy, 0.52);\n inner_df = sdHexagram(v_data.xy, r * 0.52);\n } else if (shape == 7) {\n outer_df = sdRhombus(v_data.xy, vec2(1.0));\n inner_df = sdRhombus(v_data.xy, vec2(r));\n } else if (shape == 8) {\n outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n }\n\n if(outer_df > antialiasblur + 0.018) discard;\n\n float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n antialiasblur,\n 0.0,\n inner_df\n );\n\n if(strokeWidth < 0.01) {\n gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n } else {\n gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);\n }\n\n if(u_additive > 0.0) {\n gl_FragColor *= opacity_t;\n gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n } else {\n gl_FragColor.a *= opacity_t;\n gl_FragColor = filterColor(gl_FragColor);\n }\n}\n";
21
-
22
17
  /* babel-plugin-inline-import '../shaders/earth/fill_vert.glsl' */
23
18
  var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n vec3 extrude = a_Extrude;\n float shape_type = a_Shape;\n /*\n * setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n */\n float newSize = setPickingSize(a_Size);\n // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n // unpack color(vec2)\n v_color = a_Color;\n\n // radius(16-bit)\n v_radius = newSize;\n\n // anti-alias\n // float antialiased_blur = -max(u_blur, antialiasblur);\n float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + u_offsets, 1.0);\n\n setPickingColor(a_PickingColor);\n}\n";
24
19
  import { rgb2arr } from '@antv/l7-utils';
25
20
  import { mat4, vec3 } from 'gl-matrix';
26
-
27
21
  var FillModel = /*#__PURE__*/function (_BaseModel) {
28
22
  _inherits(FillModel, _BaseModel);
29
-
30
23
  var _super = _createSuper(FillModel);
31
-
32
24
  function FillModel() {
33
25
  _classCallCheck(this, FillModel);
34
-
35
26
  return _super.apply(this, arguments);
36
27
  }
37
-
38
28
  _createClass(FillModel, [{
39
29
  key: "getUninforms",
40
30
  value: function getUninforms() {
41
31
  var _ref = this.layer.getLayerConfig(),
42
- _ref$opacity = _ref.opacity,
43
- opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
44
- _ref$strokeOpacity = _ref.strokeOpacity,
45
- strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
46
- _ref$strokeWidth = _ref.strokeWidth,
47
- strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
48
- _ref$stroke = _ref.stroke,
49
- stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
50
- blend = _ref.blend,
51
- _ref$blur = _ref.blur,
52
- blur = _ref$blur === void 0 ? 0 : _ref$blur;
53
-
32
+ _ref$opacity = _ref.opacity,
33
+ opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
34
+ _ref$strokeOpacity = _ref.strokeOpacity,
35
+ strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
36
+ _ref$strokeWidth = _ref.strokeWidth,
37
+ strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
38
+ _ref$stroke = _ref.stroke,
39
+ stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
40
+ blend = _ref.blend,
41
+ _ref$blur = _ref.blur,
42
+ blur = _ref$blur === void 0 ? 0 : _ref$blur;
54
43
  return {
55
44
  u_blur: blur,
56
45
  u_additive: blend === 'additive' ? 1.0 : 0.0,
57
46
  u_opacity: opacity,
58
47
  u_stroke_opacity: strokeOpacity,
59
48
  u_stroke_width: strokeWidth,
60
- u_stroke_color: rgb2arr(stroke) // u_offsets: offsets,
61
-
49
+ u_stroke_color: rgb2arr(stroke)
50
+ // u_offsets: offsets,
62
51
  };
63
52
  }
64
53
  }, {
65
54
  key: "getAnimateUniforms",
66
55
  value: function getAnimateUniforms() {
67
56
  var _ref2 = this.layer.getLayerConfig(),
68
- _ref2$animateOption = _ref2.animateOption,
69
- animateOption = _ref2$animateOption === void 0 ? {
70
- enable: false
71
- } : _ref2$animateOption;
72
-
57
+ _ref2$animateOption = _ref2.animateOption,
58
+ animateOption = _ref2$animateOption === void 0 ? {
59
+ enable: false
60
+ } : _ref2$animateOption;
73
61
  return {
74
62
  u_animate: this.animateOption2Array(animateOption),
75
63
  u_time: this.layer.getLayerAnimateTime()
@@ -80,23 +68,18 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
80
68
  value: function () {
81
69
  var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
82
70
  return _regeneratorRuntime.wrap(function _callee$(_context) {
83
- while (1) {
84
- switch (_context.prev = _context.next) {
85
- case 0:
86
- return _context.abrupt("return", this.buildModels());
87
-
88
- case 1:
89
- case "end":
90
- return _context.stop();
91
- }
71
+ while (1) switch (_context.prev = _context.next) {
72
+ case 0:
73
+ return _context.abrupt("return", this.buildModels());
74
+ case 1:
75
+ case "end":
76
+ return _context.stop();
92
77
  }
93
78
  }, _callee, this);
94
79
  }));
95
-
96
80
  function initModels() {
97
81
  return _initModels.apply(this, arguments);
98
82
  }
99
-
100
83
  return initModels;
101
84
  }()
102
85
  }, {
@@ -105,41 +88,34 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
105
88
  var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
106
89
  var model;
107
90
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
108
- while (1) {
109
- switch (_context2.prev = _context2.next) {
110
- case 0:
111
- this.layer.triangulation = GlobelPointFillTriangulation;
112
- _context2.next = 3;
113
- return this.layer.buildLayerModel({
114
- moduleName: 'pointEarthFill',
115
- vertexShader: pointFillVert,
116
- fragmentShader: pointFillFrag,
117
- triangulation: GlobelPointFillTriangulation,
118
- depth: {
119
- enable: true
120
- },
121
- blend: this.getBlend()
122
- });
123
-
124
- case 3:
125
- model = _context2.sent;
126
- return _context2.abrupt("return", [model]);
127
-
128
- case 5:
129
- case "end":
130
- return _context2.stop();
131
- }
91
+ while (1) switch (_context2.prev = _context2.next) {
92
+ case 0:
93
+ this.layer.triangulation = GlobelPointFillTriangulation;
94
+ _context2.next = 3;
95
+ return this.layer.buildLayerModel({
96
+ moduleName: 'pointEarthFill',
97
+ vertexShader: pointFillVert,
98
+ fragmentShader: pointFillFrag,
99
+ triangulation: GlobelPointFillTriangulation,
100
+ depth: {
101
+ enable: true
102
+ },
103
+ blend: this.getBlend()
104
+ });
105
+ case 3:
106
+ model = _context2.sent;
107
+ return _context2.abrupt("return", [model]);
108
+ case 5:
109
+ case "end":
110
+ return _context2.stop();
132
111
  }
133
112
  }, _callee2, this);
134
113
  }));
135
-
136
114
  function buildModels() {
137
115
  return _buildModels.apply(this, arguments);
138
116
  }
139
-
140
117
  return buildModels;
141
118
  }() // overwrite baseModel func
142
-
143
119
  }, {
144
120
  key: "animateOption2Array",
145
121
  value: function animateOption2Array(option) {
@@ -149,7 +125,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
149
125
  key: "registerBuiltinAttributes",
150
126
  value: function registerBuiltinAttributes() {
151
127
  var _this = this;
152
-
153
128
  this.styleAttributeService.registerStyleAttribute({
154
129
  name: 'extrude',
155
130
  type: AttributeType.Attribute,
@@ -164,10 +139,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
164
139
  size: 3,
165
140
  update: function update(feature, featureIdx, vertex, attributeIdx) {
166
141
  var _vertex = _slicedToArray(vertex, 3),
167
- x = _vertex[0],
168
- y = _vertex[1],
169
- z = _vertex[2];
170
-
142
+ x = _vertex[0],
143
+ y = _vertex[1],
144
+ z = _vertex[2];
171
145
  var n1 = vec3.fromValues(0, 0, 1);
172
146
  var n2 = vec3.fromValues(x, 0, z);
173
147
  var xzReg = x >= 0 ? vec3.angle(n1, n2) : Math.PI * 2 - vec3.angle(n1, n2);
@@ -192,8 +166,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
192
166
  return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
193
167
  }
194
168
  }
195
- }); // point layer size;
169
+ });
196
170
 
171
+ // point layer size;
197
172
  this.styleAttributeService.registerStyleAttribute({
198
173
  name: 'size',
199
174
  type: AttributeType.Attribute,
@@ -208,12 +183,13 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
208
183
  size: 1,
209
184
  update: function update(feature) {
210
185
  var _feature$size = feature.size,
211
- size = _feature$size === void 0 ? 5 : _feature$size;
186
+ size = _feature$size === void 0 ? 5 : _feature$size;
212
187
  return Array.isArray(size) ? [size[0]] : [size];
213
188
  }
214
189
  }
215
- }); // point layer size;
190
+ });
216
191
 
192
+ // point layer size;
217
193
  this.styleAttributeService.registerStyleAttribute({
218
194
  name: 'shape',
219
195
  type: AttributeType.Attribute,
@@ -228,10 +204,8 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
228
204
  size: 1,
229
205
  update: function update(feature) {
230
206
  var _feature$shape = feature.shape,
231
- shape = _feature$shape === void 0 ? 2 : _feature$shape;
232
-
207
+ shape = _feature$shape === void 0 ? 2 : _feature$shape;
233
208
  var shape2d = _this.layer.getLayerConfig().shape2d;
234
-
235
209
  var shapeIndex = shape2d.indexOf(shape);
236
210
  return [shapeIndex];
237
211
  }
@@ -239,8 +213,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
239
213
  });
240
214
  }
241
215
  }]);
242
-
243
216
  return FillModel;
244
217
  }(BaseModel);
245
-
246
218
  export { FillModel as default };