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

package/lib/tile/manager/tilePickerManager.js

@@ -1,132 +1,201 @@
-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/tile/manager/tilePickerManager.ts
-var tilePickerManager_exports = {};
-__export(tilePickerManager_exports, {
-  default: () => TilePickManager
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(tilePickerManager_exports);
-var import_eventemitter3 = require("eventemitter3");
-var TilePickManager = class extends import_eventemitter3.EventEmitter {
-  constructor(parent, rendererService, pickingService, children, layerService) {
-    super();
-    this.isLastPicked = false;
-    this.parent = parent;
-    this.rendererService = rendererService;
-    this.pickingService = pickingService;
-    this.layerService = layerService;
-    this.children = children;
-  }
-  normalRender(layers) {
-    layers.filter((layer) => layer.inited).filter((layer) => layer.isVisible()).map((layer) => {
-      layer.hooks.beforeRenderData.call();
-      layer.hooks.beforeRender.call();
-      if (layer.masks.length > 0) {
-        this.rendererService.clear({
-          stencil: 0,
-          depth: 1,
-          framebuffer: null
-        });
-        layer.masks.map((m) => {
-          m.hooks.beforeRenderData.call();
-          m.hooks.beforeRender.call();
-          m.render();
-          m.hooks.afterRender.call();
-        });
-      }
-      layer.render();
-      layer.hooks.afterRender.call();
-    });
+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 _eventemitter = require("eventemitter3");
+
+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 TilePickManager = /*#__PURE__*/function (_EventEmitter) {
+  (0, _inherits2.default)(TilePickManager, _EventEmitter);
+
+  var _super = _createSuper(TilePickManager);
+
+  function TilePickManager(parent, rendererService, pickingService, children, layerService) {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, TilePickManager);
+    _this = _super.call(this);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isLastPicked", false);
+    _this.parent = parent;
+    _this.rendererService = rendererService;
+    _this.pickingService = pickingService;
+    _this.layerService = layerService;
+    _this.children = children;
+    return _this;
   }
-  pickRender(layers, target) {
-    if (this.parent.type === "RasterLayer") {
-      this.renderMask(this.parent);
+  /**
+   *
+   * @param layers
+   */
+
+
+  (0, _createClass2.default)(TilePickManager, [{
+    key: "normalRender",
+    value: function normalRender(layers) {
+      var _this2 = this;
+
+      layers.filter(function (layer) {
+        return layer.inited;
+      }).filter(function (layer) {
+        return layer.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeRenderData.call();
+        layer.hooks.beforeRender.call();
+
+        if (layer.masks.length > 0) {
+          // 清除上一次的模版缓存
+          _this2.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+
+          layer.masks.map(function (m) {
+            m.hooks.beforeRenderData.call();
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.render();
+        layer.hooks.afterRender.call();
+      });
     }
-    const isPicked = layers.filter((layer) => this.parent.needPick(target.type) && layer.inited && layer.isVisible()).some((layer) => {
-      layer.hooks.beforePickingEncode.call();
-      if (layer.masks.length > 0) {
-        this.rendererService.clear({
-          stencil: 0,
-          depth: 1,
-          framebuffer: null
-        });
-        layer.masks.map((m) => {
-          m.hooks.beforeRender.call();
-          m.render();
-          m.hooks.afterRender.call();
-        });
+  }, {
+    key: "pickRender",
+    value: function pickRender(layers, target) {
+      var _this3 = this;
+
+      // Tip: 在进行拾取渲染的时候也需要先渲染一遍父组件然后再渲染子组件
+      //  如需要在 栅格瓦片存在 Mask 的时候发生的拾取，那么就需要先渲染父组件（渲染父组件的帧缓冲）
+      if (this.parent.type === 'RasterLayer') {
+        this.renderMask(this.parent);
       }
-      layer.renderModels(true);
-      layer.hooks.afterPickingEncode.call();
-      const layerPicked = this.pickingService.pickFromPickingFBO(layer, target);
-      if (layerPicked && this.parent.type !== "RasterLayer") {
-        this.emit("pick", {
-          type: target.type,
-          pickedColors: this.pickingService.pickedColors,
-          layer
-        });
-        this.pickingService.pickedTileLayers = [this.parent];
+
+      var isPicked = layers.filter(function (layer) {
+        return _this3.parent.needPick(target.type) && layer.inited && layer.isVisible();
+      }).some(function (layer) {
+        layer.hooks.beforePickingEncode.call();
+
+        if (layer.masks.length > 0) {
+          // 清除上一次的模版缓存
+          _this3.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+
+          layer.masks.map(function (m) {
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.renderModels(true);
+        layer.hooks.afterPickingEncode.call();
+
+        var layerPicked = _this3.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
+
+
+        if (layerPicked && _this3.parent.type !== 'RasterLayer') {
+          _this3.emit('pick', {
+            type: target.type,
+            pickedColors: _this3.pickingService.pickedColors,
+            layer: layer
+          });
+
+          _this3.pickingService.pickedTileLayers = [_this3.parent];
+        }
+
+        return layerPicked;
+      });
+
+      if (this.parent.type !== 'RasterLayer' && !isPicked && this.isLastPicked && target.type !== 'click') {
+        // 只有上一次有被高亮选中，本次未选中的时候才需要清除选中状态
+        this.pickingService.pickedTileLayers = [];
+        this.emit('unpick', {});
+        this.beforeHighlight([0, 0, 0]);
       }
-      return layerPicked;
-    });
-    if (this.parent.type !== "RasterLayer" && !isPicked && this.isLastPicked && target.type !== "click") {
+
+      this.isLastPicked = isPicked;
+      return isPicked;
+    }
+  }, {
+    key: "clearPick",
+    value: function clearPick() {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call([0, 0, 0]);
+      });
       this.pickingService.pickedTileLayers = [];
-      this.emit("unpick", {});
-      this.beforeHighlight([0, 0, 0]);
     }
-    this.isLastPicked = isPicked;
-    return isPicked;
-  }
-  clearPick() {
-    this.children.filter((child) => child.inited && child.isVisible()).map((layer) => {
-      layer.hooks.beforeSelect.call([0, 0, 0]);
-    });
-    this.pickingService.pickedTileLayers = [];
-  }
-  beforeHighlight(pickedColors) {
-    this.children.filter((child) => child.inited && child.isVisible()).map((child) => {
-      child.hooks.beforeHighlight.call(pickedColors);
-    });
-  }
-  beforeSelect(pickedColors) {
-    this.children.filter((child) => child.inited && child.isVisible()).map((layer) => {
-      layer.hooks.beforeSelect.call(pickedColors);
-    });
-  }
-  renderMask(layer) {
-    if (layer.inited && layer.isVisible()) {
-      layer.hooks.beforeRender.call();
-      if (layer.masks.length > 0) {
-        this.rendererService.clear({
-          stencil: 0,
-          depth: 1,
-          framebuffer: null
-        });
-        layer.masks.map((m) => {
-          m.hooks.beforeRender.call();
-          m.render();
-          m.hooks.afterRender.call();
-        });
+  }, {
+    key: "beforeHighlight",
+    value: function beforeHighlight(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (child) {
+        child.hooks.beforeHighlight.call(pickedColors);
+      });
+    }
+  }, {
+    key: "beforeSelect",
+    value: function beforeSelect(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call(pickedColors);
+      });
+    }
+  }, {
+    key: "renderMask",
+    value: function renderMask(layer) {
+      if (layer.inited && layer.isVisible()) {
+        layer.hooks.beforeRender.call();
+
+        if (layer.masks.length > 0) {
+          this.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+          layer.masks.map(function (m) {
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.hooks.afterRender.call();
       }
-      layer.hooks.afterRender.call();
     }
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return TilePickManager;
+}(_eventemitter.EventEmitter);
+
+exports.default = TilePickManager;

package/lib/tile/models/tileModel.js

@@ -1,55 +1,74 @@
-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/tile/models/tileModel.ts
-var tileModel_exports = {};
-__export(tileModel_exports, {
-  default: () => RasterTileModel
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(tileModel_exports);
-var import_BaseModel = __toESM(require("../../core/BaseModel"));
-var import_tmsTileLayer = require("../tmsTileLayer");
-var RasterTileModel = class extends import_BaseModel.default {
-  getUninforms() {
-    return {};
+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 _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+
+var _tmsTileLayer = require("../tmsTileLayer");
+
+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 RasterTileModel = /*#__PURE__*/function (_BaseModel) {
+  (0, _inherits2.default)(RasterTileModel, _BaseModel);
+
+  var _super = _createSuper(RasterTileModel);
+
+  function RasterTileModel() {
+    (0, _classCallCheck2.default)(this, RasterTileModel);
+    return _super.apply(this, arguments);
   }
-  initModels() {
-    const source = this.layer.getSource();
-    if (source == null ? void 0 : source.data.isTile) {
-      this.layer.tileLayer = new import_tmsTileLayer.TMSTileLayer({
-        parent: this.layer,
-        rendererService: this.rendererService,
-        mapService: this.mapService,
-        layerService: this.layerService,
-        pickingService: this.pickingService,
-        transforms: source.transforms
-      });
+
+  (0, _createClass2.default)(RasterTileModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      return {};
     }
-    return this.buildModels();
-  }
-  buildModels() {
-    return [];
-  }
-  registerBuiltinAttributes() {
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }, {
+    key: "initModels",
+    value: function initModels() {
+      var source = this.layer.getSource();
+
+      if (source !== null && source !== void 0 && source.data.isTile) {
+        this.layer.tileLayer = new _tmsTileLayer.TMSTileLayer({
+          parent: this.layer,
+          rendererService: this.rendererService,
+          mapService: this.mapService,
+          layerService: this.layerService,
+          pickingService: this.pickingService,
+          transforms: source.transforms
+        });
+      }
+
+      return this.buildModels();
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels() {
+      return [];
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {//
+    }
+  }]);
+  return RasterTileModel;
+}(_BaseModel2.default);
+
+exports.default = RasterTileModel;