@antv/l7-layers 2.9.32-alpha.1 → 2.9.32-alpha.3

package/es/point/models/fillmage.js

@@ -1,366 +0,0 @@
-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";
-
-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 { Version } from '@antv/l7-maps';
-import { getCullFace, getMask } from '@antv/l7-utils';
-import { isNumber } from 'lodash';
-import BaseModel from "../../core/BaseModel";
-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 float u_isMeter;\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\n  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);\n  vec2 offset = (rotation_matrix * u_RotateMatrix * 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  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,
-        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$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;
-
-      if (this.rendererService.getDirty()) {
-        this.texture.bind();
-      }
-      /**
-       *               rotateFlag
-       * L7MAP            1
-       * MAPBOX           1
-       * GAODE2.x         -1
-       * GAODE1.x         -1
-       */
-
-
-      var rotateFlag = 1;
-
-      if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
-        rotateFlag = -1;
-      } // 控制图标的旋转角度（绕 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
-      })) {
-        // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
-        this.judgeStyleAttributes({
-          opacity: opacity,
-          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_raisingHeight: Number(raisingHeight),
-        u_heightfixed: Number(heightfixed),
-        u_isMeter: Number(this.isMeter),
-        u_RotateMatrix: new Float32Array([Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        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(callbackModel) {
-      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();
-      }
-
-      this.buildModels(callbackModel);
-    }
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-
-  }, {
-    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;
-      } // @ts-ignore
-
-
-      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]); // @ts-ignore
-
-      var m2 = this.mapService.meterToCoord(center, [maxLng === minLng ? maxLng + 0.1 : maxLng, maxLat === minLat ? minLat + 0.1 : maxLat]);
-      this.meter2coord = (m1 + m2) / 2;
-
-      if (!this.meter2coord) {
-        // Tip: 兼容单个数据导致的 m1、m2 为 NaN
-        this.meter2coord = 7.70681090738883;
-      }
-    }
-  }, {
-    key: "buildModels",
-    value: function buildModels(callbackModel) {
-      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;
-
-      this.layer.buildLayerModel({
-        moduleName: 'pointFillImage',
-        vertexShader: pointFillVert,
-        fragmentShader: pointFillFrag,
-        triangulation: PointFillTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        cull: {
-          enable: true,
-          face: getCullFace(this.mapService.version)
-        }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    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
-
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this2 = this;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'rotate',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Rotate',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$rotate = feature.rotate,
-                rotate = _feature$rotate === void 0 ? 0 : _feature$rotate;
-            return Array.isArray(rotate) ? [rotate[0]] : [rotate];
-          }
-        }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature) {
-            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: {
-            // give the WebGL driver a hint that this buffer may change
-            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]];
-          }
-        }
-      }); // point layer size;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            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 };

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

@@ -1,11 +0,0 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class ImageModel extends BaseModel {
-    private texture;
-    getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    protected registerBuiltinAttributes(): void;
-    private updateTexture;
-}

package/es/point/models/image.js

@@ -1,239 +0,0 @@
-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";
-
-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 { 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      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.layerService.throttleRenderLayers();
-
-        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(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;
-
-      if (this.rendererService.getDirty()) {
-        this.texture.bind();
-      }
-
-      if (this.dataTextureTest && this.dataTextureNeedUpdate({
-        opacity: opacity,
-        offsets: offsets
-      })) {
-        this.judgeStyleAttributes({
-          opacity: opacity,
-          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_raisingHeight: Number(raisingHeight),
-        u_heightfixed: Number(heightfixed),
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        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: "initModels",
-    value: function initModels(callbackModel) {
-      this.registerBuiltinAttributes();
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
-  }, {
-    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);
-    }
-  }, {
-    key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      this.layer.buildLayerModel({
-        moduleName: 'pointImage',
-        vertexShader: pointImageVert,
-        fragmentShader: pointImageFrag,
-        triangulation: PointImageTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: gl.POINTS,
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this2 = this;
-
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 5 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
-        }
-      }); // point layer size;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            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 _ref3 = iconMap[shape] || {
-              x: 0,
-              y: 0
-            },
-                x = _ref3.x,
-                y = _ref3.y;
-
-            return [x, y];
-          }
-        }
-      });
-    }
-  }]);
-
-  return ImageModel;
-}(BaseModel);
-
-export { ImageModel as default };

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

@@ -1,5 +0,0 @@
-export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'vectorPoint' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
-declare const PointModels: {
-    [key in PointType]: any;
-};
-export default PointModels;

package/es/point/models/index.js

@@ -1,30 +0,0 @@
-import PointTileModel from "../../tile/models/tileModel";
-import EarthExtrudeModel from "./earthExtrude"; // earth
-
-import EarthFillModel from "./earthFill";
-import ExtrudeModel from "./extrude";
-import FillModel from "./fill";
-import FillImageModel from "./fillmage";
-import IMageModel from "./image";
-import NormalModel from "./normal";
-import Radar from "./radar";
-import SimplePoint from "./simplePoint";
-import TextModel from "./text";
-import TileTextModel from "./tileText";
-import TileFillModel from "./tile";
-var PointModels = {
-  fillImage: FillImageModel,
-  fill: FillModel,
-  radar: Radar,
-  image: IMageModel,
-  normal: NormalModel,
-  simplePoint: SimplePoint,
-  extrude: ExtrudeModel,
-  text: TextModel,
-  vectorPoint: PointTileModel,
-  tile: TileFillModel,
-  tileText: TileTextModel,
-  earthFill: EarthFillModel,
-  earthExtrude: EarthExtrudeModel
-};
-export default PointModels;