@antv/l7-layers 2.21.1 → 2.21.3

package/es/tile/utils/utils.js

@@ -1,4 +1,4 @@
-export var tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
+export const tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
 
 /**
  * 判断当前图层是否是瓦片图层
@@ -6,6 +6,6 @@ export var tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
  * @returns
  */
 export function isTileGroup(layer) {
-  var source = layer.getSource();
+  const source = layer.getSource();
   return tileVectorParser.includes(source.parser.type);
 }

package/es/utils/blend.js

@@ -1,51 +1,57 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { BlendType, gl } from '@antv/l7-core';
-export var BlendTypes = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, BlendType.additive, {
-  enable: true,
-  func: {
-    srcRGB: gl.ONE,
-    dstRGB: gl.ONE,
-    srcAlpha: 1,
-    dstAlpha: 1
-  }
-}), BlendType.none, {
-  enable: false
-}), BlendType.normal, {
-  enable: true,
-  func: {
-    srcRGB: gl.SRC_ALPHA,
-    dstRGB: gl.ONE_MINUS_SRC_ALPHA,
-    srcAlpha: 1,
-    dstAlpha: 1
-  }
-}), BlendType.subtractive, {
-  enable: true,
-  func: {
-    srcRGB: gl.ONE,
-    dstRGB: gl.ONE,
-    srcAlpha: gl.ZERO,
-    dstAlpha: gl.ONE_MINUS_SRC_COLOR
+export const BlendTypes = {
+  [BlendType.additive]: {
+    enable: true,
+    func: {
+      srcRGB: gl.ONE,
+      dstRGB: gl.ONE,
+      srcAlpha: 1,
+      dstAlpha: 1
+    }
   },
-  equation: {
-    rgb: gl.FUNC_SUBTRACT,
-    alpha: gl.FUNC_SUBTRACT
-  }
-}), BlendType.max, {
-  enable: true,
-  func: {
-    srcRGB: gl.ONE,
-    dstRGB: gl.ONE
+  [BlendType.none]: {
+    enable: false
   },
-  equation: {
-    rgb: gl.MAX_EXT
-  }
-}), BlendType.min, {
-  enable: true,
-  func: {
-    srcRGB: gl.ONE,
-    dstRGB: gl.ONE
+  [BlendType.normal]: {
+    enable: true,
+    func: {
+      srcRGB: gl.SRC_ALPHA,
+      dstRGB: gl.ONE_MINUS_SRC_ALPHA,
+      srcAlpha: 1,
+      dstAlpha: 1
+    }
+  },
+  [BlendType.subtractive]: {
+    enable: true,
+    func: {
+      srcRGB: gl.ONE,
+      dstRGB: gl.ONE,
+      srcAlpha: gl.ZERO,
+      dstAlpha: gl.ONE_MINUS_SRC_COLOR
+    },
+    equation: {
+      rgb: gl.FUNC_SUBTRACT,
+      alpha: gl.FUNC_SUBTRACT
+    }
+  },
+  [BlendType.max]: {
+    enable: true,
+    func: {
+      srcRGB: gl.ONE,
+      dstRGB: gl.ONE
+    },
+    equation: {
+      rgb: gl.MAX_EXT
+    }
   },
-  equation: {
-    rgb: gl.MIN_EXT
+  [BlendType.min]: {
+    enable: true,
+    func: {
+      srcRGB: gl.ONE,
+      dstRGB: gl.ONE
+    },
+    equation: {
+      rgb: gl.MIN_EXT
+    }
   }
-});
+};

package/es/utils/collision-index.js

@@ -1,6 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 // @mapbox/grid-index 并没有类似 hitTest 的单纯获取碰撞检测结果的方法，query 将导致计算大量多余的包围盒结果，因此使用改良版
 import { mat4, vec4 } from 'gl-matrix';
@@ -9,10 +6,16 @@ import GridIndex from "./grid-index";
  * 基于网格实现文本避让，大幅提升包围盒碰撞检测效率
  * @see https://zhuanlan.zhihu.com/p/74373214
  */
-var CollisionIndex = /*#__PURE__*/function () {
-  function CollisionIndex(width, height) {
-    _classCallCheck(this, CollisionIndex);
+export default class CollisionIndex {
+  constructor(width, height) {
+    _defineProperty(this, "width", void 0);
+    _defineProperty(this, "height", void 0);
+    _defineProperty(this, "grid", void 0);
     _defineProperty(this, "viewportPadding", 100);
+    _defineProperty(this, "screenRightBoundary", void 0);
+    _defineProperty(this, "screenBottomBoundary", void 0);
+    _defineProperty(this, "gridRightBoundary", void 0);
+    _defineProperty(this, "gridBottomBoundary", void 0);
     this.width = width;
     this.height = height;
     this.viewportPadding = Math.max(width, height);
@@ -23,73 +26,62 @@ var CollisionIndex = /*#__PURE__*/function () {
     this.gridRightBoundary = width + 2 * this.viewportPadding;
     this.gridBottomBoundary = height + 2 * this.viewportPadding;
   }
-  _createClass(CollisionIndex, [{
-    key: "placeCollisionBox",
-    value: function placeCollisionBox(collisionBox) {
-      // const projectedPoint = this.project(
-      //   mvpMatrix,
-      //   collisionBox.anchorPointX,
-      //   collisionBox.anchorPointY,
-      // );
+  placeCollisionBox(collisionBox) {
+    // const projectedPoint = this.project(
+    //   mvpMatrix,
+    //   collisionBox.anchorPointX,
+    //   collisionBox.anchorPointY,
+    // );
 
-      var tlX = collisionBox.x1 + collisionBox.anchorPointX + this.viewportPadding;
-      var tlY = collisionBox.y1 + collisionBox.anchorPointY + this.viewportPadding;
-      var brX = collisionBox.x2 + collisionBox.anchorPointX + this.viewportPadding;
-      var brY = collisionBox.y2 + collisionBox.anchorPointY + this.viewportPadding;
-      if (!this.isInsideGrid(tlX, tlY, brX, brY) || this.grid.hitTest(tlX, tlY, brX, brY)) {
-        return {
-          box: []
-        };
-      }
+    const tlX = collisionBox.x1 + collisionBox.anchorPointX + this.viewportPadding;
+    const tlY = collisionBox.y1 + collisionBox.anchorPointY + this.viewportPadding;
+    const brX = collisionBox.x2 + collisionBox.anchorPointX + this.viewportPadding;
+    const brY = collisionBox.y2 + collisionBox.anchorPointY + this.viewportPadding;
+    if (!this.isInsideGrid(tlX, tlY, brX, brY) || this.grid.hitTest(tlX, tlY, brX, brY)) {
       return {
-        box: [tlX, tlY, brX, brY]
+        box: []
       };
     }
-  }, {
-    key: "insertCollisionBox",
-    value: function insertCollisionBox(box, featureIndex) {
-      var key = {
-        featureIndex: featureIndex
-      };
-      this.grid.insert(key, box[0], box[1], box[2], box[3]);
-    }
+    return {
+      box: [tlX, tlY, brX, brY]
+    };
+  }
+  insertCollisionBox(box, featureIndex) {
+    const key = {
+      featureIndex
+    };
+    this.grid.insert(key, box[0], box[1], box[2], box[3]);
+  }
 
-    /**
-     * 后续碰撞检测都需要投影到 viewport 坐标系
-     * @param {THREE.Matrix4} mvpMatrix mvp矩阵
-     * @param {number} x P20 平面坐标X
-     * @param {number} y P20 平面坐标Y
-     * @return {Point} projectedPoint
-     */
-  }, {
-    key: "project",
-    value: function project(mvpMatrix, x, y) {
-      var point = vec4.fromValues(x, y, 0, 1);
-      var out = vec4.create();
-      // @ts-ignore
-      var mat = mat4.fromValues.apply(mat4, _toConsumableArray(mvpMatrix));
-      vec4.transformMat4(out, point, mat);
-      // GL 坐标系[-1, 1] -> viewport 坐标系[width, height]
-      return {
-        x: (out[0] / out[3] + 1) / 2 * this.width + this.viewportPadding,
-        y: (-out[1] / out[3] + 1) / 2 * this.height + this.viewportPadding
-      };
-    }
+  /**
+   * 后续碰撞检测都需要投影到 viewport 坐标系
+   * @param {THREE.Matrix4} mvpMatrix mvp矩阵
+   * @param {number} x P20 平面坐标X
+   * @param {number} y P20 平面坐标Y
+   * @return {Point} projectedPoint
+   */
+  project(mvpMatrix, x, y) {
+    const point = vec4.fromValues(x, y, 0, 1);
+    const out = vec4.create();
+    // @ts-ignore
+    const mat = mat4.fromValues(...mvpMatrix);
+    vec4.transformMat4(out, point, mat);
+    // GL 坐标系[-1, 1] -> viewport 坐标系[width, height]
+    return {
+      x: (out[0] / out[3] + 1) / 2 * this.width + this.viewportPadding,
+      y: (-out[1] / out[3] + 1) / 2 * this.height + this.viewportPadding
+    };
+  }
 
-    /**
-     * 判断包围盒是否在整个网格内，需要加上 buffer
-     * @param {number} x1 x1
-     * @param {number} y1 y1
-     * @param {number} x2 x2
-     * @param {number} y2 y2
-     * @return {Point} isInside
-     */
-  }, {
-    key: "isInsideGrid",
-    value: function isInsideGrid(x1, y1, x2, y2) {
-      return x2 >= 0 && x1 < this.gridRightBoundary && y2 >= 0 && y1 < this.gridBottomBoundary;
-    }
-  }]);
-  return CollisionIndex;
-}();
-export { CollisionIndex as default };
+  /**
+   * 判断包围盒是否在整个网格内，需要加上 buffer
+   * @param {number} x1 x1
+   * @param {number} y1 y1
+   * @param {number} x2 x2
+   * @param {number} y2 y2
+   * @return {Point} isInside
+   */
+  isInsideGrid(x1, y1, x2, y2) {
+    return x2 >= 0 && x1 < this.gridRightBoundary && y2 >= 0 && y1 < this.gridBottomBoundary;
+  }
+}