@antv/l7-layers 2.9.32-alpha.3 → 2.9.32-alpha.5

package/es/plugins/UpdateStyleAttributePlugin.d.ts

@@ -0,0 +1,12 @@
+import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
+import 'reflect-metadata';
+/**
+ * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
+ */
+export default class UpdateStyleAttributePlugin implements ILayerPlugin {
+    apply(layer: ILayer, { styleAttributeService, }: {
+        styleAttributeService: IStyleAttributeService;
+    }): void;
+    private updateStyleAttribute;
+    private initStyleAttribute;
+}

package/es/plugins/UpdateStyleAttributePlugin.js

@@ -0,0 +1,83 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+
+var _dec, _class;
+
+import { injectable } from 'inversify';
+import 'reflect-metadata';
+/**
+ * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
+ */
+
+var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
+  function UpdateStyleAttributePlugin() {
+    _classCallCheck(this, UpdateStyleAttributePlugin);
+  }
+
+  _createClass(UpdateStyleAttributePlugin, [{
+    key: "apply",
+    value: function apply(layer, _ref) {
+      var _this = this;
+
+      var styleAttributeService = _ref.styleAttributeService;
+      layer.hooks.init.tap('UpdateStyleAttributePlugin', function () {
+        _this.initStyleAttribute(layer, {
+          styleAttributeService: styleAttributeService
+        });
+      });
+      layer.hooks.beforeRender.tap('UpdateStyleAttributePlugin', function () {
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            usage = _layer$getLayerConfig.usage;
+
+        if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap') {
+          return;
+        }
+
+        layer.modelLoaded && _this.updateStyleAttribute(layer, {
+          styleAttributeService: styleAttributeService
+        });
+      });
+    }
+  }, {
+    key: "updateStyleAttribute",
+    value: function updateStyleAttribute(layer, _ref2) {
+      var styleAttributeService = _ref2.styleAttributeService;
+      var attributes = styleAttributeService.getLayerStyleAttributes() || [];
+      var filter = styleAttributeService.getLayerStyleAttribute('filter');
+
+      if (filter && filter.needRegenerateVertices) {
+        layer.layerModelNeedUpdate = true;
+        attributes.forEach(function (attr) {
+          return attr.needRegenerateVertices = false;
+        });
+        return;
+      }
+
+      attributes.filter(function (attribute) {
+        return attribute.needRegenerateVertices;
+      }).forEach(function (attribute) {
+        // 精确更新某个/某些 feature(s)，需要传入 featureIdx d
+        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(), // 获取经过 mapping 最新的数据
+        attribute.featureRange.startIndex, attribute.featureRange.endIndex);
+        attribute.needRegenerateVertices = false;
+      });
+    }
+  }, {
+    key: "initStyleAttribute",
+    value: function initStyleAttribute(layer, _ref3) {
+      var styleAttributeService = _ref3.styleAttributeService;
+      var attributes = styleAttributeService.getLayerStyleAttributes() || [];
+      attributes.filter(function (attribute) {
+        return attribute.needRegenerateVertices;
+      }).forEach(function (attribute) {
+        // 精确更新某个/某些 feature(s)，需要传入 featureIdx d
+        styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(), // 获取经过 mapping 最新的数据
+        attribute.featureRange.startIndex, attribute.featureRange.endIndex);
+        attribute.needRegenerateVertices = false;
+      });
+    }
+  }]);
+
+  return UpdateStyleAttributePlugin;
+}()) || _class);
+export { UpdateStyleAttributePlugin as default };

package/es/point/index.d.ts

@@ -0,0 +1,40 @@
+import BaseLayer from '../core/BaseLayer';
+import { IPointLayerStyleOptions } from '../core/interface';
+import { PointType } from './models/index';
+export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
+    type: string;
+    defaultSourceConfig: {
+        data: never[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+            };
+        };
+    };
+    buildModels(): void;
+    rebuildModels(): void;
+    /**
+     * 在未传入数据的时候判断点图层的 shape 类型
+     * @returns
+     */
+    getModelTypeWillEmptyData(): PointType;
+    protected getConfigSchema(): {
+        properties: {
+            opacity: {
+                type: string;
+                minimum: number;
+                maximum: number;
+            };
+        };
+    };
+    protected getDefaultConfig(): {} | {
+        blend: string;
+    } | {} | {} | {
+        blend: string;
+    } | {} | {} | {
+        blend: string;
+    } | {} | {} | {} | {} | {};
+    protected getModelType(): PointType;
+}

package/es/point/index.js

@@ -0,0 +1,229 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+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 PointModels from "./models/index";
+import { isVectorTile } from "../tile/utils";
+
+var PointLayer = /*#__PURE__*/function (_BaseLayer) {
+  _inherits(PointLayer, _BaseLayer);
+
+  var _super = _createSuper(PointLayer);
+
+  function PointLayer() {
+    var _this;
+
+    _classCallCheck(this, PointLayer);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "type", 'PointLayer');
+
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json',
+          x: 'lng',
+          y: 'lat'
+        }
+      }
+    });
+
+    return _this;
+  }
+
+  _createClass(PointLayer, [{
+    key: "buildModels",
+    value: function buildModels() {
+      var _this2 = this;
+
+      var modelType = this.getModelType();
+      this.layerModel = new PointModels[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
+
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
+    /**
+     * 在未传入数据的时候判断点图层的 shape 类型
+     * @returns
+     */
+
+  }, {
+    key: "getModelTypeWillEmptyData",
+    value: function getModelTypeWillEmptyData() {
+      if (this.shapeOption) {
+        var _this$shapeOption = this.shapeOption,
+            field = _this$shapeOption.field,
+            values = _this$shapeOption.values;
+
+        var _this$getLayerConfig = this.getLayerConfig(),
+            shape2d = _this$getLayerConfig.shape2d;
+
+        var iconMap = this.iconService.getIconMap();
+
+        if (field && (shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(field)) !== -1) {
+          return 'fill';
+        }
+
+        if (values && values instanceof Array) {
+          var _iterator = _createForOfIteratorHelper(values),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var v = _step.value;
+
+              if (typeof v === 'string' && iconMap.hasOwnProperty(v)) {
+                return 'image';
+              }
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        }
+      }
+
+      return 'normal';
+    }
+  }, {
+    key: "getConfigSchema",
+    value: function getConfigSchema() {
+      return {
+        properties: {
+          opacity: {
+            type: 'number',
+            minimum: 0,
+            maximum: 1
+          }
+        }
+      };
+    }
+  }, {
+    key: "getDefaultConfig",
+    value: function getDefaultConfig() {
+      var type = this.getModelType();
+      var defaultConfig = {
+        fillImage: {},
+        normal: {
+          blend: 'additive'
+        },
+        radar: {},
+        simplePoint: {},
+        fill: {
+          blend: 'normal'
+        },
+        extrude: {},
+        image: {},
+        text: {
+          blend: 'normal'
+        },
+        vectorPoint: {},
+        tile: {},
+        tileText: {},
+        earthFill: {},
+        earthExtrude: {}
+      };
+      return defaultConfig[type];
+    }
+  }, {
+    key: "getModelType",
+    value: function getModelType() {
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
+        return 'vectorPoint';
+      } //  2D、 3d、 shape、image、text、normal、
+
+
+      var layerData = this.getEncodedData();
+
+      var _this$getLayerConfig2 = this.getLayerConfig(),
+          shape2d = _this$getLayerConfig2.shape2d,
+          shape3d = _this$getLayerConfig2.shape3d;
+
+      var iconMap = this.iconService.getIconMap();
+      var item = layerData.find(function (fe) {
+        return fe.hasOwnProperty('shape');
+      });
+
+      if (!item) {
+        return this.getModelTypeWillEmptyData();
+      } else {
+        var shape = item.shape;
+
+        if (shape === 'dot') {
+          return 'normal';
+        }
+
+        if (shape === 'simple') {
+          return 'simplePoint';
+        }
+
+        if (shape === 'radar') {
+          return 'radar';
+        }
+
+        if (this.layerType === 'fillImage') {
+          return 'fillImage';
+        }
+
+        if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
+          if (this.mapService.version === 'GLOBEL') {
+            return 'earthFill';
+          } else {
+            return 'fill';
+          }
+        }
+
+        if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
+          if (this.mapService.version === 'GLOBEL') {
+            return 'earthExtrude';
+          } else {
+            return 'extrude';
+          }
+        }
+
+        if (iconMap.hasOwnProperty(shape)) {
+          return 'image';
+        }
+
+        return 'text';
+      }
+    }
+  }]);
+
+  return PointLayer;
+}(BaseLayer);
+
+export { PointLayer as default };

package/es/point/models/earthExtrude.d.ts

@@ -0,0 +1,24 @@
+import { IModel } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class ExtrudeModel extends BaseModel {
+    private raiseCount;
+    private raiseRepeat;
+    getUninforms(): {
+        u_pickLight: number;
+        u_heightfixed: number;
+        u_r: number;
+        u_dataTexture: import("@antv/l7-core").ITexture2D;
+        u_cellTypeLayout: number[];
+        u_opacity: number;
+        u_linearColor: number;
+        u_sourceColor: number[];
+        u_targetColor: number[];
+        u_opacitylinear: number;
+        u_opacitylinear_dir: number;
+        u_lightEnable: number;
+    };
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
+    clearModels(): void;
+    protected registerBuiltinAttributes(): void;
+}

package/es/point/models/earthExtrude.js

@@ -0,0 +1,274 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 { AttributeType, gl } from '@antv/l7-core';
+import { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';
+import { isNumber } from 'lodash';
+import BaseModel from "../../core/BaseModel";
+import { PointExtrudeTriangulation } from "../../core/triangulation";
+import { lglt2xyz } from "../../earth/utils";
+
+/* babel-plugin-inline-import '../shaders/earth/extrude_frag.glsl' */
+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\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\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;\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  float lightWeight = styleMappingMat[1][3];\n  float barLinearZ = styleMappingMat[2][3];\n\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);\n    gl_FragColor.rgb *= lightWeight;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     gl_FragColor = v_color;\n  }\n\n  // \u5E94\u7528\u900F\u660E\u5EA6\n  gl_FragColor.a *= opacity;\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 - barLinearZ): barLinearZ;\n  }\n\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+
+/* babel-plugin-inline-import '../shaders/earth/extrude_vert.glsl' */
+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;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\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  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA - lightWeight\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(\u5782\u76F4\u65B9\u5411 0 - 1 \u7684\u503C)\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\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  styleMappingMat[2][3] =  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  styleMappingMat[1][3] = lightWeight;\n\n  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);\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";
+
+var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
+  _inherits(ExtrudeModel, _BaseModel);
+
+  var _super = _createSuper(ExtrudeModel);
+
+  function ExtrudeModel() {
+    var _this;
+
+    _classCallCheck(this, ExtrudeModel);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "raiseCount", 0);
+
+    _defineProperty(_assertThisInitialized(_this), "raiseRepeat", 0);
+
+    return _this;
+  }
+
+  _createClass(ExtrudeModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      var _ref = this.layer.getLayerConfig(),
+          _ref$animateOption = _ref.animateOption,
+          animateOption = _ref$animateOption === void 0 ? {
+        enable: false,
+        speed: 0.01,
+        repeat: false
+      } : _ref$animateOption,
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          sourceColor = _ref.sourceColor,
+          targetColor = _ref.targetColor,
+          _ref$pickLight = _ref.pickLight,
+          pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
+          _ref$heightfixed = _ref.heightfixed,
+          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
+          _ref$opacityLinear = _ref.opacityLinear,
+          opacityLinear = _ref$opacityLinear === void 0 ? {
+        enable: false,
+        dir: 'up'
+      } : _ref$opacityLinear,
+          _ref$lightEnable = _ref.lightEnable,
+          lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable;
+
+      if (this.dataTextureTest && this.dataTextureNeedUpdate({
+        opacity: opacity
+      })) {
+        this.judgeStyleAttributes({
+          opacity: opacity
+        });
+        var encodeData = this.layer.getEncodedData();
+
+        var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
+            data = _this$calDataFrame.data,
+            width = _this$calDataFrame.width,
+            height = _this$calDataFrame.height;
+
+        this.rowCount = height; // 当前数据纹理有多少行
+
+        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
+          flipY: true,
+          data: data,
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: width,
+          height: height
+        }) : this.createTexture2D({
+          flipY: true,
+          data: [1],
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: 1,
+          height: 1
+        });
+      } // 转化渐变色
+
+
+      var useLinearColor = 0; // 默认不生效
+
+      var sourceColorArr = [0, 0, 0, 0];
+      var targetColorArr = [0, 0, 0, 0];
+
+      if (sourceColor && targetColor) {
+        sourceColorArr = rgb2arr(sourceColor);
+        targetColorArr = rgb2arr(targetColor);
+        useLinearColor = 1;
+      }
+
+      if (this.raiseCount < 1 && this.raiseRepeat > 0) {
+        if (animateOption.enable) {
+          var _animateOption$speed = animateOption.speed,
+              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
+          this.raiseCount += speed;
+
+          if (this.raiseCount >= 1) {
+            if (this.raiseRepeat > 1) {
+              this.raiseCount = 0;
+              this.raiseRepeat--;
+            } else {
+              this.raiseCount = 1;
+            }
+          }
+        }
+      }
+
+      return {
+        // 圆柱体的拾取高亮是否要计算光照
+        u_pickLight: Number(pickLight),
+        // 圆柱体是否固定高度
+        u_heightfixed: Number(heightfixed),
+        u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
+        u_dataTexture: this.dataTexture,
+        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
+        u_cellTypeLayout: this.getCellTypeLayout(),
+        u_opacity: isNumber(opacity) ? opacity : 1.0,
+        // 渐变色支持参数
+        u_linearColor: useLinearColor,
+        u_sourceColor: sourceColorArr,
+        u_targetColor: targetColorArr,
+        // 透明度渐变
+        u_opacitylinear: Number(opacityLinear.enable),
+        u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,
+        // 光照计算开关
+        u_lightEnable: Number(lightEnable)
+      };
+    }
+  }, {
+    key: "initModels",
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels(callbackModel) {
+      // GAODE1.x GAODE2.x MAPBOX
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$animateOption$r = _ref2.animateOption.repeat,
+          repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
+
+      this.raiseRepeat = repeat;
+      this.layer.buildLayerModel({
+        moduleName: 'pointEarthExtrude',
+        vertexShader: pointExtrudeVert,
+        fragmentShader: pointExtrudeFrag,
+        triangulation: PointExtrudeTriangulation,
+        depth: {
+          enable: true
+        },
+        cull: {
+          enable: true,
+          face: getCullFace(this.mapService.version)
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$dataTexture;
+
+      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'size',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Size',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature) {
+            var size = feature.size;
+
+            if (size) {
+              var buffersize = [];
+
+              if (Array.isArray(size)) {
+                buffersize = size.length === 2 ? [size[0], size[0], size[1]] : size;
+              }
+
+              if (!Array.isArray(size)) {
+                buffersize = [size, size, size];
+              }
+
+              return buffersize;
+            } else {
+              return [2, 2, 2];
+            }
+          }
+        }
+      }); // point layer size;
+
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'normal',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Normal',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.STATIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
+            return normal;
+          }
+        }
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'pos',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Pos',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature) {
+            var coordinates = calculateCentroid(feature.coordinates);
+            return lglt2xyz([coordinates[0], coordinates[1]]);
+          }
+        }
+      });
+    }
+  }]);
+
+  return ExtrudeModel;
+}(BaseModel);
+
+export { ExtrudeModel as default };

package/es/point/models/earthFill.d.ts

@@ -0,0 +1,11 @@
+import { IAnimateOption, IModel, IModelUniform } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class FillModel extends BaseModel {
+    getUninforms(): IModelUniform;
+    getAnimateUniforms(): IModelUniform;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
+    clearModels(): void;
+    protected animateOption2Array(option: Partial<IAnimateOption>): number[];
+    protected registerBuiltinAttributes(): void;
+}