@antv/l7-layers 2.20.20 → 2.21.0

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 (113) hide show
  1. package/es/canvas/index.d.ts +13 -8
  2. package/es/canvas/index.js +63 -36
  3. package/es/canvas/models/canvas.d.ts +19 -14
  4. package/es/canvas/models/canvas.js +125 -139
  5. package/es/canvas/models/constants.d.ts +2 -0
  6. package/es/canvas/models/constants.js +6 -0
  7. package/es/canvas/models/index.d.ts +2 -5
  8. package/es/canvas/models/index.js +2 -5
  9. package/es/core/BaseLayer.d.ts +17 -19
  10. package/es/core/BaseLayer.js +88 -62
  11. package/es/core/BaseModel.js +15 -29
  12. package/es/core/LayerPickService.js +4 -5
  13. package/es/core/TextureService.js +1 -2
  14. package/es/core/interface.d.ts +31 -4
  15. package/es/core/shape/arrow.js +2 -6
  16. package/es/heatmap/models/heatmap.d.ts +0 -1
  17. package/es/heatmap/models/heatmap.js +2 -5
  18. package/es/index.d.ts +2 -1
  19. package/es/index.js +2 -89
  20. package/es/line/models/arc.js +5 -5
  21. package/es/line/models/arc_3d.js +4 -3
  22. package/es/line/models/great_circle.js +4 -4
  23. package/es/line/models/line.js +5 -8
  24. package/es/line/models/simple_line.js +1 -2
  25. package/es/line/models/wall.js +4 -3
  26. package/es/plugins/DataMappingPlugin.d.ts +4 -7
  27. package/es/plugins/DataMappingPlugin.js +8 -23
  28. package/es/plugins/DataSourcePlugin.d.ts +0 -1
  29. package/es/plugins/DataSourcePlugin.js +4 -7
  30. package/es/plugins/FeatureScalePlugin.d.ts +2 -5
  31. package/es/plugins/FeatureScalePlugin.js +4 -6
  32. package/es/plugins/LayerAnimateStylePlugin.d.ts +0 -1
  33. package/es/plugins/LayerAnimateStylePlugin.js +2 -5
  34. package/es/plugins/LayerMaskPlugin.d.ts +0 -1
  35. package/es/plugins/LayerMaskPlugin.js +2 -8
  36. package/es/plugins/LayerModelPlugin.d.ts +0 -1
  37. package/es/plugins/LayerModelPlugin.js +13 -18
  38. package/es/plugins/LayerStylePlugin.d.ts +0 -1
  39. package/es/plugins/LayerStylePlugin.js +2 -5
  40. package/es/plugins/LightingPlugin.d.ts +0 -1
  41. package/es/plugins/LightingPlugin.js +2 -5
  42. package/es/plugins/MultiPassRendererPlugin.d.ts +0 -1
  43. package/es/plugins/MultiPassRendererPlugin.js +2 -5
  44. package/es/plugins/PixelPickingPlugin.d.ts +2 -6
  45. package/es/plugins/PixelPickingPlugin.js +4 -9
  46. package/es/plugins/RegisterStyleAttributePlugin.d.ts +2 -5
  47. package/es/plugins/RegisterStyleAttributePlugin.js +2 -5
  48. package/es/plugins/ShaderUniformPlugin.d.ts +7 -8
  49. package/es/plugins/ShaderUniformPlugin.js +16 -42
  50. package/es/plugins/UpdateModelPlugin.d.ts +0 -1
  51. package/es/plugins/UpdateModelPlugin.js +2 -5
  52. package/es/plugins/UpdateStyleAttributePlugin.d.ts +2 -5
  53. package/es/plugins/UpdateStyleAttributePlugin.js +2 -6
  54. package/es/plugins/index.d.ts +15 -0
  55. package/es/plugins/index.js +18 -0
  56. package/es/point/models/fill.d.ts +1 -1
  57. package/es/point/models/fill.js +6 -9
  58. package/es/point/models/fillImage.js +4 -3
  59. package/es/point/models/image.js +4 -3
  60. package/es/polygon/models/extrude.js +0 -1
  61. package/es/polygon/models/ocean.js +1 -2
  62. package/es/polygon/models/water.js +0 -2
  63. package/es/tile/core/BaseLayer.js +4 -5
  64. package/es/tile/interaction/getRasterData.js +0 -2
  65. package/es/tile/service/TileLayerService.d.ts +0 -1
  66. package/es/tile/service/TileLayerService.js +0 -1
  67. package/es/tile/service/TilePickService.d.ts +1 -1
  68. package/es/tile/service/TilePickService.js +2 -3
  69. package/es/tile/tile/Tile.js +8 -6
  70. package/lib/canvas/index.js +63 -37
  71. package/lib/canvas/models/canvas.js +125 -138
  72. package/lib/canvas/models/constants.js +12 -0
  73. package/lib/canvas/models/index.js +22 -7
  74. package/lib/core/BaseLayer.js +88 -62
  75. package/lib/core/BaseModel.js +14 -28
  76. package/lib/core/LayerPickService.js +4 -5
  77. package/lib/core/TextureService.js +1 -2
  78. package/lib/core/shape/arrow.js +2 -6
  79. package/lib/heatmap/models/heatmap.js +2 -5
  80. package/lib/index.js +9 -90
  81. package/lib/line/models/arc.js +4 -4
  82. package/lib/line/models/arc_3d.js +4 -3
  83. package/lib/line/models/great_circle.js +4 -4
  84. package/lib/line/models/line.js +5 -8
  85. package/lib/line/models/simple_line.js +0 -1
  86. package/lib/line/models/wall.js +4 -3
  87. package/lib/plugins/DataMappingPlugin.js +7 -22
  88. package/lib/plugins/DataSourcePlugin.js +3 -6
  89. package/lib/plugins/FeatureScalePlugin.js +4 -6
  90. package/lib/plugins/LayerAnimateStylePlugin.js +2 -5
  91. package/lib/plugins/LayerMaskPlugin.js +2 -8
  92. package/lib/plugins/LayerModelPlugin.js +13 -18
  93. package/lib/plugins/LayerStylePlugin.js +2 -5
  94. package/lib/plugins/LightingPlugin.js +2 -5
  95. package/lib/plugins/MultiPassRendererPlugin.js +2 -5
  96. package/lib/plugins/PixelPickingPlugin.js +4 -9
  97. package/lib/plugins/RegisterStyleAttributePlugin.js +2 -5
  98. package/lib/plugins/ShaderUniformPlugin.js +15 -41
  99. package/lib/plugins/UpdateModelPlugin.js +2 -5
  100. package/lib/plugins/UpdateStyleAttributePlugin.js +2 -5
  101. package/lib/plugins/index.js +26 -0
  102. package/lib/point/models/fill.js +6 -9
  103. package/lib/point/models/fillImage.js +4 -3
  104. package/lib/point/models/image.js +4 -3
  105. package/lib/polygon/models/extrude.js +0 -1
  106. package/lib/polygon/models/ocean.js +0 -1
  107. package/lib/polygon/models/water.js +0 -2
  108. package/lib/tile/core/BaseLayer.js +4 -5
  109. package/lib/tile/interaction/getRasterData.js +0 -2
  110. package/lib/tile/service/TileLayerService.js +0 -1
  111. package/lib/tile/service/TilePickService.js +2 -3
  112. package/lib/tile/tile/Tile.js +8 -6
  113. package/package.json +18 -20
@@ -98,7 +98,8 @@ var Arc3DModel = exports.default = /*#__PURE__*/function (_BaseModel) {
98
98
  useLinearColor = 1;
99
99
  }
100
100
  if (this.rendererService.getDirty()) {
101
- this.texture.bind();
101
+ var _this$texture;
102
+ (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
102
103
  }
103
104
  var commonOptions = {
104
105
  u_animate: this.animateOption2Array(animateOption),
@@ -156,8 +157,8 @@ var Arc3DModel = exports.default = /*#__PURE__*/function (_BaseModel) {
156
157
  }, {
157
158
  key: "clearModels",
158
159
  value: function clearModels() {
159
- var _this$texture;
160
- (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
160
+ var _this$texture2;
161
+ (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
161
162
  this.iconService.off('imageUpdate', this.updateTexture);
162
163
  }
163
164
  }, {
@@ -84,7 +84,8 @@ var GreatCircleModel = exports.default = /*#__PURE__*/function (_BaseModel) {
84
84
  dashArray.push(0, 0);
85
85
  }
86
86
  if (this.rendererService.getDirty()) {
87
- this.texture.bind();
87
+ var _this$texture;
88
+ (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
88
89
  }
89
90
 
90
91
  // 转化渐变色
@@ -153,8 +154,8 @@ var GreatCircleModel = exports.default = /*#__PURE__*/function (_BaseModel) {
153
154
  }, {
154
155
  key: "clearModels",
155
156
  value: function clearModels() {
156
- var _this$texture;
157
- (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
157
+ var _this$texture2;
158
+ (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
158
159
  this.iconService.off('imageUpdate', this.updateTexture);
159
160
  }
160
161
  }, {
@@ -252,7 +253,6 @@ var GreatCircleModel = exports.default = /*#__PURE__*/function (_BaseModel) {
252
253
  update: function update(feature) {
253
254
  var iconMap = _this2.iconService.getIconMap();
254
255
  var texture = feature.texture;
255
- // console.log('icon feature', feature)
256
256
  var _ref4 = iconMap[texture] || {
257
257
  x: 0,
258
258
  y: 0
@@ -26,10 +26,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
26
26
  var line_frag = "// #extension GL_OES_standard_derivatives : enable\n#define Animate 0.0\n#define LineTexture 1.0\n\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniorm {\n vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n vec4 u_dash_array;\n vec4 u_blur;\n vec4 u_sourceColor;\n vec4 u_targetColor;\n vec2 u_textSize;\n float u_icon_step: 100;\n float u_heightfixed: 0.0;\n float u_vertexScale: 1.0;\n float u_raisingHeight: 0.0;\n float u_strokeWidth: 0.0;\n float u_textureBlend;\n float u_line_texture;\n float u_linearDir: 1.0;\n float u_linearColor: 0;\n float u_time;\n};\n\nin vec4 v_color;\nin vec4 v_stroke;\n// dash\nin vec4 v_dash_array;\nin float v_d_distance_ratio;\nin vec2 v_iconMapUV;\nin vec4 v_texture_data;\n\nout vec4 outputColor;\n#pragma include \"picking\"\n\n// [animate, duration, interval, trailLength],\nvoid main() {\n if(u_dash_array!=vec4(0.0)){\n float dashLength = mod(v_d_distance_ratio, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);\n if(!(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength < v_dash_array.x + v_dash_array.y + v_dash_array.z))) {\n // \u865A\u7EBF\u90E8\u5206\n discard;\n };\n }\n float animateSpeed = 0.0; // \u8FD0\u52A8\u901F\u5EA6\n float d_distance_ratio = v_texture_data.r; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n if(u_linearDir < 1.0) {\n d_distance_ratio = v_texture_data.a;\n }\n if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n outputColor = mix(u_sourceColor, u_targetColor, d_distance_ratio);\n outputColor.a *= v_color.a;\n } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n outputColor = v_color;\n }\n // anti-alias\n // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));\n if(u_animate.x == Animate) {\n animateSpeed = u_time / u_animate.y;\n float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);\n alpha = (alpha + u_animate.w -1.0) / u_animate.w;\n alpha = smoothstep(0., 1., alpha);\n outputColor.a *= alpha;\n }\n\n if(u_line_texture == LineTexture) { // while load texture\n float aDistance = v_texture_data.g; // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n float d_texPixelLen = v_texture_data.b; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);\n float v = v_texture_data.a; // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n // v = max(smoothstep(0.95, 1.0, v), v);\n vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;\n vec4 pattern = texture(SAMPLER_2D(u_texture), uv);\n\n if(u_textureBlend == 0.0) { // normal\n pattern.a = 0.0;\n outputColor += pattern;\n } else { // replace\n pattern.a *= v_color.a;\n if(outputColor.a <= 0.0) {\n pattern.a = 0.0;\n }\n outputColor = pattern;\n }\n } \n\n float v = v_texture_data.a;\n float strokeWidth = min(0.5, u_strokeWidth);\n // \u7ED8\u5236 border\n if(strokeWidth > 0.01) {\n float borderOuterWidth = strokeWidth / 2.0;\n\n\n if(v >= 1.0 - strokeWidth || v <= strokeWidth) {\n if(v > strokeWidth) { // \u5916\u4FA7\n float linear = smoothstep(0.0, 1.0, (v - (1.0 - strokeWidth))/strokeWidth);\n // float linear = step(0.0, (v - (1.0 - borderWidth))/borderWidth);\n outputColor.rgb = mix(outputColor.rgb, v_stroke.rgb, linear);\n } else if(v <= strokeWidth) {\n float linear = smoothstep(0.0, 1.0, v/strokeWidth);\n outputColor.rgb = mix(v_stroke.rgb, outputColor.rgb, linear);\n }\n }\n\n if(v < borderOuterWidth) {\n outputColor.a = mix(0.0, outputColor.a, v/borderOuterWidth);\n } else if(v > 1.0 - borderOuterWidth) {\n outputColor.a = mix(outputColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);\n }\n }\n\n // blur\n float blurV = v_texture_data.a;\n if(blurV < 0.5) {\n outputColor.a *= mix(u_blur.r, u_blur.g, blurV/0.5);\n } else {\n outputColor.a *= mix(u_blur.g, u_blur.b, (blurV - 0.5)/0.5);\n }\n \n outputColor = filterColor(outputColor);\n}\n";
27
27
  /* babel-plugin-inline-import '../shaders/line/line_vert.glsl' */
28
28
  var line_vert = "\n#define Animate 0.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec2 a_Size;\nlayout(location = 10) in vec3 a_DistanceAndIndexAndMiter;\nlayout(location = 13) in vec4 a_Normal_Total_Distance;\nlayout(location = 14) in vec2 a_iconMapUV;\n\nlayout(std140) uniform commonUniorm {\n vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n vec4 u_dash_array;\n vec4 u_blur;\n vec4 u_sourceColor;\n vec4 u_targetColor;\n vec2 u_textSize;\n float u_icon_step: 100;\n float u_heightfixed: 0.0;\n float u_vertexScale: 1.0;\n float u_raisingHeight: 0.0;\n float u_strokeWidth: 0.0;\n float u_textureBlend;\n float u_line_texture;\n float u_linearDir: 1.0;\n float u_linearColor: 0;\n float u_time;\n};\n\n\nout vec4 v_color;\nout vec4 v_stroke;\n//dash\nout vec4 v_dash_array;\nout float v_d_distance_ratio;\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nout vec2 v_iconMapUV;\nout vec4 v_texture_data;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n vec2 a_DistanceAndIndex = a_DistanceAndIndexAndMiter.xy;\n float a_Miter = a_DistanceAndIndexAndMiter.z;\n vec3 a_Normal = a_Normal_Total_Distance.xyz;\n float a_Total_Distance = a_Normal_Total_Distance.w;\n //dash\u8F93\u51FA\n v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_Total_Distance;\n v_d_distance_ratio = a_DistanceAndIndex.x / a_Total_Distance;\n\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n float d_texPixelLen; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n v_iconMapUV = a_iconMapUV;\n d_texPixelLen = project_float_pixel(u_icon_step);\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n d_texPixelLen *= 10.0;\n }\n\n v_color = a_Color;\n v_color.a *= opacity;\n v_stroke = stroke;\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 v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);\n // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\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";
29
- var lineStyleObj = {
30
- solid: 0.0,
31
- dash: 1.0
32
- };
33
29
  var LineModel = exports.default = /*#__PURE__*/function (_BaseModel) {
34
30
  (0, _inherits2.default)(LineModel, _BaseModel);
35
31
  var _super = _createSuper(LineModel);
@@ -105,7 +101,8 @@ var LineModel = exports.default = /*#__PURE__*/function (_BaseModel) {
105
101
  u_dash_array.push(0, 0);
106
102
  }
107
103
  if (this.rendererService.getDirty() && this.texture) {
108
- this.texture.bind();
104
+ var _this$texture;
105
+ (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
109
106
  }
110
107
  var _ref2 = this.layer.getLayerConfig(),
111
108
  animateOption = _ref2.animateOption;
@@ -180,8 +177,8 @@ var LineModel = exports.default = /*#__PURE__*/function (_BaseModel) {
180
177
  }, {
181
178
  key: "clearModels",
182
179
  value: function clearModels() {
183
- var _this$texture;
184
- (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
180
+ var _this$texture2;
181
+ (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
185
182
  this.iconService.off('imageUpdate', this.updateTexture);
186
183
  }
187
184
  }, {
@@ -193,7 +190,7 @@ var LineModel = exports.default = /*#__PURE__*/function (_BaseModel) {
193
190
  while (1) switch (_context2.prev = _context2.next) {
194
191
  case 0:
195
192
  _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
196
- _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; // console.log(frag)
193
+ _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
197
194
  this.layer.triangulation = _l7Utils.LineTriangulation;
198
195
  _context2.next = 5;
199
196
  return this.layer.buildLayerModel({
@@ -23,7 +23,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
23
23
  var simple_line_frag = "\nlayout(std140) uniform commonUniorm {\n vec4 u_sourceColor;\n vec4 u_targetColor;\n vec4 u_dash_array;\n float u_vertexScale: 1.0;\n float u_linearColor: 0;\n};\nin float v_distanceScale;\nin vec4 v_color;\n//dash\nin vec4 v_dash_array;\n\nout vec4 outputColor;\nvoid main() {\n if(u_dash_array!=vec4(0.0)){\n float dashLength = mod(v_distanceScale, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);\n if(!(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength < v_dash_array.x + v_dash_array.y + v_dash_array.z))) {\n // \u865A\u7EBF\u90E8\u5206\n discard;\n };\n }\n if(u_linearColor==1.0){\n outputColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n outputColor.a *= v_color.a; // \u5168\u5C40\u900F\u660E\u5EA6\n }\n else{\n outputColor = v_color;\n }\n}\n";
24
24
  /* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
25
25
  var simple_line_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec4 a_SizeDistanceAndTotalDistance;\n\nlayout(std140) uniform commonUniorm {\n vec4 u_sourceColor;\n vec4 u_targetColor;\n vec4 u_dash_array;\n float u_vertexScale: 1.0;\n float u_linearColor: 0;\n};\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nout vec4 v_color;\nout float v_distanceScale;\nout vec4 v_dash_array;\n\nvoid main() {\n //dash\u8F93\u51FA\n v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_SizeDistanceAndTotalDistance.a;\n\n v_color = a_Color; \n v_distanceScale = a_SizeDistanceAndTotalDistance.b / a_SizeDistanceAndTotalDistance.a;\n v_color.a = v_color.a * 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_SizeDistanceAndTotalDistance.y) + h * 0.2, 1.0));\n } else {\n float lineHeight = a_SizeDistanceAndTotalDistance.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 // 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";
26
- var isNumber = _l7Utils.lodashUtil.isNumber;
27
26
  var SimpleLineModel = exports.default = /*#__PURE__*/function (_BaseModel) {
28
27
  (0, _inherits2.default)(SimpleLineModel, _BaseModel);
29
28
  var _super = _createSuper(SimpleLineModel);
@@ -75,7 +75,8 @@ var LineWallModel = exports.default = /*#__PURE__*/function (_BaseModel) {
75
75
  var _ref2 = this.layer.getLayerConfig(),
76
76
  animateOption = _ref2.animateOption;
77
77
  if (this.rendererService.getDirty()) {
78
- this.texture.bind();
78
+ var _this$texture;
79
+ (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
79
80
  }
80
81
 
81
82
  // 转化渐变色
@@ -137,8 +138,8 @@ var LineWallModel = exports.default = /*#__PURE__*/function (_BaseModel) {
137
138
  }, {
138
139
  key: "clearModels",
139
140
  value: function clearModels() {
140
- var _this$texture;
141
- (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
141
+ var _this$texture2;
142
+ (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
142
143
  this.iconService.off('imageUpdate', this.updateTexture);
143
144
  }
144
145
  }, {
@@ -8,29 +8,24 @@ exports.default = void 0;
8
8
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
9
9
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
10
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
11
- var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
12
11
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
13
12
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
14
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
- var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
16
- var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
17
13
  var _l7Core = require("@antv/l7-core");
18
14
  var _l7Utils = require("@antv/l7-utils");
19
- var _inversify = require("inversify");
20
- require("reflect-metadata");
21
- var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
22
15
  var cloneDeep = _l7Utils.lodashUtil.cloneDeep;
23
- var DataMappingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IFontService), _dec(_class = (_class2 = /*#__PURE__*/function () {
16
+ var DataMappingPlugin = exports.default = /*#__PURE__*/function () {
24
17
  function DataMappingPlugin() {
25
18
  (0, _classCallCheck2.default)(this, DataMappingPlugin);
26
- (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor, this);
27
- (0, _initializerDefineProperty2.default)(this, "fontService", _descriptor2, this);
28
19
  }
29
20
  (0, _createClass2.default)(DataMappingPlugin, [{
30
21
  key: "apply",
31
22
  value: function apply(layer, _ref) {
32
23
  var _this = this;
33
- var styleAttributeService = _ref.styleAttributeService;
24
+ var styleAttributeService = _ref.styleAttributeService,
25
+ mapService = _ref.mapService,
26
+ fontService = _ref.fontService;
27
+ this.mapService = mapService;
28
+ this.fontService = fontService;
34
29
  layer.hooks.init.tapPromise('DataMappingPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
35
30
  return _regenerator.default.wrap(function _callee$(_context) {
36
31
  while (1) switch (_context.prev = _context.next) {
@@ -283,14 +278,4 @@ var DataMappingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
283
278
  }
284
279
  }]);
285
280
  return DataMappingPlugin;
286
- }(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec2], {
287
- configurable: true,
288
- enumerable: true,
289
- writable: true,
290
- initializer: null
291
- }), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "fontService", [_dec3], {
292
- configurable: true,
293
- enumerable: true,
294
- writable: true,
295
- initializer: null
296
- })), _class2)) || _class);
281
+ }();
@@ -11,10 +11,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
12
  var _l7Core = require("@antv/l7-core");
13
13
  var _l7Source = _interopRequireDefault(require("@antv/l7-source"));
14
- var _inversify = require("inversify");
15
- require("reflect-metadata");
16
- var _dec, _class;
17
- var DataSourcePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
14
+ var DataSourcePlugin = exports.default = /*#__PURE__*/function () {
18
15
  function DataSourcePlugin() {
19
16
  (0, _classCallCheck2.default)(this, DataSourcePlugin);
20
17
  }
@@ -22,7 +19,7 @@ var DataSourcePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
22
19
  key: "apply",
23
20
  value: function apply(layer) {
24
21
  var _this = this;
25
- this.mapService = layer.getContainer().get(_l7Core.TYPES.IMapService);
22
+ this.mapService = layer.getContainer().mapService;
26
23
  layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
27
24
  var source, _ref2, data, options;
28
25
  return _regenerator.default.wrap(function _callee$(_context) {
@@ -109,4 +106,4 @@ var DataSourcePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
109
106
  }
110
107
  }]);
111
108
  return DataSourcePlugin;
112
- }()) || _class);
109
+ }();
@@ -17,10 +17,8 @@ var _l7Utils = require("@antv/l7-utils");
17
17
  var _d3Array = require("d3-array");
18
18
  var d3interpolate = _interopRequireWildcard(require("d3-interpolate"));
19
19
  var d3 = _interopRequireWildcard(require("d3-scale"));
20
- var _inversify = require("inversify");
21
- require("reflect-metadata");
22
20
  var _identityScale = _interopRequireDefault(require("../utils/identityScale"));
23
- var _scaleMap, _dec, _class;
21
+ var _scaleMap;
24
22
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
25
23
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
26
24
  var isNil = _l7Utils.lodashUtil.isNil,
@@ -31,7 +29,7 @@ var scaleMap = (_scaleMap = {}, (0, _defineProperty2.default)(_scaleMap, _l7Core
31
29
  /**
32
30
  * 根据 Source 原始数据为指定字段创建 Scale,保存在 StyleAttribute 上,供下游插件使用
33
31
  */
34
- var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
32
+ var FeatureScalePlugin = exports.default = /*#__PURE__*/function () {
35
33
  function FeatureScalePlugin() {
36
34
  (0, _classCallCheck2.default)(this, FeatureScalePlugin);
37
35
  (0, _defineProperty2.default)(this, "scaleOptions", {});
@@ -290,7 +288,7 @@ var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(),
290
288
  // quantile domain 需要根据ID 进行去重
291
289
  var values = [];
292
290
  if (type === _l7Core.ScaleTypes.QUANTILE) {
293
- // 根据 obejct 属性 _id 进行去重
291
+ // 根据 obejct 属性 _id 进行去重
294
292
  var idMap = new Map();
295
293
  data === null || data === void 0 || data.forEach(function (obj) {
296
294
  idMap.set(obj._id, obj[field]);
@@ -346,4 +344,4 @@ var FeatureScalePlugin = exports.default = (_dec = (0, _inversify.injectable)(),
346
344
  }
347
345
  }]);
348
346
  return FeatureScalePlugin;
349
- }()) || _class);
347
+ }();
@@ -8,10 +8,7 @@ exports.default = void 0;
8
8
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
9
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
10
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
- var _inversify = require("inversify");
12
- require("reflect-metadata");
13
- var _dec, _class;
14
- var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
11
+ var LayerAnimateStylePlugin = exports.default = /*#__PURE__*/function () {
15
12
  function LayerAnimateStylePlugin() {
16
13
  (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
17
14
  }
@@ -30,4 +27,4 @@ var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectabl
30
27
  }
31
28
  }]);
32
29
  return LayerAnimateStylePlugin;
33
- }()) || _class);
30
+ }();
@@ -5,16 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.default = void 0;
8
- var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
9
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
10
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
- var _inversify = require("inversify");
12
- require("reflect-metadata");
13
- var _dec, _class;
14
10
  /**
15
11
  * 更新图层样式,初始图层相关配置
16
12
  */
17
- var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
13
+ var LayerStylePlugin = exports.default = /*#__PURE__*/function () {
18
14
  function LayerStylePlugin() {
19
15
  (0, _classCallCheck2.default)(this, LayerStylePlugin);
20
16
  }
@@ -27,8 +23,6 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
27
23
  enableMask = _layer$getLayerConfig.enableMask;
28
24
  // mask 初始化
29
25
  if (!layer.tileLayer && maskLayers && maskLayers.length > 0) {
30
- var _layer$masks;
31
- (_layer$masks = layer.masks).push.apply(_layer$masks, (0, _toConsumableArray2.default)(maskLayers));
32
26
  layer.updateLayerConfig({
33
27
  mask: true && enableMask
34
28
  });
@@ -37,4 +31,4 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
37
31
  }
38
32
  }]);
39
33
  return LayerStylePlugin;
40
- }()) || _class);
34
+ }();
@@ -10,14 +10,11 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
10
10
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
11
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
12
12
  var _l7Core = require("@antv/l7-core");
13
- var _inversify = require("inversify");
14
- require("reflect-metadata");
15
- var _BaseLayer = _interopRequireDefault(require("../tile/core/BaseLayer"));
16
- var _dec, _class;
13
+ // import TileLayer from '../tile/core/BaseLayer';
17
14
  /**
18
15
  * Layer Model 初始化,更新,销毁
19
16
  */
20
- var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
17
+ var LayerModelPlugin = exports.default = /*#__PURE__*/function () {
21
18
  function LayerModelPlugin() {
22
19
  (0, _classCallCheck2.default)(this, LayerModelPlugin);
23
20
  }
@@ -97,19 +94,18 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
97
94
  while (1) switch (_context4.prev = _context4.next) {
98
95
  case 0:
99
96
  if (!layer.getSource().isTile) {
100
- _context4.next = 4;
97
+ _context4.next = 3;
101
98
  break;
102
99
  }
103
100
  layer.prepareBuildModel();
104
- layer.tileLayer = new _BaseLayer.default(layer);
105
101
  return _context4.abrupt("return");
106
- case 4:
102
+ case 3:
107
103
  layer.log(_l7Core.IDebugLog.BuildModelStart, _l7Core.ILayerStage.INIT);
108
- _context4.next = 7;
104
+ _context4.next = 6;
109
105
  return _this.initLayerModel(layer);
110
- case 7:
106
+ case 6:
111
107
  layer.log(_l7Core.IDebugLog.BuildModelEnd, _l7Core.ILayerStage.INIT);
112
- case 8:
108
+ case 7:
113
109
  case "end":
114
110
  return _context4.stop();
115
111
  }
@@ -127,19 +123,18 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
127
123
  return _context5.abrupt("return", false);
128
124
  case 2:
129
125
  if (!layer.getSource().isTile) {
130
- _context5.next = 5;
126
+ _context5.next = 4;
131
127
  break;
132
128
  }
133
- layer.tileLayer = new _BaseLayer.default(layer);
134
129
  return _context5.abrupt("return", false);
135
- case 5:
130
+ case 4:
136
131
  layer.log(_l7Core.IDebugLog.BuildModelStart, _l7Core.ILayerStage.UPDATE);
137
- _context5.next = 8;
132
+ _context5.next = 7;
138
133
  return _this.prepareLayerModel(layer);
139
- case 8:
134
+ case 7:
140
135
  layer.log(_l7Core.IDebugLog.BuildModelEnd, _l7Core.ILayerStage.UPDATE);
141
136
  return _context5.abrupt("return", true);
142
- case 10:
137
+ case 9:
143
138
  case "end":
144
139
  return _context5.stop();
145
140
  }
@@ -152,4 +147,4 @@ var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
152
147
  }
153
148
  }]);
154
149
  return LayerModelPlugin;
155
- }()) || _class);
150
+ }();
@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
- var _inversify = require("inversify");
11
- require("reflect-metadata");
12
- var _dec, _class;
13
10
  /**
14
11
  * 更新图层样式,初始图层相关配置
15
12
  */
16
- var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
13
+ var LayerStylePlugin = exports.default = /*#__PURE__*/function () {
17
14
  function LayerStylePlugin() {
18
15
  (0, _classCallCheck2.default)(this, LayerStylePlugin);
19
16
  }
@@ -33,4 +30,4 @@ var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _
33
30
  }
34
31
  }]);
35
32
  return LayerStylePlugin;
36
- }()) || _class);
33
+ }();
@@ -10,9 +10,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
10
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
11
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
12
12
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
13
- var _inversify = require("inversify");
14
- require("reflect-metadata");
15
- var _dec, _class;
16
13
  var _excluded = ["type"];
17
14
  var lightTypeUniformMap = {
18
15
  directional: {
@@ -80,7 +77,7 @@ function generateLightingUniforms(lights) {
80
77
  /**
81
78
  * 光照 & Shadow
82
79
  */
83
- var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
80
+ var LightingPlugin = exports.default = /*#__PURE__*/function () {
84
81
  function LightingPlugin() {
85
82
  (0, _classCallCheck2.default)(this, LightingPlugin);
86
83
  }
@@ -102,4 +99,4 @@ var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _de
102
99
  }
103
100
  }]);
104
101
  return LightingPlugin;
105
- }()) || _class);
102
+ }();
@@ -7,10 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
- var _inversify = require("inversify");
11
- require("reflect-metadata");
12
10
  var _multiPassRender = require("../utils/multiPassRender");
13
- var _dec, _class;
14
11
  /**
15
12
  * 自定义渲染管线:
16
13
  * ClearPass -> PixelPickingPass(可选) -> RenderPass/TAAPass -> PostProcessing -> CopyPass
@@ -24,7 +21,7 @@ var _dec, _class;
24
21
  * ],
25
22
  * })
26
23
  */
27
- var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
24
+ var MultiPassRendererPlugin = exports.default = /*#__PURE__*/function () {
28
25
  function MultiPassRendererPlugin() {
29
26
  (0, _classCallCheck2.default)(this, MultiPassRendererPlugin);
30
27
  }
@@ -62,4 +59,4 @@ var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectabl
62
59
  }
63
60
  }]);
64
61
  return MultiPassRendererPlugin;
65
- }()) || _class);
62
+ }();
@@ -10,17 +10,14 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
10
10
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
11
11
  var _l7Core = require("@antv/l7-core");
12
12
  var _l7Utils = require("@antv/l7-utils");
13
- var _inversify = require("inversify");
14
- require("reflect-metadata");
15
13
  var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
16
- var _dec, _class;
17
14
  var isNumber = _l7Utils.lodashUtil.isNumber;
18
15
  var PickingStage = {
19
16
  NONE: 0.0,
20
17
  ENCODE: 1.0,
21
18
  HIGHLIGHT: 2.0
22
19
  };
23
- var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
20
+ var PixelPickingPlugin = exports.default = /*#__PURE__*/function () {
24
21
  function PixelPickingPlugin() {
25
22
  (0, _classCallCheck2.default)(this, PixelPickingPlugin);
26
23
  }
@@ -34,7 +31,7 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
34
31
 
35
32
  function pickOption2Array() {
36
33
  var array = [];
37
- this.pickingUniformMap.forEach(function (value, key) {
34
+ this.pickingUniformMap.forEach(function (value) {
38
35
  if (isNumber(value)) {
39
36
  array.push(value);
40
37
  } else {
@@ -65,9 +62,7 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
65
62
  key: "apply",
66
63
  value: function apply(layer, _ref) {
67
64
  var _this2 = this;
68
- var rendererService = _ref.rendererService,
69
- styleAttributeService = _ref.styleAttributeService;
70
- var uniformBuffer;
65
+ var styleAttributeService = _ref.styleAttributeService;
71
66
  this.pickingUniformMap = new Map([['u_HighlightColor', [1, 0, 0, 1]], ['u_SelectColor', [1, 0, 0, 1]], ['u_PickingColor', [0, 0, 0]], ['u_PickingStage', 0], ['u_CurrentSelectedId', [0, 0, 0]], ['u_PickingThreshold', 10], ['u_PickingBuffer', 0], ['u_shaderPick', 0], ['u_EnableSelect', 0], ['u_activeMix', 0]]);
72
67
 
73
68
  // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改,因此即使不开启也需要生成 a_PickingColor
@@ -176,4 +171,4 @@ var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
176
171
  }
177
172
  }]);
178
173
  return PixelPickingPlugin;
179
- }()) || _class);
174
+ }();
@@ -8,15 +8,12 @@ exports.default = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
10
  var _l7Core = require("@antv/l7-core");
11
- var _inversify = require("inversify");
12
- require("reflect-metadata");
13
11
  var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
14
12
  var _utils = require("../tile/utils/utils");
15
- var _dec, _class;
16
13
  /**
17
14
  * 在初始化阶段完成属性的注册,以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
18
15
  */
19
- var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
16
+ var RegisterStyleAttributePlugin = exports.default = /*#__PURE__*/function () {
20
17
  function RegisterStyleAttributePlugin() {
21
18
  (0, _classCallCheck2.default)(this, RegisterStyleAttributePlugin);
22
19
  }
@@ -115,4 +112,4 @@ var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.inje
115
112
  }
116
113
  }]);
117
114
  return RegisterStyleAttributePlugin;
118
- }()) || _class);
115
+ }();
@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
7
  exports.default = void 0;
8
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
8
9
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
9
10
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
10
- var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
11
11
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
12
12
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
13
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
- var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
15
- var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
16
13
  var _l7Core = require("@antv/l7-core");
17
- var _inversify = require("inversify");
18
- require("reflect-metadata");
19
- var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
20
14
  /**
21
15
  * 在渲染之前需要获取当前 Shader 所需 Uniform,例如:
22
16
  * 1. 从相机服务中获取 View & ProjectionMatrix,当前缩放等级等等
@@ -24,19 +18,24 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _desc
24
18
  * @see https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/doml91
25
19
  * 3. 当前 Layer 本身的样式属性
26
20
  */
27
- var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.ICoordinateSystemService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec5 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec6 = (0, _inversify.inject)(_l7Core.TYPES.ILayerService), _dec(_class = (_class2 = /*#__PURE__*/function () {
21
+ var ShaderUniformPlugin = exports.default = /*#__PURE__*/function () {
28
22
  function ShaderUniformPlugin() {
29
23
  (0, _classCallCheck2.default)(this, ShaderUniformPlugin);
30
- (0, _initializerDefineProperty2.default)(this, "cameraService", _descriptor, this);
31
- (0, _initializerDefineProperty2.default)(this, "coordinateSystemService", _descriptor2, this);
32
- (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor3, this);
33
- (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor4, this);
34
- (0, _initializerDefineProperty2.default)(this, "layerService", _descriptor5, this);
35
24
  }
36
25
  (0, _createClass2.default)(ShaderUniformPlugin, [{
37
26
  key: "apply",
38
- value: function apply(layer) {
27
+ value: function apply(layer, _ref) {
39
28
  var _this = this;
29
+ var rendererService = _ref.rendererService,
30
+ mapService = _ref.mapService,
31
+ layerService = _ref.layerService,
32
+ coordinateSystemService = _ref.coordinateSystemService,
33
+ cameraService = _ref.cameraService;
34
+ this.rendererService = rendererService;
35
+ this.mapService = mapService;
36
+ this.layerService = layerService;
37
+ this.coordinateSystemService = coordinateSystemService;
38
+ this.cameraService = cameraService;
40
39
  var version = this.mapService.version;
41
40
  var mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
42
41
  var sceneCenterMercator = [0, 0];
@@ -82,7 +81,7 @@ var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)()
82
81
  });
83
82
  }
84
83
 
85
- // For WebGL1. regl
84
+ // For WebGL1. regl
86
85
  var platformString = _this.rendererService.queryVerdorInfo();
87
86
  if (platformString === 'WebGL1') {
88
87
  layer.models.forEach(function (model) {
@@ -151,29 +150,4 @@ var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)()
151
150
  }
152
151
  }]);
153
152
  return ShaderUniformPlugin;
154
- }(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec2], {
155
- configurable: true,
156
- enumerable: true,
157
- writable: true,
158
- initializer: null
159
- }), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "coordinateSystemService", [_dec3], {
160
- configurable: true,
161
- enumerable: true,
162
- writable: true,
163
- initializer: null
164
- }), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "rendererService", [_dec4], {
165
- configurable: true,
166
- enumerable: true,
167
- writable: true,
168
- initializer: null
169
- }), _descriptor4 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "mapService", [_dec5], {
170
- configurable: true,
171
- enumerable: true,
172
- writable: true,
173
- initializer: null
174
- }), _descriptor5 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "layerService", [_dec6], {
175
- configurable: true,
176
- enumerable: true,
177
- writable: true,
178
- initializer: null
179
- })), _class2)) || _class);
153
+ }();
@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = void 0;
8
8
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
9
9
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
10
- var _inversify = require("inversify");
11
- require("reflect-metadata");
12
- var _dec, _class;
13
10
  /**
14
11
  * Model 更新
15
12
  */
16
- var UpdateModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
13
+ var UpdateModelPlugin = exports.default = /*#__PURE__*/function () {
17
14
  function UpdateModelPlugin() {
18
15
  (0, _classCallCheck2.default)(this, UpdateModelPlugin);
19
16
  }
@@ -36,4 +33,4 @@ var UpdateModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(),
36
33
  }
37
34
  }]);
38
35
  return UpdateModelPlugin;
39
- }()) || _class);
36
+ }();