@antv/l7-layers 2.9.25-alpha.0 → 2.9.26-alpha.1

package/lib/earth/index.js

@@ -1,69 +1,107 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/earth/index.ts
-var earth_exports = {};
-__export(earth_exports, {
-  default: () => EarthLayer
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(earth_exports);
-var import_BaseLayer = __toESM(require("../core/BaseLayer"));
-var import_atmosphere = __toESM(require("./models/atmosphere"));
-var import_base = __toESM(require("./models/base"));
-var import_bloomsphere = __toESM(require("./models/bloomsphere"));
+exports.default = void 0;
+
+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 _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 = {
-  base: import_base.default,
-  atomSphere: import_atmosphere.default,
-  bloomSphere: import_bloomsphere.default
+  base: _base.default,
+  atomSphere: _atmosphere.default,
+  bloomSphere: _bloomsphere.default
 };
-var earthLayerTypes = ["base", "atomSphere", "bloomSphere"];
-var EarthLayer = class extends import_BaseLayer.default {
-  constructor() {
-    super(...arguments);
-    this.type = "EarthLayer";
-  }
-  buildModels() {
-    const shape = this.getModelType();
-    this.layerModel = new EarthModels[shape](this);
-    this.layerModel.initModels((models) => {
-      this.models = models;
-      this.renderLayers();
-    });
-  }
-  setEarthTime(time) {
-    if (this.layerModel && this.layerModel.setEarthTime) {
-      this.layerModel.setEarthTime(time);
-    } else {
-      console.warn("\u8BF7\u5728 scene loaded \u4E4B\u540E\u6267\u884C\u8BE5\u65B9\u6CD5\uFF01");
+var earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
+
+var EarthLayer = /*#__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');
+    return _this;
   }
-  getModelType() {
-    var _a;
-    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");
-    let shape = ((_a = shapeAttribute == null ? void 0 : shapeAttribute.scale) == null ? void 0 : _a.field) || "base";
-    if (earthLayerTypes.indexOf(shape) < 0) {
-      shape = "base";
+
+  (0, _createClass2.default)(EarthLayer, [{
+    key: "buildModels",
+    value: function buildModels() {
+      var _this2 = this;
+
+      var shape = this.getModelType();
+      this.layerModel = new EarthModels[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this2.models = models;
+
+        _this2.renderLayers();
+      });
     }
-    return shape;
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+    /**
+     * 设置当前地球时间
+     * @param time
+     */
+
+  }, {
+    key: "setEarthTime",
+    value: function 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 ? 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;
+    }
+  }]);
+  return EarthLayer;
+}(_BaseLayer2.default);
+
+exports.default = EarthLayer;

package/lib/earth/models/atmosphere.js

@@ -1,118 +1,152 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/earth/models/atmosphere.ts
-var atmosphere_exports = {};
-__export(atmosphere_exports, {
-  default: () => EarthAtomSphereModel
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(atmosphere_exports);
-var import_l7_core = require("@antv/l7-core");
-var import_lodash = require("lodash");
-var import_BaseModel = __toESM(require("../../core/BaseModel"));
-var import_triangulation = require("../../core/triangulation");
-var import_atmosphere_frag = __toESM(require("../shaders/atmosphere_frag.glsl"));
-var import_atmosphere_vert = __toESM(require("../shaders/atmosphere_vert.glsl"));
-var EarthAtomSphereModel = class extends import_BaseModel.default {
-  getUninforms() {
-    const {
-      opacity = 1
-    } = this.layer.getLayerConfig();
-    return {
-      u_opacity: (0, import_lodash.isNumber)(opacity) ? opacity : 1
-    };
-  }
-  initModels(callbackModel) {
-    this.buildModels(callbackModel);
-  }
-  clearModels() {
-    return "";
-  }
-  buildModels(callbackModel) {
-    this.layer.zIndex = -997;
-    this.layer.buildLayerModel({
-      moduleName: "earthAtmo",
-      vertexShader: import_atmosphere_vert.default,
-      fragmentShader: import_atmosphere_frag.default,
-      triangulation: import_triangulation.earthTriangulation,
-      depth: { enable: false },
-      blend: this.getBlend()
-    }).then((model) => {
-      callbackModel([model]);
-    }).catch((err) => {
-      console.warn(err);
-      callbackModel([]);
-    });
+exports.default = void 0;
+
+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 _lodash = require("lodash");
+
+var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+
+var _triangulation = require("../../core/triangulation");
+
+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_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";
+
+/* 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) {
+  (0, _inherits2.default)(EarthAtomSphereModel, _BaseModel);
+
+  var _super = _createSuper(EarthAtomSphereModel);
+
+  function EarthAtomSphereModel() {
+    (0, _classCallCheck2.default)(this, EarthAtomSphereModel);
+    return _super.apply(this, arguments);
   }
-  registerBuiltinAttributes() {
-    this.styleAttributeService.registerStyleAttribute({
-      name: "size",
-      type: import_l7_core.AttributeType.Attribute,
-      descriptor: {
-        name: "a_Size",
-        buffer: {
-          usage: import_l7_core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: import_l7_core.gl.FLOAT
+
+  (0, _createClass2.default)(EarthAtomSphereModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      var _ref = this.layer.getLayerConfig(),
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
+
+      return {
+        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1.0
+      };
+    }
+  }, {
+    key: "initModels",
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      return '';
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels(callbackModel) {
+      // TODO: 调整图层的绘制顺序 地球大气层
+      this.layer.zIndex = -997;
+      this.layer.buildLayerModel({
+        moduleName: 'earthAtmo',
+        vertexShader: atmoSphereVert,
+        fragmentShader: atmoSphereFrag,
+        triangulation: _triangulation.earthTriangulation,
+        depth: {
+          enable: false
         },
-        size: 1,
-        update: (feature, featureIdx, vertex, attributeIdx) => {
-          const { size = 1 } = feature;
-          return Array.isArray(size) ? [size[0]] : [size];
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      // point layer size;
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'size',
+        type: _l7Core.AttributeType.Attribute,
+        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) {
+            var _feature$size = feature.size,
+                size = _feature$size === void 0 ? 1 : _feature$size;
+            return Array.isArray(size) ? [size[0]] : [size];
+          }
         }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: "normal",
-      type: import_l7_core.AttributeType.Attribute,
-      descriptor: {
-        name: "a_Normal",
-        buffer: {
-          usage: import_l7_core.gl.STATIC_DRAW,
-          data: [],
-          type: import_l7_core.gl.FLOAT
-        },
-        size: 3,
-        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
-          return normal;
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'normal',
+        type: _l7Core.AttributeType.Attribute,
+        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
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
+            return normal;
+          }
         }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: "uv",
-      type: import_l7_core.AttributeType.Attribute,
-      descriptor: {
-        name: "a_Uv",
-        buffer: {
-          usage: import_l7_core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: import_l7_core.gl.FLOAT
-        },
-        size: 2,
-        update: (feature, featureIdx, vertex, attributeIdx) => {
-          return [vertex[3], vertex[4]];
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'uv',
+        type: _l7Core.AttributeType.Attribute,
+        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) {
+            return [vertex[3], vertex[4]];
+          }
         }
-      }
-    });
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+      });
+    }
+  }]);
+  return EarthAtomSphereModel;
+}(_BaseModel2.default);
+
+exports.default = EarthAtomSphereModel;