@antv/l7-layers 2.21.1 → 2.21.2

package/es/earth/index.js

@@ -1,36 +1,20 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-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 _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 BaseLayer from "../core/BaseLayer";
 import EarthAtomSphereModel from "./models/atmosphere";
 import BaseEarthModel from "./models/base";
 import EarthBloomSphereModel from "./models/bloomsphere";
-var EarthModels = {
+const EarthModels = {
   base: BaseEarthModel,
   atomSphere: EarthAtomSphereModel,
   bloomSphere: EarthBloomSphereModel
 };
-var earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
-var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
-  _inherits(EarthLayer, _BaseLayer);
-  var _super = _createSuper(EarthLayer);
-  function EarthLayer() {
-    var _this;
-    _classCallCheck(this, EarthLayer);
-    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", 'EarthLayer');
-    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+const earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
+export default class EarthLayer extends BaseLayer {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "type", 'EarthLayer');
+    _defineProperty(this, "defaultSourceConfig", {
       data: [],
       options: {
         parser: {
@@ -38,56 +22,34 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
         }
       }
     });
-    return _this;
   }
-  _createClass(EarthLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var shape;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              shape = this.getModelType();
-              this.layerModel = new EarthModels[shape](this);
-              _context.next = 4;
-              return this.initLayerModels();
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-    /**
-     * 设置当前地球时间
-     * @param time
-     */
-  }, {
-    key: "setEarthTime",
-    value: function setEarthTime(time) {
-      if (this.layerModel && this.layerModel.setEarthTime) {
-        this.layerModel.setEarthTime(time);
-      } else {
-        console.warn('请在 scene loaded 之后执行该方法！');
-      }
+  buildModels() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      const shape = _this.getModelType();
+      _this.layerModel = new EarthModels[shape](_this);
+      yield _this.initLayerModels();
+    })();
+  }
+
+  /**
+   * 设置当前地球时间
+   * @param time
+   */
+  setEarthTime(time) {
+    if (this.layerModel && this.layerModel.setEarthTime) {
+      this.layerModel.setEarthTime(time);
+    } else {
+      console.warn('请在 scene loaded 之后执行该方法！');
     }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      var _shapeAttribute$scale;
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
-      if (earthLayerTypes.indexOf(shape) < 0) {
-        shape = 'base';
-      }
-      return shape;
+  }
+  getModelType() {
+    var _shapeAttribute$scale;
+    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+    let shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
+    if (earthLayerTypes.indexOf(shape) < 0) {
+      shape = 'base';
     }
-  }]);
-  return EarthLayer;
-}(BaseLayer);
-export { EarthLayer as default };
+    return shape;
+  }
+}

package/es/earth/models/atmosphere.js

@@ -1,160 +1,110 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-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 { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_frag.glsl' */
-var atmoSphereFrag = "\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nin vec3 vVertexNormal;\nin float v_offset;\nin vec4 v_Color;\n\n#pragma include \"scene_uniforms\"\nout vec4 outputColor;\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    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+const atmoSphereFrag = "\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nin vec3 vVertexNormal;\nin float v_offset;\nin vec4 v_Color;\n\n#pragma include \"scene_uniforms\"\nout vec4 outputColor;\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    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_vert.glsl' */
-var atmoSphereVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) vec4 a_Color;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\nout vec3 vVertexNormal;\nout vec4 v_Color;\nout 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";
+const atmoSphereVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) vec4 a_Color;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_Uv;\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\nout vec3 vVertexNormal;\nout vec4 v_Color;\nout 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";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
-var isNumber = lodashUtil.isNumber;
-var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(EarthAtomSphereModel, _BaseModel);
-  var _super = _createSuper(EarthAtomSphereModel);
-  function EarthAtomSphereModel() {
-    _classCallCheck(this, EarthAtomSphereModel);
-    return _super.apply(this, arguments);
+const {
+  isNumber
+} = lodashUtil;
+export default class EarthAtomSphereModel extends BaseModel {
+  getCommonUniformsInfo() {
+    const {
+      opacity = 1
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_opacity: isNumber(opacity) ? opacity : 1.0
+    };
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
   }
-  _createClass(EarthAtomSphereModel, [{
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
-      var commonOptions = {
-        u_opacity: isNumber(opacity) ? opacity : 1.0
-      };
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "initModels",
-    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:
-              this.initUniformsBuffer();
-              return _context.abrupt("return", this.buildModels());
-            case 2:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      return '';
-    }
-  }, {
-    key: "buildModels",
-    value: function () {
-      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();
-          }
-        }, _callee2, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          shaderLocation: ShaderLocation.SIZE,
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 1 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
-        }
+  initModels() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.initUniformsBuffer();
+      return _this.buildModels();
+    })();
+  }
+  clearModels() {
+    return '';
+  }
+  buildModels() {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      // TODO: 调整图层的绘制顺序 地球大气层
+      _this2.layer.zIndex = -997;
+      const model = yield _this2.layer.buildLayerModel({
+        moduleName: 'earthAtmoSphere',
+        vertexShader: atmoSphereVert,
+        fragmentShader: atmoSphereFrag,
+        triangulation: earthTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: _this2.getBlend()
       });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'normal',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Normal',
-          shaderLocation: ShaderLocation.NORMAL,
-          buffer: {
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
-            return normal;
-          }
+      return [model];
+    })();
+  }
+  registerBuiltinAttributes() {
+    // point layer size;
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: ShaderLocation.SIZE,
+        buffer: {
+          usage: gl.DYNAMIC_DRAW,
+          data: [],
+          type: gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 1
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
         }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          shaderLocation: ShaderLocation.UV,
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
+      }
+    });
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'normal',
+      type: AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Normal',
+        shaderLocation: ShaderLocation.NORMAL,
+        buffer: {
+          usage: gl.STATIC_DRAW,
+          data: [],
+          type: gl.FLOAT
+        },
+        size: 3,
+        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
+          return normal;
         }
-      });
-    }
-  }]);
-  return EarthAtomSphereModel;
-}(BaseModel);
-export { EarthAtomSphereModel as default };
+      }
+    });
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'uv',
+      type: AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Uv',
+        shaderLocation: ShaderLocation.UV,
+        buffer: {
+          usage: gl.DYNAMIC_DRAW,
+          data: [],
+          type: gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[3], vertex[4]];
+        }
+      }
+    });
+  }
+}