@antv/l7-layers 2.15.5 → 2.16.1

package/es/point/models/fillmage.js

@@ -7,45 +7,63 @@ 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 { getCullFace } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { SizeUnitType } from "../../core/interface";
-import { PointFillTriangulation } from "../../core/triangulation";
-// static pointLayer shader - not support animate
+import { PointFillTriangulation } from "../../core/triangulation"; // static pointLayer shader - not support animate
+
 /* babel-plugin-inline-import '../shaders/image/fillImage_frag.glsl' */
 var pointFillFrag = "uniform sampler2D u_texture;\nuniform vec2 u_textSize;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\nvarying vec2 v_uv; // \u672C\u8EAB\u7684 uv \u5750\u6807\nvarying vec2 v_Iconuv;\n\nvoid main() {\n\n  float opacity = styleMappingMat[0][0];\n\n  vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;\n  gl_FragColor = texture2D(u_texture, pos);\n  gl_FragColor.a *= opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 /* babel-plugin-inline-import '../shaders/image/fillImage_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute vec2 a_Uv;\nattribute float a_Rotate;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform mat2 u_RotateMatrix;\nuniform int u_Size_Unit;\n\nvarying vec2 v_uv; // \u672C\u8EAB\u7684 uv \u5750\u6807\nvarying vec2 v_Iconuv; // icon \u8D34\u56FE\u7684 uv \u5750\u6807\n\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\nuniform float u_opacity : 1;\nuniform vec2 u_offsets;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n\n  v_uv = (a_Extrude.xy + 1.0)/2.0;\n  v_uv.y = 1.0 - v_uv.y;\n  v_Iconuv = a_Uv;\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - empty - empty - empty\n    0.0, 0.0, 0.0, 0.0, // empty - empty - empty - empty\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\n  float newSize = a_Size;\n  if(u_Size_Unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);\n  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + textrueOffsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  float raisingHeight = u_raisingHeight;\n  if(u_heightfixed < 1.0) { // height fixed\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp *vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n \n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+
 var FillImageModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillImageModel, _BaseModel);
+
   var _super = _createSuper(FillImageModel);
+
   function FillImageModel() {
     var _this;
+
     _classCallCheck(this, FillImageModel);
+
     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), "meter2coord", 1);
+
     _defineProperty(_assertThisInitialized(_this), "isMeter", false);
+
     _defineProperty(_assertThisInitialized(_this), "radian", 0);
+
     _defineProperty(_assertThisInitialized(_this), "updateTexture", function () {
       var createTexture2D = _this.rendererService.createTexture2D;
+
       if (_this.texture) {
         _this.texture.update({
           data: _this.iconService.getCanvas(),
           mag: 'linear',
           min: 'linear mipmap nearest',
           mipmap: true
-        });
-        // 更新完纹理后在更新的图层的时候需要更新所有的图层
+        }); // 更新完纹理后在更新的图层的时候需要更新所有的图层
+
+
         _this.layerService.throttleRenderLayers();
+
         return;
       }
+
       _this.texture = createTexture2D({
         data: _this.iconService.getCanvas(),
         mag: gl.LINEAR,
@@ -56,25 +74,27 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
         mipmap: true
       });
     });
+
     return _this;
   }
+
   _createClass(FillImageModel, [{
     key: "getUninforms",
-    value:
-    // 旋转的弧度
+    value: // 旋转的弧度
     function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$offsets = _ref.offsets,
-        offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
-        rotation = _ref.rotation,
-        _ref$raisingHeight = _ref.raisingHeight,
-        raisingHeight = _ref$raisingHeight === void 0 ? 0.0 : _ref$raisingHeight,
-        _ref$heightfixed = _ref.heightfixed,
-        heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
-        _ref$unit = _ref.unit,
-        unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$offsets = _ref.offsets,
+          offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
+          rotation = _ref.rotation,
+          _ref$raisingHeight = _ref.raisingHeight,
+          raisingHeight = _ref$raisingHeight === void 0 ? 0.0 : _ref$raisingHeight,
+          _ref$heightfixed = _ref.heightfixed,
+          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
+          _ref$unit = _ref.unit,
+          unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
+
       if (this.rendererService.getDirty()) {
         this.texture.bind();
       }
@@ -85,12 +105,17 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
        * GAODE2.x         -1
        * GAODE1.x         -1
        */
+
+
       var rotateFlag = 1;
+
       if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
         rotateFlag = -1;
-      }
-      // 控制图标的旋转角度（绕 Z 轴旋转）
+      } // 控制图标的旋转角度（绕 Z 轴旋转）
+
+
       this.radian = rotation !== undefined ? rotateFlag * Math.PI * rotation / 180 : rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
+
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
         opacity: opacity,
         offsets: offsets
@@ -101,10 +126,12 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
           offsets: offsets
         });
         var encodeData = this.layer.getEncodedData();
+
         var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
-          data = _this$calDataFrame.data,
-          width = _this$calDataFrame.width,
-          height = _this$calDataFrame.height;
+            data = _this$calDataFrame.data,
+            width = _this$calDataFrame.width,
+            height = _this$calDataFrame.height;
+
         this.rowCount = height; // 当前数据纹理有多少行
 
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
@@ -123,6 +150,7 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
           height: 1
         });
       }
+
       return {
         u_raisingHeight: Number(raisingHeight),
         u_heightfixed: Number(heightfixed),
@@ -147,20 +175,25 @@ var FillImageModel = /*#__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.iconService.on('imageUpdate', this.updateTexture);
-              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.iconService.on('imageUpdate', this.updateTexture);
+                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;
     }()
   }, {
@@ -169,50 +202,57 @@ var FillImageModel = /*#__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: 'pointFillImage',
-                vertexShader: pointFillVert,
-                fragmentShader: pointFillFrag,
-                triangulation: PointFillTriangulation,
-                depth: {
-                  enable: false
-                },
-                cull: {
-                  enable: true,
-                  face: getCullFace(this.mapService.version)
-                }
-              });
-            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: 'pointFillImage',
+                  vertexShader: pointFillVert,
+                  fragmentShader: pointFillFrag,
+                  triangulation: PointFillTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  cull: {
+                    enable: true,
+                    face: getCullFace(this.mapService.version)
+                  }
+                });
+
+              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 _this$texture, _this$dataTexture;
+
       this.iconService.off('imageUpdate', this.updateTexture);
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    }
+    } // overwrite baseModel func
 
-    // overwrite baseModel func
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       var _this2 = this;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'rotate',
         type: AttributeType.Attribute,
@@ -226,7 +266,7 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$rotate = feature.rotate,
-              rotate = _feature$rotate === void 0 ? 0 : _feature$rotate;
+                rotate = _feature$rotate === void 0 ? 0 : _feature$rotate;
             return Array.isArray(rotate) ? [rotate[0]] : [rotate];
           }
         }
@@ -245,13 +285,16 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
           size: 2,
           update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
+
             var shape = feature.shape;
+
             var _ref2 = iconMap[shape] || {
-                x: -64,
-                y: -64
-              },
-              x = _ref2.x,
-              y = _ref2.y;
+              x: -64,
+              y: -64
+            },
+                x = _ref2.x,
+                y = _ref2.y;
+
             return [x, y];
           }
         }
@@ -274,9 +317,8 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
             return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
           }
         }
-      });
+      }); // point layer size;
 
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: AttributeType.Attribute,
@@ -291,13 +333,15 @@ var FillImageModel = /*#__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];
           }
         }
       });
     }
   }]);
+
   return FillImageModel;
 }(BaseModel);
+
 export { FillImageModel as default };

package/es/point/models/image.js

@@ -7,43 +7,58 @@ 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 { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { PointImageTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
 var pointImageFrag = "\nuniform sampler2D u_texture;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform vec2 u_textSize;\nuniform float u_opacity : 1;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\n\nvoid main(){\n      float opacity = styleMappingMat[0][0];\n      float size = styleMappingMat[1][0];\n      vec2 pos = v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;\n      vec4 textureColor;\n\n      // Y = 0.299R + 0.587G + 0.114B // \u4EAE\u5EA6\u63D0\u53D6\n     \n      textureColor = texture2D(u_texture, pos);\n\n      // Tip: \u53BB\u9664\u8FB9\u7F18\u90E8\u5206 mipmap \u5BFC\u81F4\u7684\u6DF7\u5408\u53D8\u6697\n      float fragmengTocenter = distance(vec2(0.5), gl_PointCoord);\n      if(fragmengTocenter >= 0.5) {\n            float luma = 0.299 * textureColor.r + 0.587 * textureColor.g + 0.114 * textureColor.b;\n            textureColor.a *= luma;\n      }\n      \n      \n\n      if(all(lessThan(v_color, vec4(1.0+0.00001))) && all(greaterThan(v_color, vec4(1.0-0.00001))) || v_color==vec4(1.0)){\n            gl_FragColor= textureColor;\n      }else {\n            gl_FragColor= step(0.01, textureColor.z) * v_color;\n      }\n\n      gl_FragColor.a = gl_FragColor.a * opacity;\n      \n      if (gl_FragColor.a < 0.01) {\n         discard;\n      }\n      gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
 var pointImageVert = "precision highp float;\nattribute vec3 a_Position;\nattribute vec4 a_Color;\nattribute vec2 a_Uv;\nattribute float a_Size;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform vec2 u_offsets;\n\nuniform float u_opacity : 1;\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  styleMappingMat[1][0] = a_Size;\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  v_color = a_Color;\n  v_uv = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   \n  vec2 offset = project_pixel(textrueOffsets);\n\n  float raisingHeight = u_raisingHeight;\n  if(u_heightfixed < 1.0) { // false\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\n     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n  setPickingColor(a_PickingColor);\n}\n";
+
 var ImageModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ImageModel, _BaseModel);
+
   var _super = _createSuper(ImageModel);
+
   function ImageModel() {
     var _this;
+
     _classCallCheck(this, ImageModel);
+
     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(),
           mag: 'linear',
           min: 'linear mipmap nearest',
           mipmap: true
-        });
-        // 更新完纹理后在更新的图层的时候需要更新所有的图层
+        }); // 更新完纹理后在更新的图层的时候需要更新所有的图层
         // this.layer.layerModelNeedUpdate = true;
+
+
         setTimeout(function () {
           // 延迟渲染
           _this.layerService.throttleRenderLayers();
         });
         return;
       }
+
       _this.texture = createTexture2D({
         data: _this.iconService.getCanvas(),
         mag: gl.LINEAR,
@@ -54,23 +69,27 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
         mipmap: true
       });
     });
+
     return _this;
   }
+
   _createClass(ImageModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$offsets = _ref.offsets,
-        offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
-        _ref$raisingHeight = _ref.raisingHeight,
-        raisingHeight = _ref$raisingHeight === void 0 ? 0 : _ref$raisingHeight,
-        _ref$heightfixed = _ref.heightfixed,
-        heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed;
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$offsets = _ref.offsets,
+          offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
+          _ref$raisingHeight = _ref.raisingHeight,
+          raisingHeight = _ref$raisingHeight === void 0 ? 0 : _ref$raisingHeight,
+          _ref$heightfixed = _ref.heightfixed,
+          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed;
+
       if (this.rendererService.getDirty()) {
         this.texture.bind();
       }
+
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
         opacity: opacity,
         offsets: offsets
@@ -80,10 +99,12 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
           offsets: offsets
         });
         var encodeData = this.layer.getEncodedData();
+
         var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
-          data = _this$calDataFrame.data,
-          width = _this$calDataFrame.width,
-          height = _this$calDataFrame.height;
+            data = _this$calDataFrame.data,
+            width = _this$calDataFrame.width,
+            height = _this$calDataFrame.height;
+
         this.rowCount = height; // 当前数据纹理有多少行
 
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
@@ -102,6 +123,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
           height: 1
         });
       }
+
       return {
         u_raisingHeight: Number(raisingHeight),
         u_heightfixed: Number(heightfixed),
@@ -119,26 +141,32 @@ var ImageModel = /*#__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.iconService.on('imageUpdate', this.updateTexture);
-              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.iconService.on('imageUpdate', this.updateTexture);
+                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$dataTexture;
+
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
@@ -149,37 +177,44 @@ var ImageModel = /*#__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: 'pointImage',
-                vertexShader: pointImageVert,
-                fragmentShader: pointImageFrag,
-                triangulation: PointImageTriangulation,
-                depth: {
-                  enable: false
-                },
-                primitive: gl.POINTS
-              });
-            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: 'pointImage',
+                  vertexShader: pointImageVert,
+                  fragmentShader: pointImageFrag,
+                  triangulation: PointImageTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: gl.POINTS
+                });
+
+              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;
+
       // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
@@ -195,13 +230,12 @@ var ImageModel = /*#__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: 'uv',
         type: AttributeType.Attribute,
@@ -216,19 +250,25 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
           size: 2,
           update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
+
             var shape = feature.shape;
+
             var _ref2 = iconMap[shape] || {
-                x: -64,
-                y: -64
-              },
-              x = _ref2.x,
-              y = _ref2.y; // 非画布区域，默认的图标改为透明
+              x: -64,
+              y: -64
+            },
+                x = _ref2.x,
+                y = _ref2.y; // 非画布区域，默认的图标改为透明
+
+
             return [x, y];
           }
         }
       });
     }
   }]);
+
   return ImageModel;
 }(BaseModel);
+
 export { ImageModel as default };

package/es/point/models/index.js

@@ -1,5 +1,5 @@
-import EarthExtrudeModel from "./earthExtrude";
-// earth
+import EarthExtrudeModel from "./earthExtrude"; // earth
+
 import EarthFillModel from "./earthFill";
 import ExtrudeModel from "./extrude";
 import FillModel from "./fill";