@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4

package/es/line/shaders/{wall_frag.glsl → wall/wall_frag.glsl}

@@ -1,36 +1,32 @@
 #define Animate 0.0
 #define LineTexture 1.0
 
-uniform float u_opacity : 1.0;
-uniform float u_textureBlend;
-uniform float u_iconStepCount;
-
-varying vec4 v_color;
-
 // line texture
 uniform float u_line_texture;
 uniform sampler2D u_texture;
 uniform vec2 u_textSize;
-
-varying vec2 v_iconMapUV;
-varying float v_blur;
-
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
+uniform float u_opacity : 1.0;
+uniform float u_textureBlend;
+uniform float u_iconStepCount;
+uniform float u_time;
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
 
-#pragma include "picking"
+varying vec2 v_iconMapUV;
+varying float v_blur;
+varying float v_radio;
+varying vec4 v_color;
+varying vec4 v_dataset;
 
-uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ]; // 控制运动
+#pragma include "picking"
 
-varying mat4 styleMappingMat;
-// [animate, duration, interval, trailLength],
 void main() {
-  float opacity = styleMappingMat[0][0];
+  float opacity = u_opacity;
   float animateSpeed = 0.0; // 运动速度
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  float v = styleMappingMat[3].a;
+  float d_distance_ratio = v_dataset.r; // 当前点位距离占线总长的比例
+  float v = v_dataset.a;
 
   if(u_linearColor == 1.0) { // 使用渐变颜色
     gl_FragColor = mix(u_sourceColor, u_targetColor, v);
@@ -39,19 +35,19 @@ void main() {
   }
 
   gl_FragColor.a *= opacity; // 全局透明度
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + animateSpeed);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }
 
   if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
+    float aDistance = v_dataset.g;      // 当前顶点的距离
+    float d_texPixelLen = v_dataset.b;  // 贴图的像素长度，根据地图层级缩放
     float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
+    float v = v_dataset.a;  // 线图层贴图部分的 v 坐标值
 
     // 计算纹理间隔 start
     float flag = 0.0;

package/es/line/shaders/wall/wall_vert.glsl

@@ -0,0 +1,77 @@
+#define Animate 0.0
+
+attribute float a_Miter;
+attribute vec4 a_Color;
+attribute vec2 a_Size;
+attribute vec3 a_Normal;
+attribute vec3 a_Position;
+attribute vec2 a_iconMapUV;
+attribute float a_Total_Distance;
+attribute float a_Distance;
+
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+uniform float u_icon_step: 100;
+uniform float u_heightfixed;
+uniform float u_linearColor: 0;
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
+varying vec2 v_iconMapUV;
+varying vec4 v_color;
+varying float v_blur;
+varying float v_radio;
+varying vec4 v_dataset;
+
+void main() {
+
+
+  float d_distance_ratio; // 当前点位距离占线总长的比例
+  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+
+  v_iconMapUV = a_iconMapUV;
+  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+    d_texPixelLen = project_pixel(u_icon_step);
+  } else {
+    d_texPixelLen = u_icon_step;
+  }
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    d_texPixelLen *= 10.0;
+  }
+
+  if(u_animate.x == Animate || u_linearColor == 1.0) {
+      d_distance_ratio = a_Distance / a_Total_Distance;
+  }
+
+  float miter = (a_Miter + 1.0)/2.0;
+  // 设置数据集的参数
+  v_dataset[0] = d_distance_ratio; // 当前点位距离占线总长的比例
+  v_dataset[1] = a_Distance;       // 当前顶点的距离
+  v_dataset[2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  v_dataset[3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
+
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+
+  float originSize = a_Size.x;  // 固定高度
+  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+    originSize = project_float_pixel(a_Size.x);
+  }
+
+  float wallHeight = originSize * miter;
+  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
+
+  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
+  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
+  }
+
+  setPickingColor(a_PickingColor);
+}

package/es/mask/index.d.ts

@@ -11,6 +11,7 @@ export default class MaskLayer extends BaseLayer<IMaskLayerStyleOptions> {
             };
         };
     };
+    init(): this;
     buildModels(): void;
     rebuildModels(): void;
     protected getConfigSchema(): {

package/es/mask/index.js

@@ -1,3 +1,4 @@
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -6,12 +7,19 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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); }; }
 
 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; } }
 
 import BaseLayer from "../core/BaseLayer";
 import MaskModels from "./models";
+import { TYPES } from '@antv/l7-core';
 
 var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(MaskLayer, _BaseLayer);
@@ -35,25 +43,92 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }
 
   _createClass(MaskLayer, [{
+    key: "init",
+    value: function init() {
+      var _this2 = this;
+
+      // 设置配置项
+      var sceneId = this.container.get(TYPES.SceneID);
+      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
+      this.layerType = this.rawConfig.layerType;
+      this.rendererService = this.container.get(TYPES.IRendererService);
+      this.layerService = this.container.get(TYPES.ILayerService);
+      this.mapService = this.container.get(TYPES.IMapService);
+      this.cameraService = this.container.get(TYPES.ICameraService);
+      this.coordinateService = this.container.get(TYPES.ICoordinateSystemService);
+      this.shaderModuleService = this.container.get(TYPES.IShaderModuleService);
+      this.postProcessingPassFactory = this.container.get(TYPES.IFactoryPostProcessingPass);
+      this.normalPassFactory = this.container.get(TYPES.IFactoryNormalPass); // 图层容器服务
+
+      this.styleAttributeService = this.container.get(TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
+
+      this.pendingStyleAttributes.forEach(function (_ref) {
+        var attributeName = _ref.attributeName,
+            attributeField = _ref.attributeField,
+            attributeValues = _ref.attributeValues,
+            updateOptions = _ref.updateOptions;
+
+        _this2.styleAttributeService.updateStyleAttribute(attributeName, {
+          // @ts-ignore
+          scale: _objectSpread({
+            field: attributeField
+          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
+          attributeValues, // @ts-ignore
+          _this2.getLayerConfig()[attributeName]))
+        }, // @ts-ignore
+        updateOptions);
+      });
+      this.pendingStyleAttributes = []; // 获取插件集
+
+      this.plugins = this.container.getAll(TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
+
+      var _iterator = _createForOfIteratorHelper(this.plugins),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var plugin = _step.value;
+          plugin.apply(this, {
+            rendererService: this.rendererService,
+            mapService: this.mapService,
+            styleAttributeService: this.styleAttributeService,
+            normalPassFactory: this.normalPassFactory,
+            postProcessingPassFactory: this.postProcessingPassFactory
+          });
+        } // 触发 init 生命周期插件
+
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      this.hooks.init.call();
+      this.hooks.afterInit.call();
+      return this;
+    }
+  }, {
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
+      var _this3 = this;
 
       var shape = this.getModelType();
       this.layerModel = new MaskModels[shape](this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
+        _this3.models = models;
 
-        _this2.renderLayers();
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
+      var _this4 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this4.models = models;
+
+        _this4.emit('modelLoaded', null);
       });
     }
   }, {

package/es/mask/models/fill.d.ts

@@ -3,9 +3,10 @@ import BaseModel from '../../core/BaseModel';
 export default class MaskModel extends BaseModel {
     getUninforms(): {
         u_opacity: number;
+        u_color: number[];
     };
     initModels(callbackModel: (models: IModel[]) => void): void;
     buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    clearModels(): void;
+    clearModels(refresh?: boolean): void;
     protected registerBuiltinAttributes(): string;
 }

package/es/mask/models/fill.js

@@ -11,15 +11,16 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { gl } from '@antv/l7-core';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
 
-/* babel-plugin-inline-import '../shaders/mask_frag.glsl' */
-var mask_frag = "uniform float u_opacity;\nvarying vec4 v_Color;\n\nvoid main() {\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+/* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
+var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-var mask_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n\nvoid main() {\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
 
 var MaskModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(MaskModel, _BaseModel);
@@ -37,10 +38,13 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
           _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity;
+          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#000' : _ref$color;
 
       return {
-        u_opacity: isNumber(opacity) ? opacity : 0.0
+        u_opacity: isNumber(opacity) ? opacity : 0.0,
+        u_color: rgb2arr(color)
       };
     }
   }, {
@@ -78,7 +82,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                       zfail: gl.REPLACE,
                       zpass: gl.REPLACE
                     }
-                  }
+                  },
+                  pick: false
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {
@@ -103,10 +108,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-      this.layerService.clear();
+      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      refresh && this.layerService.clear();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/mask/shaders/mask_vert.glsl

@@ -1,17 +1,11 @@
-attribute vec4 a_Color;
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
-varying vec4 v_Color;
-
 #pragma include "projection"
 
 void main() {
-
-  v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));

package/es/plugins/DataMappingPlugin.d.ts

@@ -1,18 +1,19 @@
 import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class DataMappingPlugin implements ILayerPlugin {
-    private readonly configService;
     private readonly mapService;
     private readonly fontService;
     apply(layer: ILayer, { styleAttributeService, }: {
         styleAttributeService: IStyleAttributeService;
     }): void;
     private generateMaping;
-    private getArrowPoints;
     private mapping;
+    private mapLayerMapping;
     private adjustData2Amap2Coordinates;
-    private getLayerCenter;
     private adjustData2SimpleCoordinates;
+    private getLayerCenter;
     private unProjectCoordinates;
     private applyAttributeMapping;
+    private applyMapLayerAttributeMapping;
+    private getArrowPoints;
 }