@antv/l7-layers 2.9.21 → 2.9.23

package/lib/earth/shaders/atmosphere_vert.glsl

@@ -0,0 +1,26 @@
+
+attribute vec3 a_Position;
+attribute vec3 a_Normal;
+attribute vec2 a_Uv;
+attribute vec4 a_Color;
+uniform vec3 u_CameraPosition;
+varying float v_CamreaDistance;
+
+uniform mat4 u_ViewProjectionMatrix;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_ViewMatrix;
+
+varying vec3 vVertexNormal;
+varying vec4 v_Color;
+varying float v_offset;
+
+void main() {
+    float EARTH_RADIUS = 100.0;
+    
+    v_Color = a_Color;
+
+    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);
+    vVertexNormal = a_Normal;
+
+    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

package/lib/earth/shaders/base_frag.glsl

@@ -0,0 +1,13 @@
+
+uniform sampler2D u_texture;
+
+varying vec2 v_texCoord;
+varying float v_lightWeight;
+
+
+void main() {
+
+    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));
+    color.xyz = color.xyz * v_lightWeight;
+    gl_FragColor = color;
+}

package/lib/earth/shaders/base_vert.glsl

@@ -0,0 +1,52 @@
+// attribute vec4 a_Color;
+attribute vec3 a_Position;
+attribute vec3 a_Normal;
+attribute vec2 a_Uv;
+varying vec2 v_texCoord;
+
+// attribute vec2 a_Extrude;
+// attribute float a_Size;
+// attribute float a_Shape;
+
+uniform vec3 u_CameraPosition;
+uniform mat4 u_ViewProjectionMatrix;
+uniform mat4 u_ModelMatrix;
+uniform float u_ambientRatio : 0.5;
+uniform float u_diffuseRatio : 0.3;
+uniform float u_specularRatio : 0.2;
+uniform vec3 u_sunLight: [1.0, -10.5, 12.0];
+
+
+
+float calc_lighting(vec4 pos) {
+
+    vec3 worldPos = vec3(pos * u_ModelMatrix);
+
+    vec3 worldNormal = a_Normal;
+
+    // cal light weight
+    vec3 viewDir = normalize(u_CameraPosition - worldPos);
+
+    vec3 lightDir = normalize(u_sunLight);
+
+    vec3 halfDir = normalize(viewDir+lightDir);
+    // lambert
+    float lambert = dot(worldNormal, lightDir);
+    // specular
+    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);
+    //sum to light weight
+    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;
+
+    return lightWeight;
+}
+
+varying float v_lightWeight;
+void main() {
+
+    v_texCoord = a_Uv;
+
+    float lightWeight = calc_lighting(vec4(a_Position, 1.0));
+    v_lightWeight = lightWeight;
+
+    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

package/lib/earth/shaders/bloomsphere_frag.glsl

@@ -0,0 +1,15 @@
+
+uniform float u_opacity;
+uniform vec3 u_CameraPosition;
+varying vec3 vVertexNormal;
+
+varying vec4 v_Color;
+void main() {
+
+
+    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
+    // TODO: 去除背面
+    if(intensity > 1.0) intensity = 0.0;
+
+    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
+}

package/lib/earth/shaders/bloomsphere_vert.glsl

@@ -0,0 +1,20 @@
+
+attribute vec3 a_Position;
+attribute vec3 a_Normal;
+attribute vec2 a_Uv;
+attribute vec4 a_Color;
+uniform vec3 u_CameraPosition;
+uniform mat4 u_ViewProjectionMatrix;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_ViewMatrix;
+
+varying vec3 vVertexNormal;
+varying vec4 v_Color;
+
+void main() {
+    v_Color = a_Color;
+
+    vVertexNormal = a_Normal;
+
+    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
+}

package/lib/earth/utils.js

@@ -1,112 +1,116 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/earth/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  EARTH_RADIUS: () => EARTH_RADIUS,
+  EARTH_RADIUS_OUTER: () => EARTH_RADIUS_OUTER,
+  EARTH_SEGMENTS: () => EARTH_SEGMENTS,
+  lglt2xyz: () => lglt2xyz,
+  primitiveSphere: () => primitiveSphere
 });
-exports.EARTH_SEGMENTS = exports.EARTH_RADIUS_OUTER = exports.EARTH_RADIUS = void 0;
-exports.lglt2xyz = lglt2xyz;
-exports.primitiveSphere = primitiveSphere;
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _glMatrix = require("gl-matrix");
-
+module.exports = __toCommonJS(utils_exports);
+var import_gl_matrix = require("gl-matrix");
 var EARTH_RADIUS = 100;
-exports.EARTH_RADIUS = EARTH_RADIUS;
 var EARTH_SEGMENTS = 36;
-exports.EARTH_SEGMENTS = EARTH_SEGMENTS;
 var EARTH_RADIUS_OUTER = 40;
-exports.EARTH_RADIUS_OUTER = EARTH_RADIUS_OUTER;
-
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }
-
 function lglt2xyz(lnglat) {
-  var lng = torad(lnglat[0]) + Math.PI / 2;
-  var lat = torad(lnglat[1]);
-  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);
+  const lng = torad(lnglat[0]) + Math.PI / 2;
+  const lat = torad(lnglat[1]);
+  const radius = EARTH_RADIUS + Math.random() * 0.4;
+  const z = radius * Math.cos(lat) * Math.cos(lng);
+  const x = radius * Math.cos(lat) * Math.sin(lng);
+  const y = radius * Math.sin(lat);
   return [x, y, z];
 }
-
 function primitiveSphere(radius, opt) {
-  var matRotY = _glMatrix.mat4.create();
-
-  var matRotZ = _glMatrix.mat4.create();
-
-  var up = _glMatrix.vec3.fromValues(0, 1, 0);
-
-  var tmpVec3 = _glMatrix.vec3.fromValues(0, 0, 0);
-
+  const matRotY = import_gl_matrix.mat4.create();
+  const matRotZ = import_gl_matrix.mat4.create();
+  const up = import_gl_matrix.vec3.fromValues(0, 1, 0);
+  const tmpVec3 = import_gl_matrix.vec3.fromValues(0, 0, 0);
   opt = opt || {};
-  radius = typeof radius !== 'undefined' ? radius : 1;
-  var segments = typeof opt.segments !== 'undefined' ? opt.segments : 32;
-  var totalZRotationSteps = 2 + segments;
-  var totalYRotationSteps = 2 * totalZRotationSteps;
-  var indices = [];
-  var indicesArr = [];
-  var positions = [];
-  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;
-
-      _glMatrix.mat4.identity(matRotZ);
-
-      _glMatrix.mat4.rotateZ(matRotZ, matRotZ, -angleZ);
-
-      _glMatrix.mat4.identity(matRotY);
-
-      _glMatrix.mat4.rotateY(matRotY, matRotY, angleY);
-
-      _glMatrix.vec3.transformMat4(tmpVec3, up, matRotZ);
-
-      _glMatrix.vec3.transformMat4(tmpVec3, tmpVec3, matRotY);
-
-      _glMatrix.vec3.scale(tmpVec3, tmpVec3, -radius);
-
+  radius = typeof radius !== "undefined" ? radius : 1;
+  const segments = typeof opt.segments !== "undefined" ? opt.segments : 32;
+  const totalZRotationSteps = 2 + segments;
+  const totalYRotationSteps = 2 * totalZRotationSteps;
+  const indices = [];
+  const indicesArr = [];
+  const positions = [];
+  const positionsArr = [];
+  const normalArr = [];
+  const uvs = [];
+  for (let zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
+    const normalizedZ = zRotationStep / totalZRotationSteps;
+    const angleZ = normalizedZ * Math.PI;
+    for (let yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
+      const normalizedY = yRotationStep / totalYRotationSteps;
+      const angleY = normalizedY * Math.PI * 2;
+      import_gl_matrix.mat4.identity(matRotZ);
+      import_gl_matrix.mat4.rotateZ(matRotZ, matRotZ, -angleZ);
+      import_gl_matrix.mat4.identity(matRotY);
+      import_gl_matrix.mat4.rotateY(matRotY, matRotY, angleY);
+      import_gl_matrix.vec3.transformMat4(tmpVec3, up, matRotZ);
+      import_gl_matrix.vec3.transformMat4(tmpVec3, tmpVec3, matRotY);
+      import_gl_matrix.vec3.scale(tmpVec3, tmpVec3, -radius);
       positions.push(tmpVec3.slice());
-      positionsArr.push.apply(positionsArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
-
-      _glMatrix.vec3.normalize(tmpVec3, tmpVec3);
-
-      normalArr.push.apply(normalArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
+      positionsArr.push(...tmpVec3.slice());
+      import_gl_matrix.vec3.normalize(tmpVec3, tmpVec3);
+      normalArr.push(...tmpVec3.slice());
       uvs.push([normalizedY, 1 - normalizedZ]);
       positionsArr.push(normalizedY, 1 - normalizedZ);
     }
-
     if (zRotationStep > 0) {
-      var verticesCount = positions.length;
-      var firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
-
+      const verticesCount = positions.length;
+      let firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
       for (; firstIndex + totalYRotationSteps + 2 < verticesCount; firstIndex++) {
-        indices.push([firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1]);
+        indices.push([
+          firstIndex,
+          firstIndex + 1,
+          firstIndex + totalYRotationSteps + 1
+        ]);
         indicesArr.push(firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1);
-        indices.push([firstIndex + totalYRotationSteps + 1, firstIndex + 1, firstIndex + totalYRotationSteps + 2]);
+        indices.push([
+          firstIndex + totalYRotationSteps + 1,
+          firstIndex + 1,
+          firstIndex + totalYRotationSteps + 2
+        ]);
         indicesArr.push(firstIndex + totalYRotationSteps + 1, firstIndex + 1, firstIndex + totalYRotationSteps + 2);
       }
     }
   }
-
   return {
     cells: indices,
-    positions: positions,
-    uvs: uvs,
-    positionsArr: positionsArr,
-    indicesArr: indicesArr,
-    normalArr: normalArr
+    positions,
+    uvs,
+    positionsArr,
+    indicesArr,
+    normalArr
   };
 }
-//# sourceMappingURL=utils.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EARTH_RADIUS,
+  EARTH_RADIUS_OUTER,
+  EARTH_SEGMENTS,
+  lglt2xyz,
+  primitiveSphere
+});

package/lib/heatmap/index.js

@@ -1,157 +1,101 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+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/heatmap/index.ts
+var heatmap_exports = {};
+__export(heatmap_exports, {
+  default: () => HeatMapLayer
 });
-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 _models = _interopRequireDefault(require("./models"));
-
-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 HeatMapLayer = function (_BaseLayer) {
-  (0, _inherits2.default)(HeatMapLayer, _BaseLayer);
-
-  var _super = _createSuper(HeatMapLayer);
-
-  function HeatMapLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, HeatMapLayer);
-
-    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", 'HeatMapLayer');
-    return _this;
+module.exports = __toCommonJS(heatmap_exports);
+var import_BaseLayer = __toESM(require("../core/BaseLayer"));
+var import_models = __toESM(require("./models"));
+var HeatMapLayer = class extends import_BaseLayer.default {
+  constructor() {
+    super(...arguments);
+    this.type = "HeatMapLayer";
   }
-
-  (0, _createClass2.default)(HeatMapLayer, [{
-    key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new _models.default[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
-    }
-  }, {
-    key: "renderModels",
-    value: function renderModels() {
-      var _this4 = this;
-
-      var shape = this.getModelType();
-
-      if (shape === 'heatmap') {
-        if (this.layerModel) {
-          this.layerModel.render();
-        }
-
-        return this;
-      }
-
-      if (this.layerModelNeedUpdate) {
-        this.layerModel.buildModels(function (models) {
-          return _this4.models = models;
-        });
-        this.layerModelNeedUpdate = false;
+  buildModels() {
+    const shape = this.getModelType();
+    this.layerModel = new import_models.default[shape](this);
+    this.layerModel.initModels((models) => {
+      this.models = models;
+      this.renderLayers();
+    });
+  }
+  rebuildModels() {
+    this.layerModel.buildModels((models) => this.models = models);
+  }
+  renderModels() {
+    const shape = this.getModelType();
+    if (shape === "heatmap") {
+      if (this.layerModel) {
+        this.layerModel.render();
       }
-
-      this.models.forEach(function (model) {
-        return model.draw({
-          uniforms: _this4.layerModel.getUninforms()
-        });
-      });
       return this;
     }
-  }, {
-    key: "updateModelData",
-    value: function updateModelData(data) {
-      if (data.attributes && data.elements) {
-        this.models[0].updateAttributesAndElements(data.attributes, data.elements);
-      } else {
-        console.warn('data error');
-      }
+    if (this.layerModelNeedUpdate) {
+      this.layerModel.buildModels((models) => this.models = models);
+      this.layerModelNeedUpdate = false;
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
+    this.models.forEach((model) => model.draw({
+      uniforms: this.layerModel.getUninforms()
+    }));
+    return this;
+  }
+  updateModelData(data) {
+    if (data.attributes && data.elements) {
+      this.models[0].updateAttributesAndElements(data.attributes, data.elements);
+    } else {
+      console.warn("data error");
     }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      var _shapeAttribute$scale;
-
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-
-      var _this$getLayerConfig = this.getLayerConfig(),
-          shape3d = _this$getLayerConfig.shape3d;
-
-      var source = this.getSource();
-      var sourceType = source.data.type;
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'heatmap';
-
-      if (shape === 'heatmap' || shape === 'heatmap3d') {
-        return 'heatmap';
-      }
-
-      if (sourceType === 'hexagon') {
-        return (shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) === -1 ? 'hexagon' : 'grid3d';
-      }
-
-      if (sourceType === 'grid') {
-        return (shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) === -1 ? 'grid' : 'grid3d';
+  }
+  getConfigSchema() {
+    return {
+      properties: {
+        opacity: {
+          type: "number",
+          minimum: 0,
+          maximum: 1
+        }
       }
-
-      return 'heatmap';
+    };
+  }
+  getModelType() {
+    var _a;
+    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");
+    const { shape3d } = this.getLayerConfig();
+    const source = this.getSource();
+    const sourceType = source.data.type;
+    const shape = ((_a = shapeAttribute == null ? void 0 : shapeAttribute.scale) == null ? void 0 : _a.field) || "heatmap";
+    if (shape === "heatmap" || shape === "heatmap3d") {
+      return "heatmap";
     }
-  }]);
-  return HeatMapLayer;
-}(_BaseLayer2.default);
-
-exports.default = HeatMapLayer;
-//# sourceMappingURL=index.js.map
+    if (sourceType === "hexagon") {
+      return (shape3d == null ? void 0 : shape3d.indexOf(shape)) === -1 ? "hexagon" : "grid3d";
+    }
+    if (sourceType === "grid") {
+      return (shape3d == null ? void 0 : shape3d.indexOf(shape)) === -1 ? "grid" : "grid3d";
+    }
+    return "heatmap";
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});