@antv/l7-layers 2.14.1 → 2.14.3

package/es/point/shaders/text_frag.glsl

@@ -44,5 +44,9 @@ void main() {
   // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));
   gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));
   gl_FragColor.a= gl_FragColor.a * alpha;
+   // 作为 mask 模板时需要丢弃透明的像素
+  if (gl_FragColor.a < 0.01) {
+    discard;
+  }
   gl_FragColor = filterColor(gl_FragColor);
 }

package/es/polygon/index.js

@@ -72,7 +72,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
       var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
 
-      if (shape === 'fill') {
+      if (shape === 'fill' || !shape) {
         return 'fill';
       } else if (shape === 'extrude') {
         return 'extrude';

package/es/polygon/models/extrude.js

@@ -12,7 +12,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 { PolygonExtrudeTriangulation } from "../../core/triangulation";
@@ -153,28 +153,26 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+        var _this$getShaders, frag, vert, type, 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;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
-                _context2.next = 4;
+                _context2.next = 3;
                 return this.layer.buildLayerModel({
                   moduleName: type,
                   vertexShader: vert,
                   fragmentShader: frag,
-                  triangulation: PolygonExtrudeTriangulation,
-                  stencil: getMask(mask, maskInside)
+                  triangulation: PolygonExtrudeTriangulation
                 });
 
-              case 4:
+              case 3:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 6:
+              case 5:
               case "end":
                 return _context2.stop();
             }
@@ -191,9 +189,9 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getShaders",
     value: function getShaders() {
-      var _ref3 = this.layer.getLayerConfig(),
-          pickLight = _ref3.pickLight,
-          mapTexture = _ref3.mapTexture;
+      var _ref2 = this.layer.getLayerConfig(),
+          pickLight = _ref2.pickLight,
+          mapTexture = _ref2.mapTexture;
 
       if (mapTexture) {
         return {
@@ -298,8 +296,8 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     value: function loadTexture() {
       var _this = this;
 
-      var _ref4 = this.layer.getLayerConfig(),
-          mapTexture = _ref4.mapTexture;
+      var _ref3 = this.layer.getLayerConfig(),
+          mapTexture = _ref3.mapTexture;
 
       var createTexture2D = this.rendererService.createTexture2D;
       this.texture = createTexture2D({

package/es/polygon/models/fill.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, polygonFillTriangulation } from '@antv/l7-utils';
+import { polygonFillTriangulation } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulationWithCenter } from "../../core/triangulation";
@@ -123,14 +123,14 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _this$getModelParams, frag, vert, triangulation, type, _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _ref2$workerEnabled, workerEnabled, enablePicking, model;
+        var _this$getModelParams, frag, vert, triangulation, type, _ref2, _ref2$workerEnabled, workerEnabled, enablePicking, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _this$getModelParams = this.getModelParams(), frag = _this$getModelParams.frag, vert = _this$getModelParams.vert, triangulation = _this$getModelParams.triangulation, type = _this$getModelParams.type;
-                _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$workerEnabled = _ref2.workerEnabled, workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled, enablePicking = _ref2.enablePicking;
+                _ref2 = this.layer.getLayerConfig(), _ref2$workerEnabled = _ref2.workerEnabled, workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled, enablePicking = _ref2.enablePicking;
                 this.layer.triangulation = triangulation;
                 _context2.next = 5;
                 return this.layer.buildLayerModel({
@@ -142,8 +142,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside),
                   workerEnabled: workerEnabled,
                   workerOptions: {
                     modelType: type,

package/es/polygon/models/ocean.js

@@ -13,7 +13,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import { getMask, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
@@ -91,14 +91,12 @@ var OceanModel = /*#__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: 'polygonOcean',
                   vertexShader: ocean_vert,
@@ -107,15 +105,14 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  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();
             }

package/es/polygon/models/water.js

@@ -13,7 +13,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import { getMask } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
@@ -86,14 +85,12 @@ var WaterModel = /*#__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: 'polygonWater',
                   vertexShader: water_vert,
@@ -102,15 +99,14 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  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();
             }
@@ -173,8 +169,8 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     value: function loadTexture() {
       var _this = this;
 
-      var _ref3 = this.layer.getLayerConfig(),
-          waterTexture = _ref3.waterTexture;
+      var _ref2 = this.layer.getLayerConfig(),
+          waterTexture = _ref2.waterTexture;
 
       var createTexture2D = this.rendererService.createTexture2D;
       this.texture = createTexture2D({

package/es/raster/models/raster.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 { getDefaultDomain, getMask } from '@antv/l7-utils';
+import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n   \n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n      discard;\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n     discard;\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    \n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n    if(gl_FragColor.a < 0.01)\n      discard;\n   \n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "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\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";
@@ -113,20 +113,19 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, 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;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
                 parserDataItem = source.data.dataArray[0];
-                _context2.next = 6;
+                _context2.next = 5;
                 return this.getRasterData(parserDataItem);
 
-              case 6:
+              case 5:
                 _yield$this$getRaster = _context2.sent;
                 data = _yield$this$getRaster.data;
                 width = _yield$this$getRaster.width;
@@ -139,7 +138,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   type: gl.FLOAT // aniso: 4,
 
                 });
-                _context2.next = 13;
+                _context2.next = 12;
                 return this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
@@ -148,15 +147,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
-              case 13:
+              case 12:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 15:
+              case 14:
               case "end":
                 return _context2.stop();
             }

package/es/raster/models/rasterRgb.js

@@ -17,7 +17,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 { RasterImageTriangulation } from "../../core/triangulation";
 
@@ -25,7 +24,7 @@ import { RasterImageTriangulation } from "../../core/triangulation";
 var rasterVert = "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\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";
 
 /* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n \n}";
+var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n  if(gl_FragColor.a < 0.01)\n    discard;\n \n}";
 
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
@@ -133,20 +132,19 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, 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;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
                 parserDataItem = source.data.dataArray[0];
-                _context2.next = 6;
+                _context2.next = 5;
                 return this.getRasterData(parserDataItem);
 
-              case 6:
+              case 5:
                 _yield$this$getRaster = _context2.sent;
                 data = _yield$this$getRaster.data;
                 width = _yield$this$getRaster.width;
@@ -159,7 +157,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: gl.RGB,
                   type: gl.FLOAT
                 });
-                _context2.next = 13;
+                _context2.next = 12;
                 return this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
@@ -168,15 +166,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
-              case 13:
+              case 12:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 15:
+              case 14:
               case "end":
                 return _context2.stop();
             }

package/es/raster/models/rasterTerrainRgb.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 { getDefaultDomain, getMask } from '@antv/l7-utils';
+import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_terrain_rgb_frag.glsl' */
-var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\n\nvoid main() {\n  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;\n  float r = baseColor.r * 256.0 * 256.0;\n  float g = baseColor.g * 256.0;\n  float b = baseColor.b;\n  float value =  (r + g + b) * 0.1 - 10000.0;\n  \n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\n\nvoid main() {\n  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;\n  float r = baseColor.r * 256.0 * 256.0;\n  float g = baseColor.g * 256.0;\n  float b = baseColor.b;\n  float value =  (r + g + b) * 0.1 - 10000.0;\n  \n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
 var Raster_terrainVert = "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";
@@ -70,26 +70,24 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, imageData, model;
-
+        var source, createTexture2D, 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;
-                _context.next = 5;
+                _context.next = 4;
                 return source.data.images;
 
-              case 5:
+              case 4:
                 imageData = _context.sent;
                 this.texture = createTexture2D({
                   data: imageData[0],
                   width: imageData[0].width,
                   height: imageData[0].height
                 });
-                _context.next = 9;
+                _context.next = 8;
                 return this.layer.buildLayerModel({
                   moduleName: 'RasterTileDataImage',
                   vertexShader: Raster_terrainVert,
@@ -98,16 +96,14 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
                   primitive: gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  }
                 });
 
-              case 9:
+              case 8:
                 model = _context.sent;
                 return _context.abrupt("return", [model]);
 
-              case 11:
+              case 10:
               case "end":
                 return _context.stop();
             }

package/es/raster/shaders/raster_2d_frag.glsl

@@ -16,14 +16,17 @@ void main() {
 
   float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;
   if (value == u_noDataValue || isnan_emu(value))
-    gl_FragColor = vec4(0.0, 0, 0, 0.0);
+      discard;
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
-    gl_FragColor = vec4(0, 0, 0, 0);
+     discard;
   else {
-   
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);
     vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));
+    
     gl_FragColor = color;
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+    if(gl_FragColor.a < 0.01)
+      discard;
+   
   }
 }

package/es/raster/shaders/raster_frag.glsl

@@ -5,5 +5,7 @@ uniform float u_opacity: 1.0;
 void main() {
    gl_FragColor = v_color;
    gl_FragColor.a *= u_opacity;
+   if(gl_FragColor.a < 0.01)
+   discard;
 
 }

package/es/raster/shaders/raster_rgb_frag.glsl

@@ -14,5 +14,7 @@ void main() {
   } else {
     gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);
   }
+  if(gl_FragColor.a < 0.01)
+    discard;
  
 }

package/es/raster/shaders/raster_terrain_rgb_frag.glsl

@@ -27,5 +27,7 @@ void main() {
     vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));
     gl_FragColor = color;
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+      if(gl_FragColor.a < 0.01)
+      discard;
   }
 }

package/es/tile/service/TileLayerService.js

@@ -133,20 +133,20 @@ export var TileLayerService = /*#__PURE__*/function () {
       var _render = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var _this2 = this;
 
-        var layers;
+        var layers, renders;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 layers = this.getRenderLayers();
-                layers.map( /*#__PURE__*/function () {
+                renders = layers.map( /*#__PURE__*/function () {
                   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
                     return _regeneratorRuntime.wrap(function _callee$(_context) {
                       while (1) {
                         switch (_context.prev = _context.next) {
                           case 0:
                             _context.next = 2;
-                            return _this2.layerService.renderLayer(layer);
+                            return _this2.layerService.renderTileLayer(layer);
 
                           case 2:
                           case "end":
@@ -160,8 +160,9 @@ export var TileLayerService = /*#__PURE__*/function () {
                     return _ref2.apply(this, arguments);
                   };
                 }());
+                Promise.all(renders);
 
-              case 2:
+              case 3:
               case "end":
                 return _context2.stop();
             }

package/es/tile/style/constants.js

@@ -5,4 +5,4 @@ export var ProxyFuncs = [
  * 1. 需要作用到所属子图层才会生效的方法
  * 2. 不需要主动重新创建 model 的方法
  */
-'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive'];
+'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive', 'disableMask', 'enableMask'];

package/es/tile/tileFactory/Tile.d.ts

@@ -10,6 +10,8 @@ export default abstract class Tile implements ITile {
     visible: boolean;
     protected layers: ILayer[];
     isLoaded: boolean;
+    protected tileMaskLayers: ILayer[];
+    protected tileMask: ILayer | undefined;
     constructor(sourceTile: SourceTile, parent: ILayer);
     getLayers(): ILayer[];
     styleUpdate(...arg: any): void;
@@ -17,11 +19,14 @@ export default abstract class Tile implements ITile {
     lnglatInBounds(lnglat: ILngLat): boolean;
     protected getLayerOptions(): {
         autoFit: boolean;
+        maskLayers: ILayer[];
+        tileMask: boolean;
         mask: boolean | undefined;
         maskInside?: boolean | undefined;
         maskfence?: any;
         maskColor?: string | undefined;
         maskOpacity?: number | undefined;
+        maskOperation?: import("@antv/l7-core").MaskOperationType | undefined;
         sourceLayer?: string | undefined;
         colors?: string[] | undefined;
         size?: number | undefined;
@@ -51,6 +56,7 @@ export default abstract class Tile implements ITile {
         cursor?: string | undefined;
         forward?: boolean | undefined;
         usage?: string | undefined;
+        enableMask?: boolean | undefined;
         enablePicking?: boolean | undefined;
         enableHighlight?: boolean | undefined;
         enableSelect?: boolean | undefined;
@@ -84,6 +90,8 @@ export default abstract class Tile implements ITile {
         antialias?: boolean | undefined;
         preserveDrawingBuffer?: boolean | undefined;
     };
+    protected getMaskLayer(): ILayer[];
+    protected addTileMask(): Promise<ILayer>;
     protected addMask(layer: ILayer, mask: ILayer): Promise<void>;
     protected addLayer(layer: ILayer): Promise<void>;
     updateVisible(value: boolean): void;