@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.3

package/es/point/models/tileText.js

@@ -21,17 +21,23 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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 { calculateCentroid, getMask, padBounds } from '@antv/l7-utils';
+import { calculateCentroid, padBounds, rgb2arr } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import CollisionIndex from "../../utils/collision-index";
 import { getGlyphQuads, shapeText } from "../../utils/symbol-layout";
 
-/* babel-plugin-inline-import '../shaders/text_frag.glsl' */
-var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n// uniform float u_font_size : 24.0;\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n  float opacity = styleMappingMat[0][0];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  // float fontScale = u_font_size / FONT_SIZE;\n\n  // lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  lowp float buff = (6.0 - strokeWidth / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n  // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/tile/text_frag.glsl' */
+var text_frag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n// uniform float u_font_size : 24.0;\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\n#pragma include \"picking\"\nvoid main() {\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n  \n  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 
-/* babel-plugin-inline-import '../shaders/text_vert.glsl' */
-var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\nattribute float a_Rotate;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\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 float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\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   vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\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  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\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    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp * (vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+/* babel-plugin-inline-import '../shaders/tile/text_vert.glsl' */
+var text_vert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  vec4 projected_position;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp * (vec4(a_Position.xyz, 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+
+/* babel-plugin-inline-import '../shaders/tile/text_map_frag.glsl' */
+var text_map_frag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\nuniform vec4 u_color;\n\nvoid main() {\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n  \n  gl_FragColor = mix(vec4(u_color.rgb, u_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n}\n";
+
+/* babel-plugin-inline-import '../shaders/tile/text_map_vert.glsl' */
+var text_map_vert = "#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_size;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_uv = a_tex / u_sdf_map_size;\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = u_size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  vec4 projected_position;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp * (vec4(a_Position.xyz, 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n\n}\n";
 export function TextTriangulation(feature) {
   // @ts-ignore
   var that = this;
@@ -91,26 +97,26 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
     _defineProperty(_assertThisInitialized(_this), "buildModels", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside;
+        var _this$layer$getLayerC, usage;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _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.mapping();
 
+                _this$layer$getLayerC = _this.layer.getLayerConfig(), usage = _this$layer$getLayerC.usage;
+
                 _this.layer.buildLayerModel({
-                  moduleName: 'pointText',
-                  vertexShader: textVert,
-                  fragmentShader: textFrag,
+                  moduleName: 'pointTileText_' + usage,
+                  vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
+                  fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
                   triangulation: TextTriangulation.bind(_assertThisInitialized(_this)),
                   depth: {
                     enable: false
                   },
                   blend: _this.getBlend(),
-                  stencil: getMask(mask, maskInside)
+                  pick: usage !== 'basemap'
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {
@@ -147,23 +153,26 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(TextModel, [{
     key: "getUninforms",
     value: function getUninforms() {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$opacity = _ref3.opacity,
-          opacity = _ref3$opacity === void 0 ? 1.0 : _ref3$opacity,
-          _ref3$stroke = _ref3.stroke,
-          stroke = _ref3$stroke === void 0 ? '#fff' : _ref3$stroke,
-          _ref3$strokeWidth = _ref3.strokeWidth,
-          strokeWidth = _ref3$strokeWidth === void 0 ? 0 : _ref3$strokeWidth,
-          _ref3$textAnchor = _ref3.textAnchor,
-          textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor,
-          _ref3$textAllowOverla = _ref3.textAllowOverlap,
-          textAllowOverlap = _ref3$textAllowOverla === void 0 ? false : _ref3$textAllowOverla,
-          _ref3$halo = _ref3.halo,
-          halo = _ref3$halo === void 0 ? 0.5 : _ref3$halo,
-          _ref3$gamma = _ref3.gamma,
-          gamma = _ref3$gamma === void 0 ? 2.0 : _ref3$gamma,
-          _ref3$raisingHeight = _ref3.raisingHeight,
-          raisingHeight = _ref3$raisingHeight === void 0 ? 0 : _ref3$raisingHeight;
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$opacity = _ref2.opacity,
+          opacity = _ref2$opacity === void 0 ? 1.0 : _ref2$opacity,
+          _ref2$stroke = _ref2.stroke,
+          stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
+          _ref2$strokeWidth = _ref2.strokeWidth,
+          strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
+          _ref2$textAnchor = _ref2.textAnchor,
+          textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor,
+          _ref2$textAllowOverla = _ref2.textAllowOverlap,
+          textAllowOverlap = _ref2$textAllowOverla === void 0 ? false : _ref2$textAllowOverla,
+          _ref2$halo = _ref2.halo,
+          halo = _ref2$halo === void 0 ? 0.5 : _ref2$halo,
+          _ref2$gamma = _ref2.gamma,
+          gamma = _ref2$gamma === void 0 ? 2.0 : _ref2$gamma,
+          usage = _ref2.usage,
+          _ref2$color = _ref2.color,
+          color = _ref2$color === void 0 ? '#fff' : _ref2$color,
+          _ref2$size = _ref2.size,
+          size = _ref2$size === void 0 ? 1 : _ref2$size;
 
       var _this$fontService = this.fontService,
           canvas = _this$fontService.canvas,
@@ -178,68 +187,28 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         textAnchor: textAnchor,
         textAllowOverlap: textAllowOverlap
       };
-
-      if (this.dataTextureTest && this.dataTextureNeedUpdate({
-        opacity: opacity,
-        strokeWidth: strokeWidth,
-        stroke: stroke
-      })) {
-        this.judgeStyleAttributes({
-          opacity: opacity,
-          strokeWidth: strokeWidth,
-          stroke: stroke
-        });
-        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_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        u_cellTypeLayout: this.getCellTypeLayout(),
-        u_raisingHeight: Number(raisingHeight),
         u_opacity: isNumber(opacity) ? opacity : 1.0,
         u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,
         u_stroke_color: this.getStrokeColor(stroke),
         u_sdf_map: this.texture,
         u_halo_blur: halo,
         u_gamma_scale: gamma,
-        u_sdf_map_size: [canvas.width, canvas.height]
+        u_sdf_map_size: [canvas.width, canvas.height],
+        u_color: usage === 'basemap' ? rgb2arr(color) : [0, 0, 0, 0],
+        u_size: usage === 'basemap' ? size : 1
       };
     }
   }, {
     key: "initModels",
     value: function initModels(callbackModel) {
-      this.layer.on('remapping', this.mapping);
       this.extent = this.textExtent();
 
-      var _ref4 = this.layer.getLayerConfig(),
-          _ref4$textAnchor = _ref4.textAnchor,
-          textAnchor = _ref4$textAnchor === void 0 ? 'center' : _ref4$textAnchor,
-          _ref4$textAllowOverla = _ref4.textAllowOverlap,
-          textAllowOverlap = _ref4$textAllowOverla === void 0 ? true : _ref4$textAllowOverla;
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$textAnchor = _ref3.textAnchor,
+          textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor,
+          _ref3$textAllowOverla = _ref3.textAllowOverlap,
+          textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla;
 
       this.preTextStyle = {
         textAnchor: textAnchor,
@@ -250,40 +219,22 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "clearModels",
     value: function clearModels() {
-      var _this$texture, _this$dataTexture;
+      var _this$texture;
 
       (_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.layer.off('remapping', this.mapping);
     }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      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, featureIdx, vertex, attributeIdx) {
-            var _feature$rotate = feature.rotate,
-                rotate = _feature$rotate === void 0 ? 0 : _feature$rotate;
-            return Array.isArray(rotate) ? [rotate[0]] : [rotate];
-          }
-        }
-      });
+      var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
+          usage = _this$layer$getLayerC2.usage;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'textOffsets',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_textOffsets',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -293,27 +244,29 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
             return [vertex[5], vertex[6]];
           }
         }
-      }); // 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, featureIdx, vertex, attributeIdx) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 12 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
+      if (usage !== 'basemap') {
+        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, featureIdx, vertex, attributeIdx) {
+              var _feature$size = feature.size,
+                  size = _feature$size === void 0 ? 12 : _feature$size;
+              return Array.isArray(size) ? [size[0]] : [size];
+            }
           }
-        }
-      }); // point layer size;
+        });
+      }
 
       this.styleAttributeService.registerStyleAttribute({
         name: 'textUv',
@@ -346,11 +299,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initTextFont",
     value: function initTextFont() {
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$fontWeight = _ref5.fontWeight,
-          fontWeight = _ref5$fontWeight === void 0 ? '400' : _ref5$fontWeight,
-          _ref5$fontFamily = _ref5.fontFamily,
-          fontFamily = _ref5$fontFamily === void 0 ? 'sans-serif' : _ref5$fontFamily;
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$fontWeight = _ref4.fontWeight,
+          fontWeight = _ref4$fontWeight === void 0 ? '400' : _ref4$fontWeight,
+          _ref4$fontFamily = _ref4.fontFamily,
+          fontFamily = _ref4$fontFamily === void 0 ? 'sans-serif' : _ref4$fontFamily;
 
       var data = this.layer.getEncodedData();
       var characterSet = [];
@@ -384,54 +337,22 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         iconfont: false
       });
     }
-    /**
-     * 生成 iconfont 纹理字典
-     */
-
-  }, {
-    key: "initIconFontTex",
-    value: function initIconFontTex() {
-      var _ref6 = this.layer.getLayerConfig(),
-          _ref6$fontWeight = _ref6.fontWeight,
-          fontWeight = _ref6$fontWeight === void 0 ? '400' : _ref6$fontWeight,
-          _ref6$fontFamily = _ref6.fontFamily,
-          fontFamily = _ref6$fontFamily === void 0 ? 'sans-serif' : _ref6$fontFamily;
-
-      var data = this.layer.getEncodedData();
-      var characterSet = [];
-      data.forEach(function (item) {
-        var _item$shape2 = item.shape,
-            shape = _item$shape2 === void 0 ? '' : _item$shape2;
-        shape = "".concat(shape);
-
-        if (characterSet.indexOf(shape) === -1) {
-          characterSet.push(shape);
-        }
-      });
-      this.fontService.setFontOptions({
-        characterSet: characterSet,
-        fontWeight: fontWeight,
-        fontFamily: fontFamily,
-        iconfont: true
-      });
-    }
     /**
      * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
      */
 
   }, {
     key: "generateGlyphLayout",
-    value: function generateGlyphLayout(iconfont) {
+    value: function generateGlyphLayout() {
       var _this2 = this;
 
-      // TODO:更新文字布局
       var mapping = this.fontService.mapping;
 
-      var _ref7 = this.layer.getLayerConfig(),
-          _ref7$spacing = _ref7.spacing,
-          spacing = _ref7$spacing === void 0 ? 2 : _ref7$spacing,
-          _ref7$textAnchor = _ref7.textAnchor,
-          textAnchor = _ref7$textAnchor === void 0 ? 'center' : _ref7$textAnchor;
+      var _ref5 = this.layer.getLayerConfig(),
+          _ref5$spacing = _ref5.spacing,
+          spacing = _ref5$spacing === void 0 ? 2 : _ref5$spacing,
+          _ref5$textAnchor = _ref5.textAnchor,
+          textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor;
 
       var data = this.layer.getEncodedData();
       this.glyphInfo = data.map(function (feature) {
@@ -443,7 +364,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
             _feature$textOffset = feature.textOffset,
             textOffset = _feature$textOffset === void 0 ? [0, 0] : _feature$textOffset;
         var shaping = shapeText(shape.toString(), mapping, // @ts-ignore
-        size, textAnchor, 'left', spacing, textOffset, iconfont);
+        size, textAnchor, 'left', spacing, textOffset, false);
         var glyphQuads = getGlyphQuads(shaping, textOffset, false);
         feature.shaping = shaping;
         feature.glyphQuads = glyphQuads;
@@ -467,11 +388,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function filterGlyphs() {
       var _this3 = this;
 
-      var _ref8 = this.layer.getLayerConfig(),
-          _ref8$padding = _ref8.padding,
-          padding = _ref8$padding === void 0 ? [4, 4] : _ref8$padding,
-          _ref8$textAllowOverla = _ref8.textAllowOverlap,
-          textAllowOverlap = _ref8$textAllowOverla === void 0 ? false : _ref8$textAllowOverla;
+      var _ref6 = this.layer.getLayerConfig(),
+          _ref6$padding = _ref6.padding,
+          padding = _ref6$padding === void 0 ? [4, 4] : _ref6$padding,
+          _ref6$textAllowOverla = _ref6.textAllowOverlap,
+          textAllowOverlap = _ref6$textAllowOverla === void 0 ? false : _ref6$textAllowOverla;
 
       if (textAllowOverlap) {
         // 如果允许文本覆盖
@@ -508,7 +429,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
             box = _collisionIndex$place.box;
 
         if (box && box.length) {
-          // TODO：featureIndex
           collisionIndex.insertCollisionBox(box, id);
           return true;
         } else {
@@ -527,14 +447,10 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initGlyph",
     value: function initGlyph() {
-      var _this$layer$getLayerC = this.layer.getLayerConfig(),
-          _this$layer$getLayerC2 = _this$layer$getLayerC.iconfont,
-          iconfont = _this$layer$getLayerC2 === void 0 ? false : _this$layer$getLayerC2; // 1.生成文字纹理（或是生成 iconfont）
-
-
-      iconfont ? this.initIconFontTex() : this.initTextFont(); // 2.生成文字布局
+      // 1.生成文字纹理
+      this.initTextFont(); // 2.生成文字布局
 
-      this.generateGlyphLayout(iconfont);
+      this.generateGlyphLayout();
     }
     /**
      * 更新文字纹理
@@ -564,27 +480,24 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function reBuildModel() {
       var _this4 = this;
 
-      var _ref9 = this.layer.getLayerConfig(),
-          _ref9$mask = _ref9.mask,
-          mask = _ref9$mask === void 0 ? false : _ref9$mask,
-          _ref9$maskInside = _ref9.maskInside,
-          maskInside = _ref9$maskInside === void 0 ? true : _ref9$maskInside;
+      var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
+          usage = _this$layer$getLayerC3.usage;
 
       this.filterGlyphs();
       this.layer.buildLayerModel({
-        moduleName: 'pointTileText',
-        vertexShader: textVert,
-        fragmentShader: textFrag,
+        moduleName: 'pointTileText_' + usage,
+        vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
+        fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
         triangulation: TextTriangulation.bind(this),
         depth: {
           enable: false
         },
         blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
+        pick: usage !== 'basemap'
       }).then(function (model) {
         _this4.layer.models = [model];
 
-        _this4.layer.renderLayers();
+        _this4.layerService.throttleRenderLayers();
       }).catch(function (err) {
         console.warn(err);
         _this4.layer.models = [];

package/es/point/shaders/animate/wave_frag.glsl

@@ -7,7 +7,7 @@ varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
 
 #pragma include "sdf_2d"
 #pragma include "picking"
@@ -53,10 +53,10 @@ void main() {
   }
   float intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_aimate.z - u_aimate.y * u_time)), 0.0, 1.0);
   
-  // TODO: 根据叠加模式选择效果
+  // 根据叠加模式选择效果
   if(u_additive > 0.0) {
     gl_FragColor *= intensity;
-    // TODO: 优化水波点 blend additive 模式下有的拾取效果 
+    // 优化水波点 blend additive 模式下有的拾取效果 
     gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
   } else {
     gl_FragColor = vec4(gl_FragColor.xyz, gl_FragColor.a * intensity);

package/es/point/shaders/earth/fill_vert.glsl

@@ -111,7 +111,6 @@ void main() {
   // radius(16-bit)
   v_radius = newSize;
 
-  // TODO: billboard
   // anti-alias
   //  float antialiased_blur = -max(u_blur, antialiasblur);
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);

package/es/point/shaders/fill_vert.glsl

@@ -130,7 +130,6 @@ void main() {
   // radius(16-bit)
   v_radius = newSize;
 
-  // TODO: billboard
   // anti-alias
   //  float antialiased_blur = -max(u_blur, antialiasblur);
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);

package/es/point/shaders/normal_frag.glsl

@@ -1,15 +1,6 @@
-
 uniform float u_opacity : 1;
-uniform vec2 u_offsets;
 varying vec4 v_color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
-#pragma include "picking"
 void main() {
-  float opacity = styleMappingMat[0][0];
-
   gl_FragColor = v_color;
-  // gl_FragColor.a =gl_FragColor.a * u_opacity;
-  gl_FragColor.a =gl_FragColor.a * opacity;
-  gl_FragColor = filterColor(gl_FragColor);
+  gl_FragColor.a *= u_opacity;
 }

package/es/point/shaders/normal_vert.glsl

@@ -4,76 +4,21 @@ uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 attribute float a_Size;
 attribute vec4 a_Color;
-varying vec4 v_color;
-
-uniform float u_opacity : 1;
-uniform vec2 u_offsets;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec4 v_color;
 
 #pragma include "projection"
-#pragma include "picking"
 #pragma include "project"
+
 void main() {
   v_color = a_Color;
 
-  // cal style mapping - 数据纹理映射部分的计算
-styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-
-  vec2 textrueOffsets = vec2(0.0, 0.0);
-  if(hasOffsets()) {
-    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-
-    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-  } else {
-    textrueOffsets = u_offsets;
-  }
-
-  // cal style mapping
-  
-  // vec2 offset = project_pixel(u_offsets);
-  vec2 offset = project_pixel(textrueOffsets);
-  // vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);
-  // gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));\
-  // 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // vec2 offset = project_pixel((u_offsets));
-    gl_Position = u_Mvp * vec4(a_Position.xy + offset, a_Position.z, 1.0);
-  } else { // else
-    // vec2 offset = project_pixel(u_offsets);
+    gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);
+  } else {
     vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);
-    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));
+    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy),project_pos.z,project_pos.w));
   }
 
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
-  setPickingColor(a_PickingColor);
 }

package/es/point/shaders/radar/radar_frag.glsl

@@ -1,26 +1,15 @@
 
 uniform float u_additive;
-
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+uniform float u_opacity: 1.0;
 
 varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
-
+varying vec2 v_exteude;
 #pragma include "sdf_2d"
 #pragma include "picking"
 
 void main() {
-  int shape = int(floor(v_data.w + 0.5));
-
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
-
-  float opacity = styleMappingMat[0][0];
 
   lowp float antialiasblur = v_data.z;
   float r = v_radius / (v_radius);
@@ -30,7 +19,7 @@ void main() {
 
   float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
 
-  gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+  gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);
 
   if(u_additive > 0.0) {
     gl_FragColor *= opacity_t;
@@ -42,7 +31,7 @@ void main() {
     gl_FragColor = filterColor(gl_FragColor);
   }
 
-  vec2 extrude =  styleMappingMat[2].ba;
+  vec2 extrude =  v_exteude;
   vec2 dir = normalize(extrude);
   vec2 baseDir = vec2(1.0, 0.0);
   float pi = 3.14159265359;