@antv/l7-layers 2.16.0 → 2.16.1

package/es/earth/models/atmosphere.js

@@ -5,29 +5,40 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 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 { isNumber } from 'lodash';
 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    // \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";
+
 var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(EarthAtomSphereModel, _BaseModel);
+
   var _super = _createSuper(EarthAtomSphereModel);
+
   function EarthAtomSphereModel() {
     _classCallCheck(this, EarthAtomSphereModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(EarthAtomSphereModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
+
       return {
         u_opacity: isNumber(opacity) ? opacity : 1.0
       };
@@ -37,18 +48,23 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -62,33 +78,39 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // TODO: 调整图层的绘制顺序 地球大气层
-              this.layer.zIndex = -997;
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'earthAtmoSphere',
-                vertexShader: atmoSphereVert,
-                fragmentShader: atmoSphereFrag,
-                triangulation: earthTriangulation,
-                depth: {
-                  enable: false
-                },
-                blend: this.getBlend()
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // TODO: 调整图层的绘制顺序 地球大气层
+                this.layer.zIndex = -997;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'earthAtmoSphere',
+                  vertexShader: atmoSphereVert,
+                  fragmentShader: atmoSphereFrag,
+                  triangulation: earthTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -108,7 +130,7 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 1 : _feature$size;
+                size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
@@ -147,6 +169,8 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
+
   return EarthAtomSphereModel;
 }(BaseModel);
+
 export { EarthAtomSphereModel as default };

package/es/earth/models/base.js

@@ -7,38 +7,57 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 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 BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../shaders/base_frag.glsl' */
 var baseFrag = "\nuniform sampler2D u_texture;\n\nvarying vec2 v_texCoord;\nvarying float v_lightWeight;\n\n\nvoid main() {\n\n    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    gl_FragColor = color;\n}\n";
+
 /* babel-plugin-inline-import '../shaders/base_vert.glsl' */
 var baseVert = "// attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform float u_ambientRatio : 0.5;\nuniform float u_diffuseRatio : 0.3;\nuniform float u_specularRatio : 0.2;\nuniform vec3 u_sunLight: [1.0, -10.5, 12.0];\n\n\n\nfloat calc_lighting(vec4 pos) {\n\n    vec3 worldPos = vec3(pos * u_ModelMatrix);\n\n    vec3 worldNormal = a_Normal;\n\n    // cal light weight\n    vec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n    vec3 lightDir = normalize(u_sunLight);\n\n    vec3 halfDir = normalize(viewDir+lightDir);\n    // lambert\n    float lambert = dot(worldNormal, lightDir);\n    // specular\n    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n    //sum to light weight\n    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n    return lightWeight;\n}\n\nvarying float v_lightWeight;\nvoid main() {\n\n    v_texCoord = a_Uv;\n\n    float lightWeight = calc_lighting(vec4(a_Position, 1.0));\n    v_lightWeight = lightWeight;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
+
 var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(BaseEarthModel, _BaseModel);
+
   var _super = _createSuper(BaseEarthModel);
+
   function BaseEarthModel() {
     var _this;
+
     _classCallCheck(this, BaseEarthModel);
+
     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), "earthTime", 3.4);
+
     _defineProperty(_assertThisInitialized(_this), "sunX", 1000);
+
     _defineProperty(_assertThisInitialized(_this), "sunY", 1000);
+
     _defineProperty(_assertThisInitialized(_this), "sunZ", 1000);
+
     _defineProperty(_assertThisInitialized(_this), "sunRadius", Math.sqrt(_this.sunX * _this.sunX + _this.sunY * _this.sunY + _this.sunZ * _this.sunZ));
+
     return _this;
   }
+
   _createClass(BaseEarthModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _this$layer$getLayerC = this.layer.getLayerConfig(),
-        animateOption = _this$layer$getLayerC.animateOption,
-        globalOptions = _this$layer$getLayerC.globalOptions;
+          animateOption = _this$layer$getLayerC.animateOption,
+          globalOptions = _this$layer$getLayerC.globalOptions;
+
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         // @ts-ignore
         // T: rotateY 方法只有在地球模式下存在
@@ -50,6 +69,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
         this.sunX = Math.cos(this.earthTime) * (this.sunRadius - this.sunY);
         this.sunZ = Math.sin(this.earthTime) * (this.sunRadius - this.sunY);
       }
+
       return {
         u_ambientRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.ambientRatio) || 0.6,
         // 环境光
@@ -75,38 +95,48 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this2 = this;
+
         var _this$layer$getLayerC2, globalOptions, source, createTexture2D;
+
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _this$layer$getLayerC2 = this.layer.getLayerConfig(), globalOptions = _this$layer$getLayerC2.globalOptions;
-              if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
-                this.setEarthTime(globalOptions.earthTime);
-              }
-              source = this.layer.getSource();
-              createTexture2D = this.rendererService.createTexture2D;
-              this.texture = createTexture2D({
-                height: 0,
-                width: 0
-              });
-              source.data.images.then(function (imageData) {
-                _this2.texture = createTexture2D({
-                  data: imageData[0],
-                  width: imageData[0].width,
-                  height: imageData[0].height
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this$layer$getLayerC2 = this.layer.getLayerConfig(), globalOptions = _this$layer$getLayerC2.globalOptions;
+
+                if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
+                  this.setEarthTime(globalOptions.earthTime);
+                }
+
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
                 });
-                _this2.layerService.reRender();
-              });
-              return _context.abrupt("return", this.buildModels());
-            case 7:
-            case "end":
-              return _context.stop();
+                source.data.images.then(function (imageData) {
+                  _this2.texture = createTexture2D({
+                    data: imageData[0],
+                    width: imageData[0].width,
+                    height: imageData[0].height
+                  });
+
+                  _this2.layerService.reRender();
+                });
+                return _context.abrupt("return", this.buildModels());
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -120,33 +150,39 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // Tip: 调整图层的绘制顺序 地球大气层
-              this.layer.zIndex = -998;
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'earthBase',
-                vertexShader: baseVert,
-                fragmentShader: baseFrag,
-                triangulation: earthTriangulation,
-                depth: {
-                  enable: true
-                },
-                blend: this.getBlend()
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // Tip: 调整图层的绘制顺序 地球大气层
+                this.layer.zIndex = -998;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'earthBase',
+                  vertexShader: baseVert,
+                  fragmentShader: baseFrag,
+                  triangulation: earthTriangulation,
+                  depth: {
+                    enable: true
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -165,7 +201,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 1 : _feature$size;
+                size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
@@ -205,6 +241,8 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
+
   return BaseEarthModel;
 }(BaseModel);
+
 export { BaseEarthModel as default };

package/es/earth/models/bloomsphere.js

@@ -5,29 +5,40 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 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 { isNumber } from 'lodash';
 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    // \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";
+
 var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(EarthBloomSphereModel, _BaseModel);
+
   var _super = _createSuper(EarthBloomSphereModel);
+
   function EarthBloomSphereModel() {
     _classCallCheck(this, EarthBloomSphereModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(EarthBloomSphereModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
+
       return {
         u_opacity: isNumber(opacity) ? opacity : 1.0
       };
@@ -37,18 +48,23 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -62,33 +78,39 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
-              this.layer.zIndex = -999;
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'earthBloom',
-                vertexShader: bloomSphereVert,
-                fragmentShader: bloomSphereFrag,
-                triangulation: earthOuterTriangulation,
-                depth: {
-                  enable: false
-                },
-                blend: this.getBlend()
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+                this.layer.zIndex = -999;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'earthBloom',
+                  vertexShader: bloomSphereVert,
+                  fragmentShader: bloomSphereFrag,
+                  triangulation: earthOuterTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -107,7 +129,7 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 1 : _feature$size;
+                size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
@@ -146,6 +168,8 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
+
   return EarthBloomSphereModel;
 }(BaseModel);
+
 export { EarthBloomSphereModel as default };

package/es/earth/utils.js

@@ -1,17 +1,16 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { mat4, vec3 } from 'gl-matrix';
-// 该文件专门记录地球模式的数值
-
+import { mat4, vec3 } from 'gl-matrix'; // 该文件专门记录地球模式的数值
 // 地球网格半径
+
 export var EARTH_RADIUS = 100;
 export var EARTH_SEGMENTS = 36;
 export var EARTH_RADIUS_OUTER = 40;
-
 /**
  * 角度转弧度
  * @param deg
  * @returns
  */
+
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }
@@ -21,25 +20,26 @@ function torad(deg) {
  * @param latitude 纬度
  * @param radius 半径
  */
+
+
 export function lglt2xyz(lnglat) {
   // TODO: + Math.PI/2 是为了对齐坐标
   var lng = torad(lnglat[0]) + Math.PI / 2;
-  var lat = torad(lnglat[1]);
+  var lat = torad(lnglat[1]); // TODO: 手动增加一些偏移，减轻面的冲突
 
-  // TODO: 手动增加一些偏移，减轻面的冲突
   var radius = EARTH_RADIUS + Math.random() * 0.4;
   var z = radius * Math.cos(lat) * Math.cos(lng);
   var x = radius * Math.cos(lat) * Math.sin(lng);
   var y = radius * Math.sin(lat);
   return [x, y, z];
 }
-
 /**
  * 构建地球球体网格
  * @param radius
  * @param opt
  * @returns
  */
+
 export function primitiveSphere(radius, opt) {
   var matRotY = mat4.create();
   var matRotZ = mat4.create();
@@ -56,9 +56,11 @@ export function primitiveSphere(radius, opt) {
   var positionsArr = [];
   var normalArr = [];
   var uvs = [];
+
   for (var zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
     var normalizedZ = zRotationStep / totalZRotationSteps;
     var angleZ = normalizedZ * Math.PI;
+
     for (var yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
       var normalizedY = yRotationStep / totalYRotationSteps;
       var angleY = normalizedY * Math.PI * 2;
@@ -73,14 +75,15 @@ export function primitiveSphere(radius, opt) {
       positionsArr.push.apply(positionsArr, _toConsumableArray(tmpVec3.slice()));
       vec3.normalize(tmpVec3, tmpVec3);
       normalArr.push.apply(normalArr, _toConsumableArray(tmpVec3.slice()));
-      uvs.push([normalizedY, 1 - normalizedZ]);
+      uvs.push([normalizedY, 1 - normalizedZ]); // position 和 uv 一起存储
 
-      // position 和 uv 一起存储
       positionsArr.push(normalizedY, 1 - normalizedZ);
     }
+
     if (zRotationStep > 0) {
       var verticesCount = positions.length;
       var firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
+
       for (; firstIndex + totalYRotationSteps + 2 < verticesCount; firstIndex++) {
         indices.push([firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1]);
         indicesArr.push(firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1);
@@ -89,6 +92,7 @@ export function primitiveSphere(radius, opt) {
       }
     }
   }
+
   return {
     cells: indices,
     positions: positions,