@antv/l7-layers 2.21.1 → 2.21.3

package/lib/core/utils.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.MultipleOfFourNumber = MultipleOfFourNumber;
 exports.formatUniformsOption2Std140 = formatUniformsOption2Std140;
 function formatUniformsOption2Std140(uniformsOption) {
-  var std140_str = '';
-  Object.keys(uniformsOption).forEach(function (key) {
-    var value = uniformsOption[key];
+  let std140_str = '';
+  Object.keys(uniformsOption).forEach(key => {
+    const value = uniformsOption[key];
     if (Array.isArray(value)) {
-      std140_str += "vec".concat(value.length, " ").concat(key, ";\n");
+      std140_str += `vec${value.length} ${key};\n`;
     } else {
-      std140_str += "flot ".concat(key, ";\n");
+      std140_str += `flot ${key};\n`;
     }
   });
   return std140_str;

package/lib/earth/index.d.ts

@@ -0,0 +1,22 @@
+import type { ISourceCFG } from '@antv/l7-core';
+import BaseLayer from '../core/BaseLayer';
+interface IEarthLayerStyleOptions {
+    opacity: number;
+    setEarthTime(time: number): void;
+}
+export type EarthModelType = 'base' | 'atomSphere' | 'bloomSphere';
+export default class EarthLayer extends BaseLayer<IEarthLayerStyleOptions> {
+    type: string;
+    defaultSourceConfig: {
+        data: any[];
+        options: ISourceCFG | undefined;
+    };
+    buildModels(): Promise<void>;
+    /**
+     * 设置当前地球时间
+     * @param time
+     */
+    setEarthTime(time: number): void;
+    getModelType(): EarthModelType;
+}
+export {};

package/lib/earth/index.js

@@ -5,39 +5,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
+var _BaseLayer = _interopRequireDefault(require("../core/BaseLayer"));
 var _atmosphere = _interopRequireDefault(require("./models/atmosphere"));
 var _base = _interopRequireDefault(require("./models/base"));
 var _bloomsphere = _interopRequireDefault(require("./models/bloomsphere"));
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-var EarthModels = {
+const EarthModels = {
   base: _base.default,
   atomSphere: _atmosphere.default,
   bloomSphere: _bloomsphere.default
 };
-var earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
-var EarthLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
-  (0, _inherits2.default)(EarthLayer, _BaseLayer);
-  var _super = _createSuper(EarthLayer);
-  function EarthLayer() {
-    var _this;
-    (0, _classCallCheck2.default)(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));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'EarthLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
+const earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
+class EarthLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'EarthLayer');
+    (0, _defineProperty2.default)(this, "defaultSourceConfig", {
       data: [],
       options: {
         parser: {
@@ -45,55 +29,35 @@ var EarthLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
         }
       }
     });
-    return _this;
   }
-  (0, _createClass2.default)(EarthLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shape;
-        return _regenerator.default.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 (0, _asyncToGenerator2.default)(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;
-}(_BaseLayer2.default);
+    return shape;
+  }
+}
+exports.default = EarthLayer;

package/lib/earth/models/atmosphere.d.ts

@@ -0,0 +1,15 @@
+import type { IModel } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class EarthAtomSphereModel extends BaseModel {
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    initModels(): Promise<IModel[]>;
+    clearModels(): string;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}

package/lib/earth/models/atmosphere.js

@@ -5,162 +5,114 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* 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";
-var isNumber = _l7Utils.lodashUtil.isNumber;
-var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(EarthAtomSphereModel, _BaseModel);
-  var _super = _createSuper(EarthAtomSphereModel);
-  function EarthAtomSphereModel() {
-    (0, _classCallCheck2.default)(this, EarthAtomSphereModel);
-    return _super.apply(this, arguments);
+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";
+const {
+  isNumber
+} = _l7Utils.lodashUtil;
+class EarthAtomSphereModel extends _BaseModel.default {
+  getCommonUniformsInfo() {
+    const {
+      opacity = 1
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_opacity: isNumber(opacity) ? opacity : 1.0
+    };
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
   }
-  (0, _createClass2.default)(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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.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: _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: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.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 (0, _asyncToGenerator2.default)(function* () {
+      _this.initUniformsBuffer();
+      return _this.buildModels();
+    })();
+  }
+  clearModels() {
+    return '';
+  }
+  buildModels() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      // TODO: 调整图层的绘制顺序 地球大气层
+      _this2.layer.zIndex = -997;
+      const model = yield _this2.layer.buildLayerModel({
+        moduleName: 'earthAtmoSphere',
+        vertexShader: atmoSphereVert,
+        fragmentShader: atmoSphereFrag,
+        triangulation: _triangulation.earthTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: _this2.getBlend()
       });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'normal',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Normal',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
-          buffer: {
-            usage: _l7Core.gl.STATIC_DRAW,
-            data: [],
-            type: _l7Core.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: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 1
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
         }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
+      }
+    });
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'normal',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Normal',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
+        buffer: {
+          usage: _l7Core.gl.STATIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 3,
+        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
+          return normal;
         }
-      });
-    }
-  }]);
-  return EarthAtomSphereModel;
-}(_BaseModel2.default);
+      }
+    });
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'uv',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Uv',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[3], vertex[4]];
+        }
+      }
+    });
+  }
+}
+exports.default = EarthAtomSphereModel;

package/lib/earth/models/base.d.ts

@@ -0,0 +1,22 @@
+import type { IModel, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class BaseEarthModel extends BaseModel {
+    protected texture: ITexture2D;
+    private earthTime;
+    private sunX;
+    private sunY;
+    private sunZ;
+    private sunRadius;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    setEarthTime(time: number): void;
+    initModels(): Promise<IModel[]>;
+    clearModels(): string;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}