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

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

@@ -1,16 +0,0 @@
-import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-import { IPointLayerStyleOptions } from '../../core/interface';
-export declare function PointTriangulation(feature: IEncodeFeature): {
-    vertices: number[];
-    indices: number[];
-    size: number;
-};
-export default class NormalModel extends BaseModel {
-    getDefaultStyle(): Partial<IPointLayerStyleOptions>;
-    getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-}

package/es/point/models/normal.js

@@ -1,124 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-
-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";
-
-/* babel-plugin-inline-import '../shaders/normal_frag.glsl' */
-var normalFrag = "uniform float u_opacity : 1;\nvarying vec4 v_color;\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
-
-/* babel-plugin-inline-import '../shaders/normal_vert.glsl' */
-var normalVert = "\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute float a_Size;\nattribute vec4 a_Color;\n\nvarying vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_color = a_Color;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);\n    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy),project_pos.z,project_pos.w));\n  }\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n}\n";
-export function PointTriangulation(feature) {
-  var coordinates = feature.coordinates;
-  return {
-    vertices: _toConsumableArray(coordinates),
-    indices: [0],
-    size: coordinates.length
-  };
-}
-
-var NormalModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(NormalModel, _BaseModel);
-
-  var _super = _createSuper(NormalModel);
-
-  function NormalModel() {
-    _classCallCheck(this, NormalModel);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(NormalModel, [{
-    key: "getDefaultStyle",
-    value: function getDefaultStyle() {
-      return {
-        blend: 'additive'
-      };
-    }
-  }, {
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
-
-      return {
-        u_opacity: isNumber(opacity) ? opacity : 1.0
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    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.triangulation = PointTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'pointNormal',
-        vertexShader: normalVert,
-        fragmentShader: normalFrag,
-        triangulation: PointTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: gl.POINTS,
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        pick: false
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "clearModels",
-    value: function clearModels() {}
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      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) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 1 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
-        }
-      });
-    }
-  }]);
-
-  return NormalModel;
-}(BaseModel);
-
-export { NormalModel as default };

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

@@ -1,24 +0,0 @@
-import { IAnimateOption, IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class RadarModel extends BaseModel {
-    meter2coord: number;
-    private isMeter;
-    getUninforms(): IModelUniform;
-    getAnimateUniforms(): IModelUniform;
-    getAttribute(): {
-        attributes: {
-            [attributeName: string]: IAttribute;
-        };
-        elements: IElements;
-    };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-    calMeter2Coord(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    clearModels(): void;
-    protected animateOption2Array(option: Partial<IAnimateOption>): number[];
-    protected registerBuiltinAttributes(): void;
-}

package/es/point/models/radar.js

@@ -1,232 +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 { getMask } from '@antv/l7-utils';
-import { isNumber } from 'lodash';
-import BaseModel from "../../core/BaseModel";
-import { PointFillTriangulation } from "../../core/triangulation";
-
-/* babel-plugin-inline-import '../shaders/radar/radar_frag.glsl' */
-var pointFillFrag = "\nuniform float u_additive;\nuniform float u_opacity: 1.0;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec2 v_exteude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius);\n\n  float outer_df = sdCircle(v_data.xy, 1.0);\n  float inner_df = sdCircle(v_data.xy, r);\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n  } else {\n    gl_FragColor.a *= opacity_t;\n  }\n\n  if(gl_FragColor.a > 0.0) {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n\n  vec2 extrude =  v_exteude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\n  // full circle\n  // float rades = dot(dir, baseDir);\n  // float flag = sign(dir.y);\n  // float radar_v = (flag - 1.0) * -0.5 + flag * acos(rades)/pi/2.0;\n  \n  // half circle\n  float flag = sign(dir.y);\n  float rades = dot(dir, baseDir);\n  float radar_v = (flag - 1.0) * -0.5 * acos(rades)/pi;\n  // simple AA\n  if(radar_v > 0.99) {\n    radar_v = 1.0 - (radar_v - 0.99)/0.01;\n  }\n\n  gl_FragColor.a *= radar_v;\n}\n";
-
-/* babel-plugin-inline-import '../shaders/radar/radar_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nuniform float u_speed: 1.0;\nuniform float u_time;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_isMeter;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec2 v_exteude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float newSize = setPickingSize(a_Size);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2( \n    cos(time), sin(time), \n    -sin(time), cos(time)\n  );\n  v_exteude = rotateMatrix * a_Extrude.xy;\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  vec2 offset = (extrude.xy * (newSize));\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    antialiasblur *= pow(19.0 - u_Zoom, 2.0);\n    antialiasblur = max(antialiasblur, -0.01);\n    // offset *= 0.5;\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  v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 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  setPickingColor(a_PickingColor);\n}\n";
-import { Version } from '@antv/l7-maps';
-
-var RadarModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(RadarModel, _BaseModel);
-
-  var _super = _createSuper(RadarModel);
-
-  function RadarModel() {
-    var _this;
-
-    _classCallCheck(this, RadarModel);
-
-    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);
-
-    return _this;
-  }
-
-  _createClass(RadarModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          blend = _ref.blend,
-          _ref$speed = _ref.speed,
-          speed = _ref$speed === void 0 ? 1 : _ref$speed;
-
-      return {
-        u_isMeter: Number(this.isMeter),
-        u_speed: speed,
-        u_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_opacity: isNumber(opacity) ? opacity : 1.0
-      };
-    }
-  }, {
-    key: "getAnimateUniforms",
-    value: function getAnimateUniforms() {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$animateOption = _ref2.animateOption,
-          animateOption = _ref2$animateOption === void 0 ? {
-        enable: false
-      } : _ref2$animateOption;
-
-      return {
-        u_animate: this.animateOption2Array(animateOption),
-        u_time: this.layer.getLayerAnimateTime()
-      };
-    }
-  }, {
-    key: "getAttribute",
-    value: function getAttribute() {
-      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), PointFillTriangulation);
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$unit = _ref3.unit,
-          unit = _ref3$unit === void 0 ? 'l7size' : _ref3$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 _ref4 = this.layer.getLayerConfig(),
-          _ref4$mask = _ref4.mask,
-          mask = _ref4$mask === void 0 ? false : _ref4$mask,
-          _ref4$maskInside = _ref4.maskInside,
-          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
-
-      this.layer.buildLayerModel({
-        moduleName: 'pointRadar',
-        vertexShader: pointFillVert,
-        fragmentShader: pointFillFrag,
-        triangulation: PointFillTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    } // overwrite baseModel func
-
-  }, {
-    key: "animateOption2Array",
-    value: function animateOption2Array(option) {
-      return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this2 = this;
-
-      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 RadarModel;
-}(BaseModel);
-
-export { RadarModel as default };

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

@@ -1,16 +0,0 @@
-import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-import { IPointLayerStyleOptions } from '../../core/interface';
-export declare function PointTriangulation(feature: IEncodeFeature): {
-    vertices: number[];
-    indices: number[];
-    size: number;
-};
-export default class SimplePointModel extends BaseModel {
-    getDefaultStyle(): Partial<IPointLayerStyleOptions>;
-    getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-}

package/es/point/models/simplePoint.js

@@ -1,179 +0,0 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-
-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";
-
-/* babel-plugin-inline-import '../shaders/simplePoint_frag.glsl' */
-var simplePointFrag = "\nuniform float u_opacity : 1;\nuniform vec2 u_offsets;\nuniform float u_additive;\n\nuniform float u_stroke_opacity : 1;\n\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\nvarying vec4 v_color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\nvarying float v_blur;\nvarying float v_innerRadius;\n\n#pragma include \"picking\"\nvoid main() {\n  vec2 center = vec2(0.5);\n\n  float opacity = styleMappingMat[0][0];\n  // Tip: \u7247\u5143\u5230\u4E2D\u5FC3\u70B9\u7684\u8DDD\u79BB 0 - 1\n  float fragmengTocenter = distance(center, gl_PointCoord) * 2.0;\n  // Tip: \u7247\u5143\u7684\u526A\u5207\u6210\u5706\u5F62\n  float circleClipOpacity = 1.0 - smoothstep(v_blur, 1.0, fragmengTocenter);\n\n\n  if(v_innerRadius < 0.99) {\n    // \u5F53\u5B58\u5728 stroke \u4E14 stroke > 0.01\n    float blurWidth = (1.0 - v_blur)/2.0;\n    vec4 stroke = vec4(u_stroke_color.rgb, u_stroke_opacity);\n    if(fragmengTocenter > v_innerRadius + blurWidth) {\n      gl_FragColor = stroke;\n    } else if(fragmengTocenter > v_innerRadius - blurWidth){\n      float mixR = (fragmengTocenter - (v_innerRadius - blurWidth)) / (blurWidth * 2.0);\n      gl_FragColor = mix(v_color, stroke, mixR);\n    } else {\n      gl_FragColor = v_color;\n    }\n  } else {\n    // \u5F53\u4E0D\u5B58\u5728 stroke \u6216 stroke <= 0.01\n    gl_FragColor = v_color;\n  }\n\n  gl_FragColor.a *= opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n  \n  if(u_additive > 0.0) {\n    gl_FragColor *= circleClipOpacity;\n  } else {\n    gl_FragColor.a *= circleClipOpacity;\n  }\n\n}\n";
-
-/* babel-plugin-inline-import '../shaders/simplePoint_vert.glsl' */
-var simplePointVert = "\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute float a_Size;\nattribute vec4 a_Color;\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform vec2 u_offsets;\nuniform float u_stroke_width;\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\nvarying float v_blur;\nvarying float v_innerRadius;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"project\"\nvoid main() {\n  v_color = a_Color;\n  v_blur = 1.0 - max(2.0/a_Size, 0.05);\n  v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = 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  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  vec2 offset = project_pixel(textrueOffsets);\n  \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position.xy + offset, a_Position.z, 1.0);\n  } else { // else\n    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);\n    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));\n  }\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n  setPickingColor(a_PickingColor);\n}\n";
-export function PointTriangulation(feature) {
-  var coordinates = feature.coordinates;
-  return {
-    vertices: _toConsumableArray(coordinates),
-    indices: [0],
-    size: coordinates.length
-  };
-}
-
-var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(SimplePointModel, _BaseModel);
-
-  var _super = _createSuper(SimplePointModel);
-
-  function SimplePointModel() {
-    _classCallCheck(this, SimplePointModel);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(SimplePointModel, [{
-    key: "getDefaultStyle",
-    value: function getDefaultStyle() {
-      return {
-        blend: 'additive'
-      };
-    }
-  }, {
-    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,
-          blend = _ref.blend,
-          _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 ? '#fff' : _ref$stroke;
-
-      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_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        u_cellTypeLayout: this.getCellTypeLayout(),
-        u_opacity: isNumber(opacity) ? opacity : 1.0,
-        u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0],
-        u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,
-        u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,
-        u_stroke_color: this.getStrokeColor(stroke)
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    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.triangulation = PointTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'pointSimple',
-        vertexShader: simplePointVert,
-        fragmentShader: simplePointFrag,
-        triangulation: PointTriangulation,
-        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: "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() {
-      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) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 1 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
-        }
-      });
-    }
-  }]);
-
-  return SimplePointModel;
-}(BaseModel);
-
-export { SimplePointModel as default };

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

@@ -1,57 +0,0 @@
-import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-import { IGlyphQuad } from '../../utils/symbol-layout';
-export declare function TextTriangulation(feature: IEncodeFeature): {
-    vertices: number[];
-    indices: number[];
-    size: number;
-};
-export default class TextModel extends BaseModel {
-    glyphInfo: IEncodeFeature[];
-    glyphInfoMap: {
-        [key: string]: {
-            shaping: any;
-            glyphQuads: IGlyphQuad[];
-            centroid: number[];
-        };
-    };
-    private texture;
-    private currentZoom;
-    private extent;
-    private textureHeight;
-    private textCount;
-    private preTextStyle;
-    getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels: (callbackModel: (models: IModel[]) => void) => Promise<void>;
-    needUpdate(): boolean;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-    private mapping;
-    private textExtent;
-    /**
-     * 生成文字纹理（生成文字纹理字典）
-     */
-    private initTextFont;
-    /**
-     * 生成 iconfont 纹理字典
-     */
-    private initIconFontTex;
-    /**
-     * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
-     */
-    private generateGlyphLayout;
-    /**
-     * 文字避让 depend on originCentorid
-     */
-    private filterGlyphs;
-    /**
-     * 初始化文字布局
-     */
-    private initGlyph;
-    /**
-     * 更新文字纹理
-     */
-    private updateTexture;
-    private reBuildModel;
-}