@antv/l7-layers 2.14.0 → 2.14.2

package/lib/core/BaseLayer.js

@@ -175,10 +175,41 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }
 
   (0, _createClass2.default)(BaseLayer, [{
+    key: "addMask",
+    value: function addMask(layer) {
+      this.masks.push(layer);
+      this.enableMask();
+    }
+  }, {
+    key: "removeMask",
+    value: function removeMask(layer) {
+      var layerIndex = this.masks.indexOf(layer);
+
+      if (layerIndex > -1) {
+        this.masks.splice(layerIndex, 1);
+      }
+    }
+  }, {
+    key: "disableMask",
+    value: function disableMask() {
+      this.updateLayerConfig({
+        enableMask: false
+      });
+    }
+  }, {
+    key: "enableMask",
+    value: function enableMask() {
+      this.updateLayerConfig({
+        enableMask: true
+      });
+    } // 将废弃
+
+  }, {
     key: "addMaskLayer",
     value: function addMaskLayer(maskLayer) {
       this.masks.push(maskLayer);
-    }
+    } // 将废弃
+
   }, {
     key: "removeMaskLayer",
     value: function removeMaskLayer(maskLayer) {
@@ -354,7 +385,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
               case 31:
                 this.log(_l7Core.IDebugLog.LayerInitEnd);
-                this.inited = true; // 触发初始化完成事件;
+                this.inited = true; // add mask layer
+                // 触发初始化完成事件;
 
                 this.emit('inited', {
                   target: this,
@@ -650,6 +682,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "render",
     value: function render() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       if (this.tileLayer) {
         // 瓦片图层执行单独的 render 渲染队列
         this.tileLayer.render();
@@ -663,7 +697,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       } // Tip: this.getEncodedData().length !== 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
 
 
-      this.renderModels();
+      this.renderModels(options);
       return this;
     }
     /**
@@ -835,8 +869,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function setBlend(type) {
       this.updateLayerConfig({
         blend: type
-      });
-      this.layerModelNeedUpdate = true;
+      }); // this.layerModelNeedUpdate = true;
+
       this.reRender();
       return this;
     }
@@ -1021,12 +1055,18 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.layerChildren.map(function (child) {
         return child.destroy(false);
       });
-      this.layerChildren = []; // remove mask list
+      this.layerChildren = []; // remove mask list maskfence 掩膜需要销毁
+
+      var _this$getLayerConfig10 = this.getLayerConfig(),
+          maskfence = _this$getLayerConfig10.maskfence;
+
+      if (maskfence) {
+        this.masks.map(function (mask) {
+          return mask.destroy(false);
+        });
+        this.masks = [];
+      }
 
-      this.masks.map(function (mask) {
-        return mask.destroy(false);
-      });
-      this.masks = [];
       this.hooks.beforeDestroy.call(); // 清除sources事件
 
       this.layerSource.off('update', this.sourceEvent);
@@ -1362,11 +1402,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "needPick",
     value: function needPick(type) {
-      var _this$getLayerConfig10 = this.getLayerConfig(),
-          _this$getLayerConfig11 = _this$getLayerConfig10.enableHighlight,
-          enableHighlight = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11,
-          _this$getLayerConfig12 = _this$getLayerConfig10.enableSelect,
-          enableSelect = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12; // 判断layer是否监听事件;
+      var _this$getLayerConfig11 = this.getLayerConfig(),
+          _this$getLayerConfig12 = _this$getLayerConfig11.enableHighlight,
+          enableHighlight = _this$getLayerConfig12 === void 0 ? true : _this$getLayerConfig12,
+          _this$getLayerConfig13 = _this$getLayerConfig11.enableSelect,
+          enableSelect = _this$getLayerConfig13 === void 0 ? true : _this$getLayerConfig13; // 判断layer是否监听事件;
 
 
       var isPick = this.eventNames().indexOf(type) !== -1 || this.eventNames().indexOf('un' + type) !== -1;
@@ -1457,9 +1497,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     }()
   }, {
     key: "renderModels",
-    value: function renderModels(isPicking) {
+    value: function renderModels() {
       var _this11 = this;
 
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
         return this;
@@ -1468,8 +1510,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this11.layerModel.getUninforms()
-        }, isPicking);
+          uniforms: _this11.layerModel.getUninforms(),
+          blend: _this11.layerModel.getBlend(),
+          stencil: _this11.layerModel.getStencil(options)
+        }, (options === null || options === void 0 ? void 0 : options.ispick) || false);
       });
       this.hooks.afterRender.call();
       return this;

package/lib/core/BaseModel.js

@@ -11,6 +11,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
@@ -35,6 +37,8 @@ var _lodash = require("lodash");
 
 var _blend = require("../utils/blend");
 
+var _stencil = require("../utils/stencil");
+
 var _dec, _class, _descriptor;
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -431,6 +435,39 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       return _blend.BlendTypes[_l7Core.BlendType[blend]];
     }
+  }, {
+    key: "getStencil",
+    value: function getStencil(option) {
+      var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
+          _this$layer$getLayerC4 = _this$layer$getLayerC3.mask,
+          mask = _this$layer$getLayerC4 === void 0 ? false : _this$layer$getLayerC4,
+          _this$layer$getLayerC5 = _this$layer$getLayerC3.maskInside,
+          maskInside = _this$layer$getLayerC5 === void 0 ? true : _this$layer$getLayerC5,
+          enableMask = _this$layer$getLayerC3.enableMask,
+          _this$layer$getLayerC6 = _this$layer$getLayerC3.maskOperation,
+          maskOperation = _this$layer$getLayerC6 === void 0 ? _l7Core.MaskOperation.AND : _this$layer$getLayerC6; // TODO 临时处理，后期移除MaskLayer
+
+
+      if (this.layer.type === 'MaskLayer') {
+        return (0, _stencil.getStencilMask)({
+          isStencil: true,
+          stencilType: _l7Core.StencilType.SINGLE
+        }); // 用于遮罩的stencil 参数
+      }
+
+      if (option.isStencil) {
+        return (0, _stencil.getStencilMask)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, option), {}, {
+          maskOperation: maskOperation
+        })); // 用于遮罩的stencil 参数
+      }
+
+      var maskflag = mask || //  mask 兼容历史写法
+      enableMask && this.layer.masks.length !== 0 || // 外部图层的mask
+      this.layer.tileMask !== undefined; // 瓦片图层
+      // !!(mask || enableMask || this.layer.tileMask);
+
+      return (0, _stencil.getStencil)(maskflag, maskInside);
+    }
   }, {
     key: "getDefaultStyle",
     value: function getDefaultStyle() {
@@ -531,10 +568,11 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "getAttribute",
     value: function getAttribute() {
       throw new Error('Method not implemented.');
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "render",
-    value: function render() {
+    value: function render(renderOptions) {
       throw new Error('Method not implemented.');
     }
   }, {

package/lib/core/LayerPickService.js

@@ -50,7 +50,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
-                    m.render();
+                    m.render({
+                      isStencil: true
+                    });
 
                   case 1:
                   case "end":
@@ -66,7 +68,9 @@ var BaseLayerPickService = /*#__PURE__*/function () {
         }());
       }
 
-      layer.renderModels(true);
+      layer.renderModels({
+        ispick: true
+      });
       layer.hooks.afterPickingEncode.call();
     }
   }, {

package/lib/heatmap/index.js

@@ -85,11 +85,12 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function renderModels() {
       var _this2 = this;
 
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var shape = this.getModelType();
 
       if (shape === 'heatmap') {
         if (this.layerModel) {
-          this.layerModel.render(); // 独立的渲染流程
+          this.layerModel.render(options); // 独立的渲染流程
         }
 
         return this;
@@ -102,7 +103,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         return model.draw({
-          uniforms: _this2.layerModel.getUninforms()
+          uniforms: _this2.layerModel.getUninforms(),
+          blend: _this2.layerModel.getBlend(),
+          stencil: _this2.layerModel.getStencil(options)
         });
       });
       this.hooks.afterRender.call();

package/lib/heatmap/models/grid.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -92,14 +90,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapGrid',
                   vertexShader: heatmapGridVert,
@@ -108,15 +104,14 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/lib/heatmap/models/grid3d.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -92,14 +90,12 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapGrid3d',
                   vertexShader: heatmapGrid3dVert,
@@ -108,16 +104,14 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: true
-                  },
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/lib/heatmap/models/heatmap.js

@@ -76,7 +76,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
 
   (0, _createClass2.default)(HeatMapModel, [{
     key: "render",
-    value: function render() {
+    value: function render(options) {
       var _this = this;
 
       var _this$rendererService = this.rendererService,
@@ -97,7 +97,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
         this.updateColorTexture();
       }
 
-      this.shapeType === 'heatmap' ? this.drawColorMode() : this.draw3DHeatMap();
+      this.shapeType === 'heatmap' ? this.drawColorMode(options) : this.draw3DHeatMap(options);
     }
   }, {
     key: "getUninforms",
@@ -245,15 +245,6 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
                   cull: {
                     enable: true,
                     face: (0, _l7Utils.getCullFace)(this.mapService.version)
-                  },
-                  blend: {
-                    enable: true,
-                    func: {
-                      srcRGB: _l7Core.gl.ONE,
-                      srcAlpha: 1,
-                      dstRGB: _l7Core.gl.ONE,
-                      dstAlpha: 1
-                    }
                   }
                 });
 
@@ -278,12 +269,6 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
   }, {
     key: "buildHeatmapColor",
     value: function buildHeatmapColor() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$mask = _ref.mask,
-          mask = _ref$mask === void 0 ? false : _ref$mask,
-          _ref$maskInside = _ref.maskInside,
-          maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
-
       this.shaderModuleService.registerModule('heatmapColor', {
         vs: heatmapColorVert,
         fs: heatmapColorFrag
@@ -322,13 +307,11 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
         depth: {
           enable: false
         },
-        blend: this.getBlend(),
         elements: createElements({
           data: [0, 2, 1, 2, 3, 1],
           type: _l7Core.gl.UNSIGNED_INT,
           count: 6
-        }),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+        })
       });
     }
   }, {
@@ -336,47 +319,69 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
     value: function drawIntensityMode() {
       var _this$intensityModel;
 
-      var _ref2 = this.layer.getLayerConfig(),
-          opacity = _ref2.opacity,
-          _ref2$intensity = _ref2.intensity,
-          intensity = _ref2$intensity === void 0 ? 10 : _ref2$intensity,
-          _ref2$radius = _ref2.radius,
-          radius = _ref2$radius === void 0 ? 5 : _ref2$radius;
+      var _ref = this.layer.getLayerConfig(),
+          opacity = _ref.opacity,
+          _ref$intensity = _ref.intensity,
+          intensity = _ref$intensity === void 0 ? 10 : _ref$intensity,
+          _ref$radius = _ref.radius,
+          radius = _ref$radius === void 0 ? 5 : _ref$radius;
 
       this.layerService.beforeRenderData(this.layer);
-      this.layer.hooks.beforeRender.call();
+      this.layer.hooks.beforeRender.call(); // 绘制密度图
+
       (_this$intensityModel = this.intensityModel) === null || _this$intensityModel === void 0 ? void 0 : _this$intensityModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_radius: radius,
           u_intensity: intensity
+        },
+        blend: {
+          enable: true,
+          func: {
+            srcRGB: _l7Core.gl.ONE,
+            srcAlpha: 1,
+            dstRGB: _l7Core.gl.ONE,
+            dstAlpha: 1
+          }
+        },
+        stencil: {
+          enable: false,
+          mask: 0xff,
+          func: {
+            cmp: 514,
+            // gl.EQUAL,
+            ref: 1,
+            mask: 0xff
+          }
         }
       });
       this.layer.hooks.afterRender.call();
     }
   }, {
     key: "drawColorMode",
-    value: function drawColorMode() {
+    value: function drawColorMode(options) {
       var _this$colorModel;
 
-      var _ref3 = this.layer.getLayerConfig(),
-          opacity = _ref3.opacity;
+      var _ref2 = this.layer.getLayerConfig(),
+          opacity = _ref2.opacity;
 
       (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_colorTexture: this.colorTexture,
           u_texture: this.heatmapFramerBuffer
-        }
+        },
+        blend: this.getBlend(),
+        stencil: this.getStencil(options)
       });
     }
   }, {
     key: "draw3DHeatMap",
-    value: function draw3DHeatMap() {
+    value: function draw3DHeatMap(options) {
       var _this$colorModel2;
 
-      var _ref4 = this.layer.getLayerConfig(),
-          opacity = _ref4.opacity; // const invert = mat4.invert(
+      var _ref3 = this.layer.getLayerConfig(),
+          opacity = _ref3.opacity; // const invert = mat4.invert(
       //   mat4.create(),
       //   mat4.fromValues(
       //     // @ts-ignore
@@ -396,18 +401,22 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           u_texture: this.heatmapFramerBuffer,
           u_ViewProjectionMatrixUncentered: this.cameraService.getViewProjectionMatrixUncentered(),
           u_InverseViewProjectionMatrix: (0, _toConsumableArray2.default)(invert)
-        }
+        },
+        blend: {
+          enable: true,
+          func: {
+            srcRGB: _l7Core.gl.SRC_ALPHA,
+            srcAlpha: 1,
+            dstRGB: _l7Core.gl.ONE_MINUS_SRC_ALPHA,
+            dstAlpha: 1
+          }
+        },
+        stencil: this.getStencil(options)
       });
     }
   }, {
     key: "build3dHeatMap",
     value: function build3dHeatMap() {
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$mask = _ref5.mask,
-          mask = _ref5$mask === void 0 ? false : _ref5$mask,
-          _ref5$maskInside = _ref5.maskInside,
-          maskInside = _ref5$maskInside === void 0 ? true : _ref5$maskInside;
-
       var getViewportSize = this.rendererService.getViewportSize;
 
       var _getViewportSize2 = getViewportSize(),
@@ -467,8 +476,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           data: triangulation.indices,
           type: _l7Core.gl.UNSIGNED_INT,
           count: triangulation.indices.length
-        }),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+        })
       });
     }
   }, {
@@ -485,8 +493,8 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
         this.texture.destroy();
       }
 
-      var _ref6 = this.layer.getLayerConfig(),
-          rampColors = _ref6.rampColors;
+      var _ref4 = this.layer.getLayerConfig(),
+          rampColors = _ref4.rampColors;
 
       var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
       this.colorTexture = createTexture2D({

package/lib/heatmap/models/hexagon.js

@@ -23,8 +23,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -92,14 +90,12 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'heatmapHexagon',
                   vertexShader: heatmapGridVert,
@@ -108,16 +104,14 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  primitive: _l7Core.gl.TRIANGLES,
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  primitive: _l7Core.gl.TRIANGLES
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }