@antv/l7-layers 2.16.0 → 2.16.1

package/es/line/models/wall.js

@@ -7,36 +7,52 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 import { AttributeType, gl } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { LineTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../shaders/wall/wall_frag.glsl' */
 var line_frag = "#define Animate 0.0\n#define LineTexture 1.0\n\n// line texture\nuniform float u_line_texture;\nuniform sampler2D u_texture;\nuniform vec2 u_textSize;\nuniform float u_linearColor: 0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_opacity : 1.0;\nuniform float u_textureBlend;\nuniform float u_iconStepCount;\nuniform float u_time;\nuniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ]; // \u63A7\u5236\u8FD0\u52A8\n\nvarying vec2 v_iconMapUV;\nvarying float v_blur;\nvarying float v_radio;\nvarying vec4 v_color;\nvarying vec4 v_dataset;\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = u_opacity;\n  float animateSpeed = 0.0; // \u8FD0\u52A8\u901F\u5EA6\n  float d_distance_ratio = v_dataset.r; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float v = v_dataset.a;\n\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    gl_FragColor = mix(u_sourceColor, u_targetColor, v);\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     gl_FragColor = v_color;\n  }\n\n  gl_FragColor.a *= opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n  if(u_animate.x == Animate) {\n      animateSpeed = u_time / u_animate.y;\n       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);\n      alpha = (alpha + u_animate.w -1.0) / u_animate.w;\n      alpha = smoothstep(0., 1., alpha);\n      gl_FragColor.a *= alpha;\n  }\n\n  if(u_line_texture == LineTexture) { // while load texture\n    float aDistance = v_dataset.g;      // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n    float d_texPixelLen = v_dataset.b;  // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);\n    float v = v_dataset.a;  // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 start\n    float flag = 0.0;\n    if(u > 1.0/u_iconStepCount) {\n      flag = 1.0;\n    }\n    u = fract(u*u_iconStepCount);\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 end\n\n    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;\n    vec4 pattern = texture2D(u_texture, uv);\n\n    // Tip: \u5224\u65AD\u7EB9\u7406\u95F4\u9694\n    if(flag > 0.0) {\n      pattern = vec4(0.0);\n    }\n\n    if(u_textureBlend == 0.0) { // normal\n      pattern.a = 0.0;\n      gl_FragColor = filterColor(gl_FragColor + pattern);\n    } else { // replace\n        pattern.a *= opacity;\n        if(gl_FragColor.a <= 0.0) {\n          pattern.a = 0.0;\n        }\n        gl_FragColor = filterColor(pattern);\n    }\n  }\n  \n\n  // blur - AA\n  if(v < v_blur) {\n    gl_FragColor.a = mix(0.0, gl_FragColor.a, v/v_blur);\n  } else if(v > 1.0 - v_blur) {\n    gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);\n  }\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 /* babel-plugin-inline-import '../shaders/wall/wall_vert.glsl' */
 var line_vert = "#define Animate 0.0\n\nattribute float a_Miter;\nattribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\nattribute vec2 a_iconMapUV;\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\nuniform float u_icon_step: 100;\nuniform float u_heightfixed;\nuniform float u_linearColor: 0;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nvarying vec2 v_iconMapUV;\nvarying vec4 v_color;\nvarying float v_blur;\nvarying float v_radio;\nvarying vec4 v_dataset;\n\nvoid main() {\n\n\n  float d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float d_texPixelLen;    // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n\n  v_iconMapUV = a_iconMapUV;\n  if(u_heightfixed < 1.0) {     // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n    d_texPixelLen = project_pixel(u_icon_step);\n  } else {\n    d_texPixelLen = u_icon_step;\n  }\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n    d_texPixelLen *= 10.0;\n  }\n\n  if(u_animate.x == Animate || u_linearColor == 1.0) {\n      d_distance_ratio = a_Distance / a_Total_Distance;\n  }\n\n  float miter = (a_Miter + 1.0)/2.0;\n  // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\n  v_dataset[0] = d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  v_dataset[1] = a_Distance;       // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n  v_dataset[2] = d_texPixelLen;    // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n  v_dataset[3] = miter;          // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C 0 - 1\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float originSize = a_Size.x;  // \u56FA\u5B9A\u9AD8\u5EA6\n  if(u_heightfixed < 1.0) {     // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n    originSize = project_float_pixel(a_Size.x);\n  }\n\n  float wallHeight = originSize * miter;\n  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));\n\n  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);\n  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
+
 var LineWallModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(LineWallModel, _BaseModel);
+
   var _super = _createSuper(LineWallModel);
+
   function LineWallModel() {
     var _this;
+
     _classCallCheck(this, LineWallModel);
+
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+
     _this = _super.call.apply(_super, [this].concat(args));
+
     _defineProperty(_assertThisInitialized(_this), "updateTexture", function () {
       var createTexture2D = _this.rendererService.createTexture2D;
+
       if (_this.texture) {
         _this.texture.update({
           data: _this.iconService.getCanvas()
         });
+
         _this.layer.render();
+
         return;
       }
+
       _this.texture = createTexture2D({
         data: _this.iconService.getCanvas(),
         mag: gl.NEAREST,
@@ -46,39 +62,45 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
         height: _this.iconService.canvasHeight || 128
       });
     });
+
     return _this;
   }
+
   _createClass(LineWallModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        sourceColor = _ref.sourceColor,
-        targetColor = _ref.targetColor,
-        _ref$textureBlend = _ref.textureBlend,
-        textureBlend = _ref$textureBlend === void 0 ? 'normal' : _ref$textureBlend,
-        _ref$heightfixed = _ref.heightfixed,
-        heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
-        _ref$lineTexture = _ref.lineTexture,
-        lineTexture = _ref$lineTexture === void 0 ? false : _ref$lineTexture,
-        _ref$iconStep = _ref.iconStep,
-        iconStep = _ref$iconStep === void 0 ? 100 : _ref$iconStep,
-        _ref$iconStepCount = _ref.iconStepCount,
-        iconStepCount = _ref$iconStepCount === void 0 ? 1 : _ref$iconStepCount;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          sourceColor = _ref.sourceColor,
+          targetColor = _ref.targetColor,
+          _ref$textureBlend = _ref.textureBlend,
+          textureBlend = _ref$textureBlend === void 0 ? 'normal' : _ref$textureBlend,
+          _ref$heightfixed = _ref.heightfixed,
+          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
+          _ref$lineTexture = _ref.lineTexture,
+          lineTexture = _ref$lineTexture === void 0 ? false : _ref$lineTexture,
+          _ref$iconStep = _ref.iconStep,
+          iconStep = _ref$iconStep === void 0 ? 100 : _ref$iconStep,
+          _ref$iconStepCount = _ref.iconStepCount,
+          iconStepCount = _ref$iconStepCount === void 0 ? 1 : _ref$iconStepCount;
+
       if (this.rendererService.getDirty()) {
         this.texture.bind();
-      }
+      } // 转化渐变色
+
 
-      // 转化渐变色
       var useLinearColor = 0; // 默认不生效
+
       var sourceColorArr = [0, 0, 0, 0];
       var targetColorArr = [0, 0, 0, 0];
+
       if (sourceColor && targetColor) {
         sourceColorArr = rgb2arr(sourceColor);
         targetColorArr = rgb2arr(targetColor);
         useLinearColor = 1;
       }
+
       return {
         u_heightfixed: Number(heightfixed),
         u_opacity: isNumber(opacity) ? opacity : 1.0,
@@ -101,7 +123,8 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     key: "getAnimateUniforms",
     value: function getAnimateUniforms() {
       var _ref2 = this.layer.getLayerConfig(),
-        animateOption = _ref2.animateOption;
+          animateOption = _ref2.animateOption;
+
       return {
         u_animate: this.animateOption2Array(animateOption),
         u_time: this.layer.getLayerAnimateTime()
@@ -112,26 +135,32 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              this.updateTexture();
-              this.iconService.on('imageUpdate', this.updateTexture);
-              return _context.abrupt("return", this.buildModels());
-            case 3:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                return _context.abrupt("return", this.buildModels());
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
+
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
@@ -141,37 +170,44 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.layer.buildLayerModel({
-                moduleName: 'lineWall',
-                vertexShader: line_vert,
-                fragmentShader: line_frag,
-                triangulation: LineTriangulation,
-                depth: {
-                  enable: false
-                },
-                blend: this.getBlend()
-              });
-            case 2:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'lineWall',
+                  vertexShader: line_vert,
+                  fragmentShader: line_frag,
+                  triangulation: LineTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       var _this2 = this;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'distance',
         type: AttributeType.Attribute,
@@ -220,13 +256,12 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
           size: 2,
           update: function update(feature) {
             var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 1 : _feature$size;
+                size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0], size[1]] : [size, 0];
           }
         }
-      });
+      }); // point layer size;
 
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'normal',
         type: AttributeType.Attribute,
@@ -276,19 +311,24 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
           size: 2,
           update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
+
             var texture = feature.texture;
+
             var _ref3 = iconMap[texture] || {
-                x: 0,
-                y: 0
-              },
-              x = _ref3.x,
-              y = _ref3.y;
+              x: 0,
+              y: 0
+            },
+                x = _ref3.x,
+                y = _ref3.y;
+
             return [x, y];
           }
         }
       });
     }
   }]);
+
   return LineWallModel;
 }(BaseModel);
+
 export { LineWallModel as default };

package/es/mask/index.js

@@ -7,44 +7,61 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 import BaseLayer from "../core/BaseLayer";
 import MaskModels from "./models";
+
 var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(MaskLayer, _BaseLayer);
+
   var _super = _createSuper(MaskLayer);
+
   function MaskLayer() {
     var _this;
+
     _classCallCheck(this, MaskLayer);
+
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
+
     _this = _super.call.apply(_super, [this].concat(args));
+
     _defineProperty(_assertThisInitialized(_this), "type", 'MaskLayer');
+
     return _this;
   }
+
   _createClass(MaskLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var shape;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              shape = this.getModelType();
-              this.layerModel = new MaskModels[shape](this);
-              _context.next = 4;
-              return this.initLayerModels();
-            case 4:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new MaskModels[shape](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -53,6 +70,8 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
       return 'fill';
     }
   }]);
+
   return MaskLayer;
 }(BaseLayer);
+
 export { MaskLayer as default };

package/es/mask/models/fill.js

@@ -5,31 +5,42 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 import { rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
 var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
 var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n\nvoid main() {\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.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+
 var MaskModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(MaskModel, _BaseModel);
+
   var _super = _createSuper(MaskModel);
+
   function MaskModel() {
     _classCallCheck(this, MaskModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(MaskModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$color = _ref.color,
-        color = _ref$color === void 0 ? '#000' : _ref$color;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#000' : _ref$color;
+
       return {
         u_opacity: isNumber(opacity) ? opacity : 0.0,
         u_color: rgb2arr(color)
@@ -40,18 +51,23 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -60,37 +76,44 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.layer.buildLayerModel({
-                moduleName: 'mask',
-                vertexShader: mask_vert,
-                fragmentShader: mask_frag,
-                triangulation: polygonTriangulation,
-                depth: {
-                  enable: false
-                },
-                pick: false
-              });
-            case 2:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'mask',
+                  vertexShader: mask_vert,
+                  fragmentShader: mask_frag,
+                  triangulation: polygonTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  pick: false
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+
       if (refresh) {
         this.layerService.clear();
       }
@@ -101,6 +124,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
       return '';
     }
   }]);
+
   return MaskModel;
 }(BaseModel);
+
 export { MaskModel as default };