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

package/es/core/BaseModel.js

@@ -61,7 +61,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       stroke: undefined,
       offsets: undefined
     };
-    this.stylePropertyesExist = {
+    this.stylePropertiesExist = {
       hasThetaOffset: 0,
       hasOpacity: 0,
       hasStrokeOpacity: 0,
@@ -97,7 +97,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       this.cellLength = 0; // 清空上一次计算的 cell 的长度
 
-      this.stylePropertyesExist = {
+      this.stylePropertiesExist = {
         // 全量清空上一次是否需要对 style 属性进行数据映射的判断
         hasThetaOffset: 0,
         hasOpacity: 0,
@@ -115,13 +115,13 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         this.rowCount, // 数据纹理有几行
         this.DATA_TEXTURE_WIDTH, // 数据纹理有几列
         0.0, 0.0, // 1
-        this.stylePropertyesExist.hasOpacity, // cell 中是否存在 opacity
-        this.stylePropertyesExist.hasStrokeOpacity, // cell 中是否存在 strokeOpacity
-        this.stylePropertyesExist.hasStrokeWidth, // cell 中是否存在 strokeWidth
-        this.stylePropertyesExist.hasStroke, // cell 中是否存在 stroke
+        this.stylePropertiesExist.hasOpacity, // cell 中是否存在 opacity
+        this.stylePropertiesExist.hasStrokeOpacity, // cell 中是否存在 strokeOpacity
+        this.stylePropertiesExist.hasStrokeWidth, // cell 中是否存在 strokeWidth
+        this.stylePropertiesExist.hasStroke, // cell 中是否存在 stroke
         // 2
-        this.stylePropertyesExist.hasOffsets, // cell 中是否存在 offsets
-        this.stylePropertyesExist.hasThetaOffset, // cell 中是否存在 thetaOffset
+        this.stylePropertiesExist.hasOffsets, // cell 中是否存在 offsets
+        this.stylePropertiesExist.hasThetaOffset, // cell 中是否存在 thetaOffset
         0.0, 0.0, // 3
         0.0, 0.0, 0.0, 1.0];
       } else {
@@ -198,7 +198,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'opacity',
           count: 1
         });
-        this.stylePropertyesExist.hasOpacity = 1;
+        this.stylePropertiesExist.hasOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -208,7 +208,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'strokeOpacity',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeOpacity = 1;
+        this.stylePropertiesExist.hasStrokeOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -218,7 +218,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'strokeWidth',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeWidth = 1;
+        this.stylePropertiesExist.hasStrokeWidth = 1;
         this.cellLength += 1;
       }
 
@@ -228,7 +228,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'stroke',
           count: 4
         });
-        this.stylePropertyesExist.hasStroke = 1;
+        this.stylePropertiesExist.hasStroke = 1;
         this.cellLength += 4;
       }
 
@@ -238,7 +238,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'offsets',
           count: 2
         });
-        this.stylePropertyesExist.hasOffsets = 1;
+        this.stylePropertiesExist.hasOffsets = 1;
         this.cellLength += 2;
       }
 
@@ -248,10 +248,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
           attr: 'thetaOffset',
           count: 1
         });
-        this.stylePropertyesExist.hasThetaOffset = 1;
+        this.stylePropertiesExist.hasThetaOffset = 1;
         this.cellLength += 1;
-      } // console.log('this.cellLength', this.cellLength)
-
+      }
     }
     /**
      * 判断变量 stroke 是否是常量值
@@ -428,20 +427,24 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "needUpdate",
     value: function needUpdate() {
       return false;
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "initModels",
     value: function initModels(callbackModel) {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "clearModels",
     value: function clearModels() {
+      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       return;
     }
   }, {

package/es/core/interface.d.ts

@@ -1,4 +1,4 @@
-import { IAnimateOption, IMapService } from '@antv/l7-core';
+import { IAnimateOption, IMapService, ITexture2D } from '@antv/l7-core';
 import { IColorRamp, IImagedata } from '@antv/l7-utils';
 import { styleOffset } from '../core/BaseModel';
 import { anchorType } from '../utils/symbol-layout';
@@ -32,6 +32,9 @@ export interface IBaseLayerStyleOptions {
     zIndex?: number;
     mask?: boolean;
     maskInside?: boolean;
+    usage?: string;
+    color?: string;
+    size?: number;
 }
 export interface ILineLayerStyleOptions extends IBaseLayerStyleOptions {
     tileOrigin?: number[];
@@ -116,6 +119,7 @@ export interface IRasterTileLayerStyleOptions extends IBaseLayerStyleOptions {
 }
 export interface IMaskLayerStyleOptions extends IBaseLayerStyleOptions {
     opacity: number;
+    color: string;
 }
 export interface IWindLayerStyleOptions extends IBaseLayerStyleOptions {
     uMin?: number;
@@ -139,12 +143,27 @@ export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
     clampHigh?: boolean;
     rampColors?: IColorRamp;
     rampColorsData?: ImageData | IImagedata;
+    colorTexture?: ITexture2D;
     pixelConstant?: number;
     pixelConstantR?: number;
     pixelConstantG?: number;
     pixelConstantB?: number;
     pixelConstantRGB?: number;
 }
+export interface ICityBuildLayerStyleOptions {
+    opacity: number;
+    baseColor: string;
+    brightColor: string;
+    windowColor: string;
+    time: number;
+    sweep: {
+        enable: boolean;
+        sweepRadius: number;
+        sweepColor: string;
+        sweepSpeed: number;
+        sweepCenter?: [number, number];
+    };
+}
 export interface IGeometryLayerStyleOptions extends IBaseLayerStyleOptions {
     mapTexture?: string;
     terrainTexture?: string;

package/es/core/triangulation.d.ts

@@ -54,6 +54,12 @@ export declare function SimpleLineTriangulation(feature: IEncodeFeature): {
     size: number;
     count: number;
 };
+export declare function TileSimpleLineTriangulation(feature: IEncodeFeature): {
+    vertices: any[];
+    indices: never[];
+    size: number;
+    count: number;
+};
 export declare function polygonTriangulation(feature: IEncodeFeature): {
     indices: number[];
     vertices: number[];

package/es/core/triangulation.js

@@ -134,6 +134,16 @@ export function SimpleLineTriangulation(feature) {
   var coordinates = feature.coordinates;
   var pos = [];
 
+  if (!Array.isArray(coordinates[0])) {
+    return {
+      vertices: [],
+      indices: [],
+      normals: [],
+      size: 6,
+      count: 0
+    };
+  }
+
   var _getSimpleLineVertice = getSimpleLineVertices(coordinates),
       results = _getSimpleLineVertice.results,
       totalDistance = _getSimpleLineVertice.totalDistance;
@@ -149,6 +159,32 @@ export function SimpleLineTriangulation(feature) {
     count: results.length
   };
 }
+export function TileSimpleLineTriangulation(feature) {
+  var coordinates = feature.coordinates;
+  var pos = [];
+
+  if (!Array.isArray(coordinates[0])) {
+    return {
+      vertices: [],
+      indices: [],
+      size: 4,
+      count: 0
+    };
+  }
+
+  var _getTileSimpleLineVer = getTileSimpleLineVertices(coordinates),
+      results = _getTileSimpleLineVer.results;
+
+  results.map(function (point) {
+    pos.push(point[0], point[1], point[2], point[3]);
+  });
+  return {
+    vertices: pos,
+    indices: [],
+    size: 4,
+    count: results.length
+  };
+}
 
 function lineSegmentDistance(b1, a1) {
   var dx = a1[0] - b1[0];
@@ -161,7 +197,10 @@ function pushDis(point, n) {
     point.push(0);
   }
 
-  point.push(n);
+  if (n !== undefined) {
+    point.push(n);
+  }
+
   return point;
 }
 
@@ -196,6 +235,29 @@ function getSimpleLineVertices(points) {
   }
 }
 
+function getTileSimpleLineVertices(points) {
+  if (points.length < 2) {
+    return {
+      results: points
+    };
+  } else {
+    var results = [];
+    var point = pushDis(points[0]);
+    results.push(point);
+
+    for (var i = 1; i < points.length - 1; i++) {
+      var mulPoint = pushDis(points[i]);
+      results.push(mulPoint);
+      results.push(mulPoint);
+    }
+
+    results.push(pushDis(points[points.length - 1]));
+    return {
+      results: results
+    };
+  }
+}
+
 export function polygonTriangulation(feature) {
   var coordinates = feature.coordinates;
   var flattengeo = earcut.flatten(coordinates);
@@ -207,7 +269,7 @@ export function polygonTriangulation(feature) {
     vertices: vertices,
     size: dimensions
   };
-} // TODO：构建几何图形（带有中心点和大小）
+} // 构建几何图形（带有中心点和大小）
 
 export function polygonTriangulationWithCenter(feature) {
   var coordinates = feature.coordinates;

package/es/earth/index.js

@@ -61,7 +61,9 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
     /**

package/es/earth/models/atmosphere.js

@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/atmosphere_frag.glsl' */
-var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\n\nvarying vec3 vVertexNormal;\nvarying float v_offset;\nvarying vec4 v_Color;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // TODO: \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\n\nvarying vec3 vVertexNormal;\nvarying float v_offset;\nvarying vec4 v_Color;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/atmosphere_vert.glsl' */
 var atmoSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nvarying float v_CamreaDistance;\n\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\nvarying float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n    \n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
@@ -57,7 +57,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       // TODO: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -997;
       this.layer.buildLayerModel({
-        moduleName: 'earthAtmo',
+        moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
         triangulation: earthTriangulation,
@@ -82,13 +82,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -101,7 +100,6 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -118,13 +116,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/earth/models/base.js

@@ -54,7 +54,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
           animateOption = _this$layer$getLayerC.animateOption,
-          globelOtions = _this$layer$getLayerC.globelOtions;
+          globalOptions = _this$layer$getLayerC.globalOptions;
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         // @ts-ignore
@@ -69,13 +69,12 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       return {
-        u_ambientRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.ambientRatio) || 0.6,
+        u_ambientRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.ambientRatio) || 0.6,
         // 环境光
-        u_diffuseRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.diffuseRatio) || 0.4,
+        u_diffuseRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.diffuseRatio) || 0.4,
         // 漫反射
-        u_specularRatio: (globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.specularRatio) || 0.1,
+        u_specularRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.specularRatio) || 0.1,
         // 高光反射
-        // u_sunLight: [120, 120, 120],
         u_sunLight: [this.sunX, this.sunY, this.sunZ],
         u_texture: this.texture
       };
@@ -87,7 +86,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       this.sunY = 10;
       this.sunX = Math.cos(this.earthTime) * (this.sunRadius - this.sunY);
       this.sunZ = Math.sin(this.earthTime) * (this.sunRadius - this.sunY);
-      this.layerService.renderLayers();
+      this.layerService.throttleRenderLayers();
     }
   }, {
     key: "initModels",
@@ -95,10 +94,10 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       var _this2 = this;
 
       var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
-          globelOtions = _this$layer$getLayerC2.globelOtions;
+          globalOptions = _this$layer$getLayerC2.globalOptions;
 
-      if ((globelOtions === null || globelOtions === void 0 ? void 0 : globelOtions.earthTime) !== undefined) {
-        this.setEarthTime(globelOtions.earthTime);
+      if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
+        this.setEarthTime(globalOptions.earthTime);
       }
 
       var source = this.layer.getSource();
@@ -114,9 +113,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
           height: imageData[0].height
         });
 
-        _this2.layerService.updateLayerRenderList();
-
-        _this2.layerService.renderLayers();
+        _this2.layerService.reRender();
       });
       this.buildModels(callbackModel);
     }
@@ -128,7 +125,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序 地球大气层
+      // Tip: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -998;
       this.layer.buildLayerModel({
         moduleName: 'earthBase',
@@ -149,20 +146,18 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -175,7 +170,6 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -198,7 +192,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/earth/models/bloomsphere.js

@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
 import { earthOuterTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/bloomsphere_frag.glsl' */
-var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // TODO: \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/bloomsphere_vert.glsl' */
 var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
@@ -54,7 +54,7 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function buildModels(callbackModel) {
-      // TODO: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+      // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
       this.layer.zIndex = -999;
       this.layer.buildLayerModel({
         moduleName: 'earthBloom',
@@ -75,20 +75,18 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -101,7 +99,6 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -118,13 +115,12 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/earth/shaders/atmosphere_frag.glsl

@@ -10,7 +10,7 @@ void main() {
     
     // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
     float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
-    // TODO: 去除背面
+    // 去除背面
     if(intensity > 1.0) intensity = 0.0;
 
     gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);

package/es/earth/shaders/bloomsphere_frag.glsl

@@ -8,7 +8,7 @@ void main() {
 
 
     float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
-    // TODO: 去除背面
+    // 去除背面
     if(intensity > 1.0) intensity = 0.0;
 
     gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);

package/es/heatmap/index.d.ts

@@ -1,4 +1,4 @@
-import { IAttrubuteAndElements } from '@antv/l7-core';
+import { IAttributeAndElements } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import { IHeatMapLayerStyleOptions } from '../core/interface';
 import { HeatMapModelType } from './models';
@@ -7,7 +7,7 @@ export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     buildModels(): void;
     rebuildModels(): void;
     renderModels(): this;
-    updateModelData(data: IAttrubuteAndElements): void;
+    updateModelData(data: IAttributeAndElements): void;
     protected getConfigSchema(): {
         properties: {
             opacity: {

package/es/heatmap/index.js

@@ -44,7 +44,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -53,7 +55,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {
@@ -74,9 +78,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       if (this.layerModelNeedUpdate) {
         this.layerModel.buildModels(function (models) {
           return _this4.models = models;
-        }); // @ts-ignore
-        // this.models = this.layerModel.buildModels();
-
+        });
         this.layerModelNeedUpdate = false;
       }
 

package/es/heatmap/models/grid.js

@@ -86,14 +86,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
-            // const coordinates = feature.coordinates as number[];
+          update: function update(feature) {
             var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
             return [coordinates[0], coordinates[1], 0];
           }

package/es/heatmap/models/grid3d.js

@@ -80,33 +80,29 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var size = feature.size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
-      }); // 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
@@ -124,16 +120,13 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
-            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates; // const coordinates = feature.coordinates as number[];
-            // const coordinates = feature.originCoordinates as number[];
-
+          update: function update(feature) {
+            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
             return [coordinates[0], coordinates[1], 0];
           }
         }