@antv/l7-layers 2.17.2 → 2.17.4

package/lib/point/models/earthExtrude.js

@@ -1,85 +1,116 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _lodash = require("lodash");
+
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+
 var _triangulation = require("../../core/triangulation");
+
 var _utils = require("../../earth/utils");
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 /* babel-plugin-inline-import '../shaders/earth/extrude_frag.glsl' */
 var pointExtrudeFrag = "varying vec4 v_color;\nuniform float u_opacity: 1.0;\n\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\n\nuniform float u_linearColor: 0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\nuniform float u_opacitylinear: 0.0;\nuniform float u_opacitylinear_dir: 1.0;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\nvoid main() {\n\n   gl_FragColor = v_color;\n\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - v_barLinearZ): v_barLinearZ;\n  }\n\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+
 /* babel-plugin-inline-import '../shaders/earth/extrude_vert.glsl' */
 var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_globel;\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\n// \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n  \n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  vec3 size = a_Size * a_Position;\n\n  // a_Position.z \u662F\u5728\u6784\u5EFA\u7F51\u683C\u7684\u65F6\u5019\u4F20\u5165\u7684\u6807\u51C6\u503C 0 - 1\uFF0C\u5728\u63D2\u503C\u5668\u63D2\u503C\u53EF\u4EE5\u83B7\u53D6 0\uFF5E1 \u7EBF\u6027\u6E10\u53D8\u7684\u503C\n  v_barLinearZ =  a_Position.z;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n  v_lightWeight = lightWeight;\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, barLinearZ);\n    v_color.rgb *= lightWeight;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     v_color = a_Color;\n  }\n  v_color.a *= u_opacity;\n\n    \n  // \u5728\u5730\u7403\u6A21\u5F0F\u4E0B\uFF0C\u5C06\u539F\u672C\u5782\u76F4\u4E8E xy \u5E73\u9762\u7684\u5706\u67F1\u8C03\u6574\u59FF\u6001\u5230\u9002\u5E94\u5706\u7684\u89D2\u5EA6\n  //\u65CB\u8F6C\u77E9\u9635mx\uFF0C\u521B\u5EFA\u7ED5x\u8F74\u65CB\u8F6C\u77E9\u9635\n  float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);\n  float xRadian = getXRadian(a_Pos.y, r);\n  float xcos = cos(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float xsin = sin(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 mx = mat4(\n    1,0,0,0,  \n    0,xcos,-xsin,0,  \n    0,xsin,xcos,0,  \n    0,0,0,1);\n\n  //\u65CB\u8F6C\u77E9\u9635my\uFF0C\u521B\u5EFA\u7ED5y\u8F74\u65CB\u8F6C\u77E9\u9635\n  float yRadian = getYRadian(a_Pos.x, a_Pos.z);\n  float ycos = cos(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float ysin = sin(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 my = mat4(\n    ycos,0,-ysin,0,  \n    0,1,0,0,  \n    ysin,0,ycos,0,  \n    0,0,0,1);\n\n  gl_Position = u_ViewProjectionMatrix * vec4(( my * mx *  vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);\n  \n\n  setPickingColor(a_PickingColor);\n}\n";
+
 var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrudeModel, _BaseModel);
+
   var _super = _createSuper(ExtrudeModel);
+
   function ExtrudeModel() {
     var _this;
+
     (0, _classCallCheck2.default)(this, ExtrudeModel);
+
     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));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseCount", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseRepeat", 0);
     return _this;
   }
+
   (0, _createClass2.default)(ExtrudeModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$animateOption = _ref.animateOption,
-        animateOption = _ref$animateOption === void 0 ? {
-          enable: false,
-          speed: 0.01,
-          repeat: false
-        } : _ref$animateOption,
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        sourceColor = _ref.sourceColor,
-        targetColor = _ref.targetColor,
-        _ref$pickLight = _ref.pickLight,
-        pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
-        _ref$heightfixed = _ref.heightfixed,
-        heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
-        _ref$opacityLinear = _ref.opacityLinear,
-        opacityLinear = _ref$opacityLinear === void 0 ? {
-          enable: false,
-          dir: 'up'
-        } : _ref$opacityLinear,
-        _ref$lightEnable = _ref.lightEnable,
-        lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable;
-
-      // 转化渐变色
+          _ref$animateOption = _ref.animateOption,
+          animateOption = _ref$animateOption === void 0 ? {
+        enable: false,
+        speed: 0.01,
+        repeat: false
+      } : _ref$animateOption,
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          sourceColor = _ref.sourceColor,
+          targetColor = _ref.targetColor,
+          _ref$pickLight = _ref.pickLight,
+          pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
+          _ref$heightfixed = _ref.heightfixed,
+          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
+          _ref$opacityLinear = _ref.opacityLinear,
+          opacityLinear = _ref$opacityLinear === void 0 ? {
+        enable: false,
+        dir: 'up'
+      } : _ref$opacityLinear,
+          _ref$lightEnable = _ref.lightEnable,
+          lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable; // 转化渐变色
+
+
       var useLinearColor = 0; // 默认不生效
+
       var sourceColorArr = [0, 0, 0, 0];
       var targetColorArr = [0, 0, 0, 0];
+
       if (sourceColor && targetColor) {
         sourceColorArr = (0, _l7Utils.rgb2arr)(sourceColor);
         targetColorArr = (0, _l7Utils.rgb2arr)(targetColor);
         useLinearColor = 1;
       }
+
       if (this.raiseCount < 1 && this.raiseRepeat > 0) {
         if (animateOption.enable) {
           var _animateOption$speed = animateOption.speed,
-            speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
+              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
           this.raiseCount += speed;
+
           if (this.raiseCount >= 1) {
             if (this.raiseRepeat > 1) {
               this.raiseCount = 0;
@@ -90,6 +121,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           }
         }
       }
+
       return {
         // 圆柱体的拾取高亮是否要计算光照
         u_pickLight: Number(pickLight),
@@ -113,18 +145,23 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.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;
     }()
   }, {
@@ -132,39 +169,46 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _ref2, _ref2$animateOption$r, repeat, model;
+
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              // GAODE1.x GAODE2.x MAPBOX
-              _ref2 = this.layer.getLayerConfig(), _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
-              this.raiseRepeat = repeat;
-              _context2.next = 4;
-              return this.layer.buildLayerModel({
-                moduleName: 'pointEarthExtrude',
-                vertexShader: pointExtrudeVert,
-                fragmentShader: pointExtrudeFrag,
-                triangulation: _triangulation.PointExtrudeTriangulation,
-                depth: {
-                  enable: true
-                },
-                cull: {
-                  enable: true,
-                  face: (0, _l7Utils.getCullFace)(this.mapService.version)
-                },
-                blend: this.getBlend()
-              });
-            case 4:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 6:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // GAODE1.x GAODE2.x MAPBOX
+                _ref2 = this.layer.getLayerConfig(), _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
+                this.raiseRepeat = repeat;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointEarthExtrude',
+                  vertexShader: pointExtrudeVert,
+                  fragmentShader: pointExtrudeFrag,
+                  triangulation: _triangulation.PointExtrudeTriangulation,
+                  depth: {
+                    enable: true
+                  },
+                  cull: {
+                    enable: true,
+                    face: (0, _l7Utils.getCullFace)(this.mapService.version)
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -183,23 +227,26 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           size: 3,
           update: function update(feature) {
             var size = feature.size;
+
             if (size) {
               var buffersize = [];
+
               if (Array.isArray(size)) {
                 buffersize = size.length === 2 ? [size[0], size[0], size[1]] : size;
               }
+
               if (!Array.isArray(size)) {
                 buffersize = [size, size, size];
               }
+
               return buffersize;
             } else {
               return [2, 2, 2];
             }
           }
         }
-      });
+      }); // point layer size;
 
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'normal',
         type: _l7Core.AttributeType.Attribute,
@@ -238,4 +285,5 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return ExtrudeModel;
 }(_BaseModel2.default);
+
 exports.default = ExtrudeModel;

package/lib/point/models/earthFill.js

@@ -1,70 +1,95 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+
 var _triangulation = require("../../core/triangulation");
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _glMatrix = require("gl-matrix");
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
 /* babel-plugin-inline-import '../shaders/earth/fill_frag.glsl' */
 var pointFillFrag = "uniform float u_additive;\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  if(outer_df > antialiasblur + 0.018) discard;\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+
 /* babel-plugin-inline-import '../shaders/earth/fill_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + u_offsets, 1.0);\n\n  setPickingColor(a_PickingColor);\n}\n";
+
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
+
   var _super = _createSuper(FillModel);
+
   function FillModel() {
     (0, _classCallCheck2.default)(this, FillModel);
     return _super.apply(this, arguments);
   }
+
   (0, _createClass2.default)(FillModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$strokeOpacity = _ref.strokeOpacity,
-        strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
-        _ref$strokeWidth = _ref.strokeWidth,
-        strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
-        _ref$stroke = _ref.stroke,
-        stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
-        blend = _ref.blend,
-        _ref$blur = _ref.blur,
-        blur = _ref$blur === void 0 ? 0 : _ref$blur;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$strokeOpacity = _ref.strokeOpacity,
+          strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
+          _ref$strokeWidth = _ref.strokeWidth,
+          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
+          _ref$stroke = _ref.stroke,
+          stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
+          blend = _ref.blend,
+          _ref$blur = _ref.blur,
+          blur = _ref$blur === void 0 ? 0 : _ref$blur;
+
       return {
         u_blur: blur,
         u_additive: blend === 'additive' ? 1.0 : 0.0,
         u_opacity: opacity,
         u_stroke_opacity: strokeOpacity,
         u_stroke_width: strokeWidth,
-        u_stroke_color: (0, _l7Utils.rgb2arr)(stroke)
-        // u_offsets: offsets,
+        u_stroke_color: (0, _l7Utils.rgb2arr)(stroke) // u_offsets: offsets,
+
       };
     }
   }, {
     key: "getAnimateUniforms",
     value: function getAnimateUniforms() {
       var _ref2 = this.layer.getLayerConfig(),
-        _ref2$animateOption = _ref2.animateOption,
-        animateOption = _ref2$animateOption === void 0 ? {
-          enable: false
-        } : _ref2$animateOption;
+          _ref2$animateOption = _ref2.animateOption,
+          animateOption = _ref2$animateOption === void 0 ? {
+        enable: false
+      } : _ref2$animateOption;
+
       return {
         u_animate: this.animateOption2Array(animateOption),
         u_time: this.layer.getLayerAnimateTime()
@@ -75,18 +100,23 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.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;
     }()
   }, {
@@ -95,34 +125,41 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              this.layer.triangulation = _triangulation.GlobelPointFillTriangulation;
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'pointEarthFill',
-                vertexShader: pointFillVert,
-                fragmentShader: pointFillFrag,
-                triangulation: _triangulation.GlobelPointFillTriangulation,
-                depth: {
-                  enable: true
-                },
-                blend: this.getBlend()
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                this.layer.triangulation = _triangulation.GlobelPointFillTriangulation;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointEarthFill',
+                  vertexShader: pointFillVert,
+                  fragmentShader: pointFillFrag,
+                  triangulation: _triangulation.GlobelPointFillTriangulation,
+                  depth: {
+                    enable: true
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }() // overwrite baseModel func
+
   }, {
     key: "animateOption2Array",
     value: function animateOption2Array(option) {
@@ -132,6 +169,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       var _this = this;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'extrude',
         type: _l7Core.AttributeType.Attribute,
@@ -146,36 +184,54 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           size: 3,
           update: function update(feature, featureIdx, vertex, attributeIdx) {
             var _vertex = (0, _slicedToArray2.default)(vertex, 3),
-              x = _vertex[0],
-              y = _vertex[1],
-              z = _vertex[2];
+                x = _vertex[0],
+                y = _vertex[1],
+                z = _vertex[2];
+
             var n1 = _glMatrix.vec3.fromValues(0, 0, 1);
+
             var n2 = _glMatrix.vec3.fromValues(x, 0, z);
+
             var xzReg = x >= 0 ? _glMatrix.vec3.angle(n1, n2) : Math.PI * 2 - _glMatrix.vec3.angle(n1, n2);
             var yReg = Math.PI * 2 - Math.asin(y / 100);
+
             var m = _glMatrix.mat4.create();
+
             _glMatrix.mat4.rotateY(m, m, xzReg);
+
             _glMatrix.mat4.rotateX(m, m, yReg);
+
             var v1 = _glMatrix.vec3.fromValues(1, 1, 0);
+
             _glMatrix.vec3.transformMat4(v1, v1, m);
+
             _glMatrix.vec3.normalize(v1, v1);
+
             var v2 = _glMatrix.vec3.fromValues(-1, 1, 0);
+
             _glMatrix.vec3.transformMat4(v2, v2, m);
+
             _glMatrix.vec3.normalize(v2, v2);
+
             var v3 = _glMatrix.vec3.fromValues(-1, -1, 0);
+
             _glMatrix.vec3.transformMat4(v3, v3, m);
+
             _glMatrix.vec3.normalize(v3, v3);
+
             var v4 = _glMatrix.vec3.fromValues(1, -1, 0);
+
             _glMatrix.vec3.transformMat4(v4, v4, m);
+
             _glMatrix.vec3.normalize(v4, v4);
+
             var extrude = [].concat((0, _toConsumableArray2.default)(v1), (0, _toConsumableArray2.default)(v2), (0, _toConsumableArray2.default)(v3), (0, _toConsumableArray2.default)(v4));
             var extrudeIndex = attributeIdx % 4 * 3;
             return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
           }
         }
-      });
+      }); // point layer size;
 
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
@@ -190,13 +246,12 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 5 : _feature$size;
+                size = _feature$size === void 0 ? 5 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
-      });
+      }); // point layer size;
 
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'shape',
         type: _l7Core.AttributeType.Attribute,
@@ -211,8 +266,10 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$shape = feature.shape,
-              shape = _feature$shape === void 0 ? 2 : _feature$shape;
+                shape = _feature$shape === void 0 ? 2 : _feature$shape;
+
             var shape2d = _this.layer.getLayerConfig().shape2d;
+
             var shapeIndex = shape2d.indexOf(shape);
             return [shapeIndex];
           }
@@ -222,4 +279,5 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return FillModel;
 }(_BaseModel2.default);
+
 exports.default = FillModel;