@antv/l7-layers 2.7.29 → 2.7.32

package/es/point/models/fillmage.js

@@ -0,0 +1,319 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _isNumber from "lodash/isNumber";
+
+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 { getMask } from '@antv/l7-utils';
+import BaseModel from '../../core/BaseModel';
+import { PointFillTriangulation } from '../../core/triangulation';
+var pointFillFrag = "uniform sampler2D u_texture;\nuniform vec2 u_textSize;\n\nuniform float u_additive;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying float v_radius;\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";
+var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute vec2 a_Uv;\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 float u_isMeter;\n\nvarying float v_radius;\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_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\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  // radius(16-bit)\n  v_radius = a_Size;\n\n  // TODO: billboard\n  // anti-alias\n  \n\n  vec2 offset = (extrude.xy * (a_Size) + textrueOffsets);\n  vec3 aPosition = a_Position;\n  if(u_isMeter < 1.0) {\n    // \u4E0D\u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n    offset = project_pixel(offset);\n  } else {\n    // \u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      aPosition.xy += offset;\n      offset.x = 0.0;\n      offset.y = 0.0;\n    }\n  }\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(project_pos.xy + offset, 0.0, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 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";
+import { Version } from '@antv/l7-maps';
+
+var FillImageModel = 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), "texture", void 0);
+
+    _defineProperty(_assertThisInitialized(_this), "isMeter", false);
+
+    _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.renderLayers();
+
+        return;
+      }
+
+      _this.texture = createTexture2D({
+        data: _this.iconService.getCanvas(),
+        mag: gl.LINEAR,
+        min: gl.LINEAR_MIPMAP_LINEAR,
+        premultiplyAlpha: false,
+        width: 1024,
+        height: _this.iconService.canvasHeight || 128,
+        mipmap: true
+      });
+    });
+
+    return _this;
+  }
+
+  _createClass(FillImageModel, [{
+    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,
+          _ref$offsets = _ref.offsets,
+          offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
+          blend = _ref.blend;
+
+      if (this.rendererService.getDirty()) {
+        this.texture.bind();
+      }
+
+      if (this.dataTextureTest && this.dataTextureNeedUpdate({
+        opacity: opacity,
+        strokeOpacity: strokeOpacity,
+        strokeWidth: strokeWidth,
+        stroke: stroke,
+        offsets: offsets
+      })) {
+        this.judgeStyleAttributes({
+          opacity: opacity,
+          strokeOpacity: strokeOpacity,
+          strokeWidth: strokeWidth,
+          stroke: stroke,
+          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;
+
+        this.rowCount = height;
+        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
+          flipY: true,
+          data: data,
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: width,
+          height: height
+        }) : this.createTexture2D({
+          flipY: true,
+          data: [1],
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: 1,
+          height: 1
+        });
+      }
+
+      return {
+        u_isMeter: Number(this.isMeter),
+        u_additive: blend === 'additive' ? 1.0 : 0.0,
+        u_dataTexture: this.dataTexture,
+        u_cellTypeLayout: this.getCellTypeLayout(),
+        u_texture: this.texture,
+        u_textSize: [1024, this.iconService.canvasHeight || 128],
+        u_opacity: _isNumber(opacity) ? opacity : 1.0,
+        u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0]
+      };
+    }
+  }, {
+    key: "getAttribute",
+    value: function getAttribute() {
+      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), PointFillTriangulation);
+    }
+  }, {
+    key: "initModels",
+    value: function initModels() {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$unit = _ref2.unit,
+          unit = _ref2$unit === void 0 ? 'l7size' : _ref2$unit;
+
+      var version = this.mapService.version;
+
+      if (unit === 'meter' && version !== Version.L7MAP && version !== Version.GLOBEL) {
+        this.isMeter = true;
+        this.calMeter2Coord();
+      }
+
+      return this.buildModels();
+    }
+  }, {
+    key: "calMeter2Coord",
+    value: function calMeter2Coord() {
+      var _this$layer$getSource = _slicedToArray(this.layer.getSource().extent, 4),
+          minLng = _this$layer$getSource[0],
+          minLat = _this$layer$getSource[1],
+          maxLng = _this$layer$getSource[2],
+          maxLat = _this$layer$getSource[3];
+
+      var center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];
+      var version = this.mapService.version;
+
+      if (version === Version.MAPBOX && window.mapboxgl.MercatorCoordinate) {
+        var coord = window.mapboxgl.MercatorCoordinate.fromLngLat({
+          lng: center[0],
+          lat: center[1]
+        }, 0);
+        var offsetInMeters = 1;
+        var offsetInMercatorCoordinateUnits = offsetInMeters * coord.meterInMercatorCoordinateUnits();
+        var westCoord = new window.mapboxgl.MercatorCoordinate(coord.x - offsetInMercatorCoordinateUnits, coord.y, coord.z);
+        var westLnglat = westCoord.toLngLat();
+        this.meter2coord = center[0] - westLnglat.lng;
+        return;
+      }
+
+      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]);
+      var m2 = this.mapService.meterToCoord(center, [maxLng === minLng ? maxLng + 0.1 : maxLng, maxLat === minLat ? minLat + 0.1 : maxLat]);
+      this.meter2coord = (m1 + m2) / 2;
+
+      if (!Boolean(this.meter2coord)) {
+        this.meter2coord = 7.70681090738883;
+      }
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels() {
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$mask = _ref3.mask,
+          mask = _ref3$mask === void 0 ? false : _ref3$mask,
+          _ref3$maskInside = _ref3.maskInside,
+          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside;
+
+      var _this$getShaders = this.getShaders(),
+          frag = _this$getShaders.frag,
+          vert = _this$getShaders.vert,
+          type = _this$getShaders.type;
+
+      return [this.layer.buildLayerModel({
+        moduleName: 'pointfill-' + type,
+        vertexShader: vert,
+        fragmentShader: frag,
+        triangulation: PointFillTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend(),
+        stencil: getMask(mask, maskInside)
+      })];
+    }
+  }, {
+    key: "getShaders",
+    value: function getShaders() {
+      return {
+        frag: pointFillFrag,
+        vert: pointFillVert,
+        type: 'normal'
+      };
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$dataTexture;
+
+      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      var _this2 = this;
+
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'uv',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Uv',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 2,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var iconMap = _this2.iconService.getIconMap();
+
+            var shape = feature.shape;
+
+            var _ref4 = iconMap[shape] || {
+              x: 0,
+              y: 0
+            },
+                x = _ref4.x,
+                y = _ref4.y;
+
+            return [x, y];
+          }
+        }
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'extrude',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Extrude',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
+            var extrudeIndex = attributeIdx % 4 * 3;
+            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
+          }
+        }
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'size',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Size',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 1,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var _feature$size = feature.size,
+                size = _feature$size === void 0 ? 5 : _feature$size;
+            return Array.isArray(size) ? [size[0] * _this2.meter2coord] : [size * _this2.meter2coord];
+          }
+        }
+      });
+    }
+  }]);
+
+  return FillImageModel;
+}(BaseModel);
+
+export { FillImageModel as default };
+//# sourceMappingURL=fillmage.js.map

package/es/point/models/fillmage.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/point/models/fillmage.ts"],"names":["AttributeType","gl","getMask","BaseModel","PointFillTriangulation","Version","FillImageModel","createTexture2D","rendererService","texture","update","data","iconService","getCanvas","mag","min","mipmap","layer","renderLayers","LINEAR","LINEAR_MIPMAP_LINEAR","premultiplyAlpha","width","height","canvasHeight","getLayerConfig","opacity","strokeOpacity","strokeWidth","stroke","offsets","blend","getDirty","bind","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","rowCount","dataTexture","length","flipY","format","LUMINANCE","type","FLOAT","u_isMeter","Number","isMeter","u_additive","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_texture","u_textSize","u_opacity","u_offsets","isOffsetStatic","styleAttributeService","createAttributesAndIndices","updateTexture","on","unit","version","mapService","L7MAP","GLOBEL","calMeter2Coord","buildModels","getSource","extent","minLng","minLat","maxLng","maxLat","center","MAPBOX","window","mapboxgl","MercatorCoordinate","coord","fromLngLat","lng","lat","offsetInMeters","offsetInMercatorCoordinateUnits","meterInMercatorCoordinateUnits","westCoord","x","y","z","westLnglat","toLngLat","meter2coord","m1","meterToCoord","m2","Boolean","mask","maskInside","getShaders","frag","vert","buildLayerModel","moduleName","vertexShader","fragmentShader","triangulation","depth","enable","getBlend","stencil","pointFillFrag","pointFillVert","destroy","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","feature","featureIdx","vertex","attributeIdx","iconMap","getIconMap","shape","extrude","extrudeIndex","Array","isArray"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IAttribute,\n  IElements,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointFillTriangulation } from '../../core/triangulation';\n// static pointLayer shader - not support animate\nimport pointFillFrag from '../shaders/image/fillImage_frag.glsl';\nimport pointFillVert from '../shaders/image/fillImage_vert.glsl';\n\nimport { isNumber } from 'lodash';\n\nimport { Version } from '@antv/l7-maps';\n\nexport default class FillImageModel extends BaseModel {\n  public meter2coord: number = 1;\n  private texture: ITexture2D;\n  private isMeter: boolean = false;\n  public getUninforms(): IModelUniform {\n    const {\n      opacity = 1,\n      strokeOpacity = 1,\n      strokeWidth = 0,\n      stroke = 'rgba(0,0,0,0)',\n      offsets = [0, 0],\n      blend,\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n\n    if (this.rendererService.getDirty()) {\n      this.texture.bind();\n    }\n\n    if (\n      this.dataTextureTest &&\n      this.dataTextureNeedUpdate({\n        opacity,\n        strokeOpacity,\n        strokeWidth,\n        stroke,\n        offsets,\n      })\n    ) {\n      // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量\n      this.judgeStyleAttributes({\n        opacity,\n        strokeOpacity,\n        strokeWidth,\n        stroke,\n        offsets,\n      });\n\n      const encodeData = this.layer.getEncodedData();\n      const { data, width, height } = this.calDataFrame(\n        this.cellLength,\n        encodeData,\n        this.cellProperties,\n      );\n      this.rowCount = height; // 当前数据纹理有多少行\n\n      this.dataTexture =\n        this.cellLength > 0 && data.length > 0\n          ? this.createTexture2D({\n              flipY: true,\n              data,\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width,\n              height,\n            })\n          : this.createTexture2D({\n              flipY: true,\n              data: [1],\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width: 1,\n              height: 1,\n            });\n    }\n    return {\n      u_isMeter: Number(this.isMeter),\n\n      u_additive: blend === 'additive' ? 1.0 : 0.0,\n\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n\n      u_texture: this.texture,\n      u_textSize: [1024, this.iconService.canvasHeight || 128],\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n      u_offsets: this.isOffsetStatic(offsets)\n        ? (offsets as [number, number])\n        : [0, 0],\n    };\n  }\n\n  public getAttribute(): {\n    attributes: {\n      [attributeName: string]: IAttribute;\n    };\n    elements: IElements;\n  } {\n    return this.styleAttributeService.createAttributesAndIndices(\n      this.layer.getEncodedData(),\n      PointFillTriangulation,\n    );\n  }\n\n  public initModels(): IModel[] {\n    this.updateTexture();\n    this.iconService.on('imageUpdate', this.updateTexture);\n\n    const {\n      unit = 'l7size',\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n    const { version } = this.mapService;\n    if (\n      unit === 'meter' &&\n      version !== Version.L7MAP &&\n      version !== Version.GLOBEL\n    ) {\n      this.isMeter = true;\n      this.calMeter2Coord();\n    }\n\n    return this.buildModels();\n  }\n\n  /**\n   * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例\n   * @returns\n   */\n  public calMeter2Coord() {\n    // @ts-ignore\n    const [minLng, minLat, maxLng, maxLat] = this.layer.getSource().extent;\n    const center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];\n\n    const { version } = this.mapService;\n    if (version === Version.MAPBOX && window.mapboxgl.MercatorCoordinate) {\n      const coord = window.mapboxgl.MercatorCoordinate.fromLngLat(\n        { lng: center[0], lat: center[1] },\n        0,\n      );\n      const offsetInMeters = 1;\n      const offsetInMercatorCoordinateUnits =\n        offsetInMeters * coord.meterInMercatorCoordinateUnits();\n      const westCoord = new window.mapboxgl.MercatorCoordinate(\n        coord.x - offsetInMercatorCoordinateUnits,\n        coord.y,\n        coord.z,\n      );\n      const westLnglat = westCoord.toLngLat();\n\n      this.meter2coord = center[0] - westLnglat.lng;\n      return;\n    }\n\n    // @ts-ignore\n    const m1 = this.mapService.meterToCoord(center, [minLng, minLat]);\n    // @ts-ignore\n    const m2 = this.mapService.meterToCoord(center, [\n      maxLng === minLng ? maxLng + 0.1 : maxLng,\n      maxLat === minLat ? minLat + 0.1 : maxLat,\n    ]);\n    this.meter2coord = (m1 + m2) / 2;\n    if (!Boolean(this.meter2coord)) {\n      // Tip: 兼容单个数据导致的 m1、m2 为 NaN\n      this.meter2coord = 7.70681090738883;\n    }\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n    const { frag, vert, type } = this.getShaders();\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'pointfill-' + type,\n        vertexShader: vert,\n        fragmentShader: frag,\n        triangulation: PointFillTriangulation,\n        depth: { enable: false },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public getShaders(): { frag: string; vert: string; type: string } {\n    return {\n      frag: pointFillFrag,\n      vert: pointFillVert,\n      type: 'normal',\n    };\n  }\n\n  public clearModels() {\n    this.dataTexture?.destroy();\n  }\n\n  // overwrite baseModel func\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const iconMap = this.iconService.getIconMap();\n          const { shape } = feature;\n          const { x, y } = iconMap[shape as string] || { x: 0, y: 0 };\n          return [x, y];\n        },\n      },\n    });\n\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'extrude',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Extrude',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];\n\n          const extrudeIndex = (attributeIdx % 4) * 3;\n          return [\n            extrude[extrudeIndex],\n            extrude[extrudeIndex + 1],\n            extrude[extrudeIndex + 2],\n          ];\n        },\n      },\n    });\n\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'size',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Size',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 1,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size = 5 } = feature;\n          // console.log('featureIdx', featureIdx, feature)\n          return Array.isArray(size)\n            ? [size[0] * this.meter2coord]\n            : [(size as number) * this.meter2coord];\n        },\n      },\n    });\n  }\n\n  private updateTexture = () => {\n    const { createTexture2D } = this.rendererService;\n    if (this.texture) {\n      this.texture.update({\n        data: this.iconService.getCanvas(),\n        mag: 'linear',\n        min: 'linear mipmap nearest',\n        mipmap: true,\n      });\n      // this.layer.render();\n      // TODO: 更新完纹理后在更新的图层的时候需要更新所有的图层\n      this.layer.renderLayers();\n      return;\n    }\n    this.texture = createTexture2D({\n      data: this.iconService.getCanvas(),\n      mag: gl.LINEAR,\n      // min: gl.LINEAR,\n      min: gl.LINEAR_MIPMAP_LINEAR,\n      premultiplyAlpha: false,\n      width: 1024,\n      height: this.iconService.canvasHeight || 128,\n      mipmap: true,\n    });\n  };\n}\n"],"file":"fillmage.js"}

package/es/point/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type PointType = 'fill' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'icon';
+export declare type PointType = 'fillImage' | 'fill' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'icon';
 declare const PointModels: {
     [key in PointType]: any;
 };

package/es/point/models/index.js

@@ -1,11 +1,13 @@
 import ExtrudeModel from './extrude';
 import FillModel from './fill';
+import FillImageModel from './fillmage';
 import IconModel from './icon-font';
 import IMageModel from './image';
 import NormalModel from './normal';
 import SimplePopint from './simplePoint';
 import TextModel from './text';
 var PointModels = {
+  fillImage: FillImageModel,
   fill: FillModel,
   image: IMageModel,
   normal: NormalModel,

package/es/point/models/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/point/models/index.ts"],"names":["ExtrudeModel","FillModel","IconModel","IMageModel","NormalModel","SimplePopint","TextModel","PointModels","fill","image","normal","simplePoint","extrude","text","icon"],"mappings":"AAAA,OAAOA,YAAP,MAAyB,WAAzB;AACA,OAAOC,SAAP,MAAsB,QAAtB;AACA,OAAOC,SAAP,MAAsB,aAAtB;AACA,OAAOC,UAAP,MAAuB,SAAvB;AACA,OAAOC,WAAP,MAAwB,UAAxB;AACA,OAAOC,YAAP,MAAyB,eAAzB;AACA,OAAOC,SAAP,MAAsB,QAAtB;AAWA,IAAMC,WAAwC,GAAG;AAC/CC,EAAAA,IAAI,EAAEP,SADyC;AAE/CQ,EAAAA,KAAK,EAAEN,UAFwC;AAG/CO,EAAAA,MAAM,EAAEN,WAHuC;AAI/CO,EAAAA,WAAW,EAAEN,YAJkC;AAK/CO,EAAAA,OAAO,EAAEZ,YALsC;AAM/Ca,EAAAA,IAAI,EAAEP,SANyC;AAO/CQ,EAAAA,IAAI,EAAEZ;AAPyC,CAAjD;AAUA,eAAeK,WAAf","sourcesContent":["import ExtrudeModel from './extrude';\nimport FillModel from './fill';\nimport IconModel from './icon-font';\nimport IMageModel from './image';\nimport NormalModel from './normal';\nimport SimplePopint from './simplePoint';\nimport TextModel from './text';\n\nexport type PointType =\n  | 'fill'\n  | 'image'\n  | 'normal'\n  | 'simplePoint'\n  | 'extrude'\n  | 'text'\n  | 'icon';\n\nconst PointModels: { [key in PointType]: any } = {\n  fill: FillModel,\n  image: IMageModel,\n  normal: NormalModel,\n  simplePoint: SimplePopint,\n  extrude: ExtrudeModel,\n  text: TextModel,\n  icon: IconModel,\n};\n\nexport default PointModels;\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/point/models/index.ts"],"names":["ExtrudeModel","FillModel","FillImageModel","IconModel","IMageModel","NormalModel","SimplePopint","TextModel","PointModels","fillImage","fill","image","normal","simplePoint","extrude","text","icon"],"mappings":"AAAA,OAAOA,YAAP,MAAyB,WAAzB;AACA,OAAOC,SAAP,MAAsB,QAAtB;AACA,OAAOC,cAAP,MAA2B,YAA3B;AACA,OAAOC,SAAP,MAAsB,aAAtB;AACA,OAAOC,UAAP,MAAuB,SAAvB;AACA,OAAOC,WAAP,MAAwB,UAAxB;AACA,OAAOC,YAAP,MAAyB,eAAzB;AACA,OAAOC,SAAP,MAAsB,QAAtB;AAYA,IAAMC,WAAwC,GAAG;AAC/CC,EAAAA,SAAS,EAAEP,cADoC;AAE/CQ,EAAAA,IAAI,EAAET,SAFyC;AAG/CU,EAAAA,KAAK,EAAEP,UAHwC;AAI/CQ,EAAAA,MAAM,EAAEP,WAJuC;AAK/CQ,EAAAA,WAAW,EAAEP,YALkC;AAM/CQ,EAAAA,OAAO,EAAEd,YANsC;AAO/Ce,EAAAA,IAAI,EAAER,SAPyC;AAQ/CS,EAAAA,IAAI,EAAEb;AARyC,CAAjD;AAWA,eAAeK,WAAf","sourcesContent":["import ExtrudeModel from './extrude';\nimport FillModel from './fill';\nimport FillImageModel from './fillmage';\nimport IconModel from './icon-font';\nimport IMageModel from './image';\nimport NormalModel from './normal';\nimport SimplePopint from './simplePoint';\nimport TextModel from './text';\n\nexport type PointType =\n  | 'fillImage'\n  | 'fill'\n  | 'image'\n  | 'normal'\n  | 'simplePoint'\n  | 'extrude'\n  | 'text'\n  | 'icon';\n\nconst PointModels: { [key in PointType]: any } = {\n  fillImage: FillImageModel,\n  fill: FillModel,\n  image: IMageModel,\n  normal: NormalModel,\n  simplePoint: SimplePopint,\n  extrude: ExtrudeModel,\n  text: TextModel,\n  icon: IconModel,\n};\n\nexport default PointModels;\n"],"file":"index.js"}

package/lib/core/BaseLayer.js

@@ -241,6 +241,17 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.interactionService = this.container.get(_l7Core.TYPES.IInteractionService);
       this.pickingService = this.container.get(_l7Core.TYPES.IPickingService);
       this.mapService = this.container.get(_l7Core.TYPES.IMapService);
+
+      var _this$getLayerConfig2 = this.getLayerConfig(),
+          enableMultiPassRenderer = _this$getLayerConfig2.enableMultiPassRenderer,
+          passes = _this$getLayerConfig2.passes;
+
+      if (enableMultiPassRenderer && passes !== null && passes !== void 0 && passes.length && passes.length > 0) {
+        this.mapService.on('mapAfterFrameChange', function () {
+          _this2.renderLayers();
+        });
+      }
+
       this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
       this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
       this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
@@ -302,8 +313,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.inited = true;
       this.updateLayerConfig(_objectSpread(_objectSpread({}, this.getDefaultConfig()), this.rawConfig));
 
-      var _this$getLayerConfig2 = this.getLayerConfig(),
-          animateOption = _this$getLayerConfig2.animateOption;
+      var _this$getLayerConfig3 = this.getLayerConfig(),
+          animateOption = _this$getLayerConfig3.animateOption;
 
       if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
         this.layerService.startAnimate();
@@ -682,12 +693,12 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function isVisible() {
       var zoom = this.mapService.getZoom();
 
-      var _this$getLayerConfig3 = this.getLayerConfig(),
-          visible = _this$getLayerConfig3.visible,
-          _this$getLayerConfig4 = _this$getLayerConfig3.minZoom,
-          minZoom = _this$getLayerConfig4 === void 0 ? -Infinity : _this$getLayerConfig4,
-          _this$getLayerConfig5 = _this$getLayerConfig3.maxZoom,
-          maxZoom = _this$getLayerConfig5 === void 0 ? Infinity : _this$getLayerConfig5;
+      var _this$getLayerConfig4 = this.getLayerConfig(),
+          visible = _this$getLayerConfig4.visible,
+          _this$getLayerConfig5 = _this$getLayerConfig4.minZoom,
+          minZoom = _this$getLayerConfig5 === void 0 ? -Infinity : _this$getLayerConfig5,
+          _this$getLayerConfig6 = _this$getLayerConfig4.maxZoom,
+          maxZoom = _this$getLayerConfig6 === void 0 ? Infinity : _this$getLayerConfig6;
 
       return !!visible && zoom >= minZoom && zoom <= maxZoom;
     }
@@ -702,16 +713,16 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "getMinZoom",
     value: function getMinZoom() {
-      var _this$getLayerConfig6 = this.getLayerConfig(),
-          minZoom = _this$getLayerConfig6.minZoom;
+      var _this$getLayerConfig7 = this.getLayerConfig(),
+          minZoom = _this$getLayerConfig7.minZoom;
 
       return minZoom;
     }
   }, {
     key: "getMaxZoom",
     value: function getMaxZoom() {
-      var _this$getLayerConfig7 = this.getLayerConfig(),
-          maxZoom = _this$getLayerConfig7.maxZoom;
+      var _this$getLayerConfig8 = this.getLayerConfig(),
+          maxZoom = _this$getLayerConfig8.maxZoom;
 
       return maxZoom;
     }
@@ -957,11 +968,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "needPick",
     value: function needPick(type) {
-      var _this$getLayerConfig8 = this.getLayerConfig(),
-          _this$getLayerConfig9 = _this$getLayerConfig8.enableHighlight,
-          enableHighlight = _this$getLayerConfig9 === void 0 ? true : _this$getLayerConfig9,
-          _this$getLayerConfig10 = _this$getLayerConfig8.enableSelect,
-          enableSelect = _this$getLayerConfig10 === void 0 ? true : _this$getLayerConfig10;
+      var _this$getLayerConfig9 = this.getLayerConfig(),
+          _this$getLayerConfig10 = _this$getLayerConfig9.enableHighlight,
+          enableHighlight = _this$getLayerConfig10 === void 0 ? true : _this$getLayerConfig10,
+          _this$getLayerConfig11 = _this$getLayerConfig9.enableSelect,
+          enableSelect = _this$getLayerConfig11 === void 0 ? true : _this$getLayerConfig11;
 
       var isPick = this.eventNames().indexOf(type) !== -1 || this.eventNames().indexOf('un' + type) !== -1;