@antv/l7-layers 2.14.0 → 2.14.2

package/es/heatmap/models/heatmap.js

@@ -16,7 +16,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { generateColorRamp, getCullFace, getMask } from '@antv/l7-utils';
+import { generateColorRamp, getCullFace } from '@antv/l7-utils';
 import { mat4 } from 'gl-matrix';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
@@ -54,7 +54,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
 
   _createClass(HeatMapModel, [{
     key: "render",
-    value: function render() {
+    value: function render(options) {
       var _this = this;
 
       var _this$rendererService = this.rendererService,
@@ -75,7 +75,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
         this.updateColorTexture();
       }
 
-      this.shapeType === 'heatmap' ? this.drawColorMode() : this.draw3DHeatMap();
+      this.shapeType === 'heatmap' ? this.drawColorMode(options) : this.draw3DHeatMap(options);
     }
   }, {
     key: "getUninforms",
@@ -223,15 +223,6 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
                   cull: {
                     enable: true,
                     face: getCullFace(this.mapService.version)
-                  },
-                  blend: {
-                    enable: true,
-                    func: {
-                      srcRGB: gl.ONE,
-                      srcAlpha: 1,
-                      dstRGB: gl.ONE,
-                      dstAlpha: 1
-                    }
                   }
                 });
 
@@ -256,12 +247,6 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
   }, {
     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
@@ -300,13 +285,11 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
         depth: {
           enable: false
         },
-        blend: this.getBlend(),
         elements: createElements({
           data: [0, 2, 1, 2, 3, 1],
           type: gl.UNSIGNED_INT,
           count: 6
-        }),
-        stencil: getMask(mask, maskInside)
+        })
       });
     }
   }, {
@@ -314,47 +297,69 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
     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: gl.ONE,
+            srcAlpha: 1,
+            dstRGB: 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
@@ -372,18 +377,22 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           u_texture: this.heatmapFramerBuffer,
           u_ViewProjectionMatrixUncentered: this.cameraService.getViewProjectionMatrixUncentered(),
           u_InverseViewProjectionMatrix: _toConsumableArray(invert)
-        }
+        },
+        blend: {
+          enable: true,
+          func: {
+            srcRGB: gl.SRC_ALPHA,
+            srcAlpha: 1,
+            dstRGB: 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(),
@@ -443,8 +452,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           data: triangulation.indices,
           type: gl.UNSIGNED_INT,
           count: triangulation.indices.length
-        }),
-        stencil: getMask(mask, maskInside)
+        })
       });
     }
   }, {
@@ -461,8 +469,8 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
         this.texture.destroy();
       }
 
-      var _ref6 = this.layer.getLayerConfig(),
-          rampColors = _ref6.rampColors;
+      var _ref4 = this.layer.getLayerConfig(),
+          rampColors = _ref4.rampColors;
 
       var imageData = generateColorRamp(rampColors);
       this.colorTexture = createTexture2D({

package/es/heatmap/models/hexagon.js

@@ -11,7 +11,6 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { HeatmapGridTriangulation } from "../../core/triangulation";
 
@@ -75,14 +74,12 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regeneratorRuntime.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,
@@ -91,16 +88,14 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  primitive: gl.TRIANGLES,
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  primitive: gl.TRIANGLES
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/es/image/models/image.js

@@ -11,12 +11,12 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, isMini } from '@antv/l7-utils';
+import { isMini } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
-var ImageFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+var ImageFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n  if(gl_FragColor.a < 0.01)\n    discard;\n}\n";
 
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
 var ImageVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -49,13 +49,11 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this = this;
 
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, canvas, img, imageData, model;
-
+        var source, createTexture2D, canvas, img, imageData, model;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.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;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
                 this.texture = createTexture2D({
@@ -64,7 +62,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                 });
 
                 if (!isMini) {
-                  _context.next = 12;
+                  _context.next = 11;
                   break;
                 }
 
@@ -84,14 +82,14 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                   _this.layerService.reRender();
                 };
 
-                _context.next = 16;
+                _context.next = 15;
                 break;
 
-              case 12:
-                _context.next = 14;
+              case 11:
+                _context.next = 13;
                 return source.data.images;
 
-              case 14:
+              case 13:
                 imageData = _context.sent;
                 this.texture = createTexture2D({
                   data: imageData[0],
@@ -101,8 +99,8 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                   min: gl.LINEAR
                 });
 
-              case 16:
-                _context.next = 18;
+              case 15:
+                _context.next = 17;
                 return this.layer.buildLayerModel({
                   moduleName: 'rasterImage',
                   vertexShader: ImageVert,
@@ -115,15 +113,14 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                   },
                   depth: {
                     enable: false
-                  },
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
-              case 18:
+              case 17:
                 model = _context.sent;
                 return _context.abrupt("return", [model]);
 
-              case 20:
+              case 19:
               case "end":
                 return _context.stop();
             }

package/es/image/shaders/image_frag.glsl

@@ -6,4 +6,6 @@ void main() {
   vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));
   gl_FragColor = color;
   gl_FragColor.a *= u_opacity;
+  if(gl_FragColor.a < 0.01)
+    discard;
 }

package/es/index.js

@@ -20,6 +20,7 @@ import DataMappingPlugin from "./plugins/DataMappingPlugin";
 import DataSourcePlugin from "./plugins/DataSourcePlugin";
 import FeatureScalePlugin from "./plugins/FeatureScalePlugin";
 import LayerAnimateStylePlugin from "./plugins/LayerAnimateStylePlugin";
+import LayerMaskPlugin from "./plugins/LayerMaskPlugin";
 import LayerModelPlugin from "./plugins/LayerModelPlugin";
 import LayerStylePlugin from "./plugins/LayerStylePlugin";
 import LightingPlugin from "./plugins/LightingPlugin";
@@ -63,6 +64,11 @@ container.bind(TYPES.ILayerPlugin).to(DataMappingPlugin).inRequestScope();
  */
 
 container.bind(TYPES.ILayerPlugin).to(LayerStylePlugin).inRequestScope();
+/**
+ * 初始化地图 Mask
+ */
+
+container.bind(TYPES.ILayerPlugin).to(LayerMaskPlugin).inRequestScope();
 /**
  * 负责属性更新
  */

package/es/line/models/arc.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineArcTriangulation } from "../../core/triangulation"; // arc dash line
@@ -268,13 +268,13 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+        var _ref4, _ref4$segmentNumber, segmentNumber, _this$getShaders, frag, vert, type, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; //
 
                 _context2.next = 4;
@@ -286,9 +286,7 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  stencil: getMask(mask, maskInside)
+                  segmentNumber: segmentNumber
                 });
 
               case 4:

package/es/line/models/arc_3d.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineArcTriangulation } from "../../core/triangulation";
@@ -250,13 +250,13 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+        var _ref4, _ref4$segmentNumber, segmentNumber, _this$getShaders, frag, vert, type, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
                 _context2.next = 4;
                 return this.layer.buildLayerModel({
@@ -264,9 +264,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
                   vertexShader: vert,
                   fragmentShader: frag,
                   triangulation: LineArcTriangulation,
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  stencil: getMask(mask, maskInside)
+                  segmentNumber: segmentNumber
                 });
 
               case 4:

package/es/line/models/earthArc_3d.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineArcTriangulation } from "../../core/triangulation";
@@ -250,13 +250,13 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+        var _ref4, _ref4$segmentNumber, segmentNumber, _this$getShaders, frag, vert, type, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
                 _context2.next = 4;
                 return this.layer.buildLayerModel({
@@ -267,9 +267,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: true
                   },
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  stencil: getMask(mask, maskInside)
+                  segmentNumber: segmentNumber
                 });
 
               case 4:

package/es/line/models/great_circle.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineArcTriangulation } from "../../core/triangulation";
@@ -215,14 +215,12 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, model;
-
+        var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'lineGreatCircle',
                   vertexShader: line_arc2d_vert,
@@ -230,16 +228,14 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
                   triangulation: LineArcTriangulation,
                   depth: {
                     enable: false
-                  },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -311,12 +307,12 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
 
             var texture = feature.texture; // console.log('icon feature', feature)
 
-            var _ref4 = iconMap[texture] || {
+            var _ref3 = iconMap[texture] || {
               x: 0,
               y: 0
             },
-                x = _ref4.x,
-                y = _ref4.y;
+                x = _ref3.x,
+                y = _ref3.y;
 
             return [x, y];
           }

package/es/line/models/half.js

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineTriangulation } from "../../core/triangulation";
@@ -144,13 +144,13 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _ref2$depth, depth, _this$getShaders, frag, vert, model;
+        var _ref2, _ref2$depth, depth, _this$getShaders, frag, vert, model;
 
         return _regeneratorRuntime.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, _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? false : _ref2$depth;
+                _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? false : _ref2$depth;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert;
                 this.layer.triangulation = LineTriangulation;
                 _context2.next = 5;
@@ -161,9 +161,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
                   triangulation: LineTriangulation,
                   depth: {
                     enable: depth
-                  },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
               case 5:

package/es/line/models/line.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, LineTriangulation, rgb2arr } from '@antv/l7-utils';
+import { LineTriangulation, rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LinearDir, TextureBlend } from "../../core/interface"; // import { LineTriangulation } from '../../core/triangulation';
@@ -275,13 +275,13 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$depth, depth, _ref3$workerEnabled, workerEnabled, enablePicking, _this$getShaders, frag, vert, type, model;
+        var _ref3, _ref3$depth, depth, _ref3$workerEnabled, workerEnabled, enablePicking, _this$getShaders, frag, vert, type, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking;
+                _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; // console.log(frag)
 
                 this.layer.triangulation = LineTriangulation;
@@ -294,8 +294,6 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: depth
                   },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside),
                   workerEnabled: workerEnabled,
                   workerOptions: {
                     modelType: 'line' + type,

package/es/line/models/linearline.js

@@ -13,7 +13,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { generateColorRamp, getMask } from '@antv/l7-utils';
+import { generateColorRamp } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LinearDir } from "../../core/interface";
@@ -171,13 +171,13 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$depth, depth, model;
+        var _ref3, _ref3$depth, depth, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
+                _ref3 = this.layer.getLayerConfig(), _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
                 this.layer.triangulation = LineTriangulation;
                 _context2.next = 4;
                 return this.layer.buildLayerModel({
@@ -187,9 +187,7 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
                   triangulation: LineTriangulation,
                   depth: {
                     enable: depth
-                  },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
               case 4: