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

package/lib/core/BaseLayer.js

@@ -83,13 +83,13 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
   // 生命周期钩子
   // 待渲染 model 列表
-  // TODO: 用于保存子图层对象
+  // 用于保存子图层对象
   // Tip: 用于标识矢量图层
 
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
-  // TODO: layer 保底颜色
+  // Tip: layer 保底颜色
   // private pickingPassRender: IPass<'pixelPicking'>;
   function BaseLayer() {
     var _this;
@@ -149,9 +149,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "currentPickId", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pendingStyleAttributes", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scaleOptions", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "aniamateStatus", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "animateStatus", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "bottomColor", 'rgba(0, 0, 0, 0)');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDestroied", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isDestroyed", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "encodeDataLength", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
       _this.dataState.dataSourceNeedUpdate = true;
@@ -160,9 +160,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       if (layerConfig && layerConfig.autoFit) {
         _this.fitBounds(layerConfig.fitBoundsOptions);
-      } // 对外暴露事件 迁移到 DataMappingPlugin generateMapping，保证在重新重新映射后触发
-      // this.emit('dataUpdate');
-
+      }
 
       _this.reRender();
     });
@@ -253,11 +251,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "addPlugin",
     value: function addPlugin(plugin) {
-      // TODO: 控制插件注册顺序
-      // @example:
-      // pointLayer.addPlugin(new MyCustomPlugin(), {
-      //   before: 'L7BuiltinPlugin'
-      // });
       this.plugins.push(plugin);
       return this;
     }
@@ -420,21 +413,13 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
-        this.aniamateStatus = true;
+        this.animateStatus = true;
       }
     }
   }, {
     key: "color",
     value: function color(field, values, updateOptions) {
-      // 设置 color、size、shape、style 时由于场景服务尚未完成（并没有调用 scene.addLayer），因此暂时加入待更新属性列表
-      this.updateStyleAttribute('color', field, values, updateOptions); // this.pendingStyleAttributes.push({
-      //   attributeName: 'color',
-      //   attributeField: field,
-      //   attributeValues: values,
-      //   defaultName: 'colors',
-      //   updateOptions,
-      // });
-
+      this.updateStyleAttribute('color', field, values, updateOptions);
       return this;
     } // 为对应的图层传入纹理的编号名称（point/image 在 shape 方法中传入纹理名称的方法并不通用）
 
@@ -474,7 +459,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions); // TODO: 根据 shape 判断是否需要更新 model
+      this.updateStyleAttribute('shape', field, values, updateOptions); // Tip: 根据 shape 判断是否需要更新 model
 
       if (!this.tileLayer) {
         (0, _updateShape.updateShape)(this, lastShape, currentShape);
@@ -507,8 +492,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       this.updateLayerConfig({
         animateOption: rawAnimate
-      }); // this.animateOptions = options;
-
+      });
       return this;
     }
   }, {
@@ -613,7 +597,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "render",
     value: function render() {
-      if (this.tileLayer !== undefined) {
+      if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
         return this;
@@ -810,11 +794,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "hide",
     value: function hide() {
-      if (this.type === 'CanvasLayer' && this.layerModel.clearCanvas) {
-        // 对 canvasLayer 的 hide 操作做特殊处理
-        this.layerModel.clearCanvas();
-      }
-
       this.updateLayerConfig({
         visible: false
       });
@@ -970,35 +949,34 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$layerModel2;
+      var _this$multiPassRender, _this$layerModel2;
 
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
-      if (this.isDestroied) {
+      if (this.isDestroyed) {
         return;
       } // remove child layer
 
 
       this.layerChildren.map(function (child) {
-        return child.destroy();
+        return child.destroy(false);
       });
       this.layerChildren = []; // remove mask list
 
       this.masks.map(function (mask) {
-        return mask.destroy();
+        return mask.destroy(false);
       });
       this.masks = [];
       this.hooks.beforeDestroy.call(); // 清除sources事件
 
       this.layerSource.off('sourceUpdate', this.sourceEvent);
-      this.multiPassRenderer.destroy(); // console.log(this.styleAttributeService.getAttributes())
-      // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
+      (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 ? void 0 : _this$multiPassRender.destroy(); // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
 
       this.styleAttributeService.clearAllAttributes(); // 执行每个图层单独的 clearModels 方法 （清除一些额外的 texture、program、buffer 等）
 
-      this.hooks.afterDestroy.call(); // TODO: 清除各个图层自定义的 models 资源
+      this.hooks.afterDestroy.call(); // Tip: 清除各个图层自定义的 models 资源
 
-      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels();
+      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels(refresh);
       this.models = [];
       this.layerService.cleanRemove(this, refresh);
       this.emit('remove', {
@@ -1012,7 +990,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.removeAllListeners(); // 解绑图层容器中的服务
       // this.container.unbind(TYPES.IStyleAttributeService);
 
-      this.isDestroied = true;
+      this.isDestroyed = true;
     }
   }, {
     key: "clear",
@@ -1173,50 +1151,52 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       var createModel = this.rendererService.createModel;
       return new Promise(function (resolve, reject) {
-        // filter supported worker & worker enabled layer
-        if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
-          _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
-            var attributes = _ref7.attributes,
-                elements = _ref7.elements;
-            var m = createModel((0, _objectSpread2.default)({
+        setTimeout(function () {
+          // filter supported worker & worker enabled layer
+          if (workerOptions && workerOptions.modelType in _l7Utils.WorkerSourceMap && workerEnabled) {
+            _this9.styleAttributeService.createAttributesAndIndicesAscy(_this9.encodedData, segmentNumber, workerOptions).then(function (_ref7) {
+              var attributes = _ref7.attributes,
+                  elements = _ref7.elements;
+              var m = createModel((0, _objectSpread2.default)({
+                attributes: attributes,
+                uniforms: uniforms,
+                fs: fs,
+                vs: vs,
+                elements: elements,
+                blend: _blend.BlendTypes[_l7Core.BlendType.normal]
+              }, rest));
+              resolve(m);
+            }).catch(function (err) {
+              return reject(err);
+            });
+          } else {
+            var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
+                attributes = _this9$styleAttribute.attributes,
+                elements = _this9$styleAttribute.elements,
+                count = _this9$styleAttribute.count;
+
+            var modelOptions = (0, _objectSpread2.default)({
               attributes: attributes,
               uniforms: uniforms,
               fs: fs,
               vs: vs,
               elements: elements,
               blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-            }, rest));
+            }, rest);
+
+            if (count) {
+              modelOptions.count = count;
+            }
+
+            var m = createModel(modelOptions);
             resolve(m);
-          }).catch(function (err) {
-            return reject(err);
-          });
-        } else {
-          var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
-              attributes = _this9$styleAttribute.attributes,
-              elements = _this9$styleAttribute.elements,
-              count = _this9$styleAttribute.count;
-
-          var modeloptions = (0, _objectSpread2.default)({
-            attributes: attributes,
-            uniforms: uniforms,
-            fs: fs,
-            vs: vs,
-            elements: elements,
-            blend: _blend.BlendTypes[_l7Core.BlendType.normal]
-          }, rest);
-
-          if (count) {
-            modeloptions.count = count;
           }
-
-          var m = createModel(modeloptions);
-          resolve(m);
-        }
+        });
       });
     }
   }, {
-    key: "createAttrubutes",
-    value: function createAttrubutes(options) {
+    key: "createAttributes",
+    value: function createAttributes(options) {
       var triangulation = options.triangulation; // @ts-ignore
 
       var _this$styleAttributeS4 = this.styleAttributeService.createAttributes(this.encodedData, triangulation),
@@ -1237,9 +1217,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "stopAnimate",
     value: function stopAnimate() {
-      if (this.aniamateStatus) {
+      if (this.animateStatus) {
         this.layerService.stopAnimate();
-        this.aniamateStatus = false;
+        this.animateStatus = false;
         this.updateLayerConfig({
           animateOption: {
             enable: false
@@ -1255,6 +1235,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "needPick",
     value: function needPick(type) {
+      // 地图图层的判断
+      if (this.rawConfig.usage === 'basemap') return false;
+
       var _this$getLayerConfig10 = this.getLayerConfig(),
           _this$getLayerConfig11 = _this$getLayerConfig10.enableHighlight,
           enableHighlight = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11,
@@ -1312,8 +1295,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "renderModels",
     value: function renderModels(isPicking) {
-      var _this10 = this,
-          _this$layerModel4;
+      var _this10 = this;
 
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) return this;
@@ -1328,10 +1310,6 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         });
       }
 
-      if (this !== null && this !== void 0 && (_this$layerModel4 = this.layerModel) !== null && _this$layerModel4 !== void 0 && _this$layerModel4.renderUpdate) {
-        this.layerModel.renderUpdate();
-      }
-
       this.models.forEach(function (model) {
         model.draw({
           uniforms: _this10.layerModel.getUninforms()
@@ -1370,6 +1348,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
      * 继承空方法
      * @param time
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
     key: "setEarthTime",
@@ -1394,10 +1373,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "reRender",
     value: function reRender() {
-      if (this.inited) {
-        this.layerService.updateLayerRenderList();
-        this.layerService.renderLayers();
-      }
+      this.inited && this.layerService.reRender();
     }
   }, {
     key: "splitValuesAndCallbackInAttribute",

package/lib/core/BaseModel.js

@@ -79,7 +79,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       stroke: undefined,
       offsets: undefined
     };
-    this.stylePropertyesExist = {
+    this.stylePropertiesExist = {
       hasThetaOffset: 0,
       hasOpacity: 0,
       hasStrokeOpacity: 0,
@@ -115,7 +115,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       this.cellLength = 0; // 清空上一次计算的 cell 的长度
 
-      this.stylePropertyesExist = {
+      this.stylePropertiesExist = {
         // 全量清空上一次是否需要对 style 属性进行数据映射的判断
         hasThetaOffset: 0,
         hasOpacity: 0,
@@ -133,13 +133,13 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         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 {
@@ -216,7 +216,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'opacity',
           count: 1
         });
-        this.stylePropertyesExist.hasOpacity = 1;
+        this.stylePropertiesExist.hasOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -226,7 +226,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'strokeOpacity',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeOpacity = 1;
+        this.stylePropertiesExist.hasStrokeOpacity = 1;
         this.cellLength += 1;
       }
 
@@ -236,7 +236,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'strokeWidth',
           count: 1
         });
-        this.stylePropertyesExist.hasStrokeWidth = 1;
+        this.stylePropertiesExist.hasStrokeWidth = 1;
         this.cellLength += 1;
       }
 
@@ -246,7 +246,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'stroke',
           count: 4
         });
-        this.stylePropertyesExist.hasStroke = 1;
+        this.stylePropertiesExist.hasStroke = 1;
         this.cellLength += 4;
       }
 
@@ -256,7 +256,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'offsets',
           count: 2
         });
-        this.stylePropertyesExist.hasOffsets = 1;
+        this.stylePropertiesExist.hasOffsets = 1;
         this.cellLength += 2;
       }
 
@@ -266,10 +266,9 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           attr: 'thetaOffset',
           count: 1
         });
-        this.stylePropertyesExist.hasThetaOffset = 1;
+        this.stylePropertiesExist.hasThetaOffset = 1;
         this.cellLength += 1;
-      } // console.log('this.cellLength', this.cellLength)
-
+      }
     }
     /**
      * 判断变量 stroke 是否是常量值
@@ -446,20 +445,24 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     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/lib/core/triangulation.js

@@ -18,6 +18,7 @@ exports.PointImageTriangulation = PointImageTriangulation;
 exports.PolygonExtrudeTriangulation = PolygonExtrudeTriangulation;
 exports.RasterImageTriangulation = RasterImageTriangulation;
 exports.SimpleLineTriangulation = SimpleLineTriangulation;
+exports.TileSimpleLineTriangulation = TileSimpleLineTriangulation;
 exports.earthOuterTriangulation = earthOuterTriangulation;
 exports.earthTriangulation = earthTriangulation;
 exports.polygonTriangulation = polygonTriangulation;
@@ -177,6 +178,16 @@ 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;
@@ -193,6 +204,33 @@ function SimpleLineTriangulation(feature) {
   };
 }
 
+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];
   var dy = a1[1] - b1[1];
@@ -204,7 +242,10 @@ function pushDis(point, n) {
     point.push(0);
   }
 
-  point.push(n);
+  if (n !== undefined) {
+    point.push(n);
+  }
+
   return point;
 }
 
@@ -239,6 +280,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
+    };
+  }
+}
+
 function polygonTriangulation(feature) {
   var coordinates = feature.coordinates;
 
@@ -252,7 +316,7 @@ function polygonTriangulation(feature) {
     vertices: vertices,
     size: dimensions
   };
-} // TODO：构建几何图形（带有中心点和大小）
+} // 构建几何图形（带有中心点和大小）
 
 
 function polygonTriangulationWithCenter(feature) {

package/lib/earth/index.js

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

package/lib/earth/models/atmosphere.js

@@ -30,7 +30,7 @@ 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; } }
 
 /* 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";
@@ -72,7 +72,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       // TODO: 调整图层的绘制顺序 地球大气层
       this.layer.zIndex = -997;
       this.layer.buildLayerModel({
-        moduleName: 'earthAtmo',
+        moduleName: 'earthAtmoSphere',
         vertexShader: atmoSphereVert,
         fragmentShader: atmoSphereFrag,
         triangulation: _triangulation.earthTriangulation,
@@ -97,13 +97,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.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];
@@ -116,7 +115,6 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Normal',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -133,13 +131,12 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }