@antv/l7-layers 2.9.20 → 2.9.22

package/es/point/models/text.js

@@ -7,7 +7,6 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstruct
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _isNumber from "lodash/isNumber";
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
@@ -23,12 +22,18 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { boundsContains, calculateCentroid, getMask, padBounds } from '@antv/l7-utils';
-import BaseModel from '../../core/BaseModel';
-import CollisionIndex from '../../utils/collision-index';
-import { getGlyphQuads, shapeText } from '../../utils/symbol-layout';
+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/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";
 export function TextTriangulation(feature) {
+  // @ts-ignore
   var that = this;
   var id = feature.id;
   var vertices = [];
@@ -37,12 +42,14 @@ export function TextTriangulation(feature) {
   if (!that.glyphInfoMap || !that.glyphInfoMap[id]) {
     return {
       vertices: [],
+      // [ x, y, z, tex.x,tex.y, offset.x. offset.y]
       indices: [],
       size: 7
     };
   }
 
-  var centroid = that.glyphInfoMap[id].centroid;
+  var centroid = that.glyphInfoMap[id].centroid; // 计算中心点
+
   var coord = centroid.length === 2 ? [centroid[0], centroid[1], 0] : centroid;
   that.glyphInfoMap[id].glyphQuads.forEach(function (quad, index) {
     vertices.push.apply(vertices, _toConsumableArray(coord).concat([quad.tex.x, quad.tex.y + quad.tex.height, quad.tl.x, quad.tl.y], _toConsumableArray(coord), [quad.tex.x + quad.tex.width, quad.tex.y + quad.tex.height, quad.tr.x, quad.tr.y], _toConsumableArray(coord), [quad.tex.x + quad.tex.width, quad.tex.y, quad.br.x, quad.br.y], _toConsumableArray(coord), [quad.tex.x, quad.tex.y, quad.bl.x, quad.bl.y]));
@@ -50,12 +57,13 @@ export function TextTriangulation(feature) {
   });
   return {
     vertices: vertices,
+    // [ x, y, z, tex.x,tex.y, offset.x. offset.y]
     indices: indices,
     size: 7
   };
 }
 
-var TextModel = function (_BaseModel) {
+var TextModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(TextModel, _BaseModel);
 
   var _super = _createSuper(TextModel);
@@ -71,24 +79,18 @@ var TextModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "glyphInfo", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "glyphInfoMap", {});
 
-    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "currentZoom", -1);
 
-    _defineProperty(_assertThisInitialized(_this), "extent", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "textureHeight", 0);
 
     _defineProperty(_assertThisInitialized(_this), "textCount", 0);
 
     _defineProperty(_assertThisInitialized(_this), "preTextStyle", {});
 
-    _defineProperty(_assertThisInitialized(_this), "buildModels", function () {
-      var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(callbackModel) {
+    _defineProperty(_assertThisInitialized(_this), "buildModels", /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
         var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -194,7 +196,8 @@ var TextModel = function (_BaseModel) {
             width = _this$calDataFrame.width,
             height = _this$calDataFrame.height;
 
-        this.rowCount = height;
+        this.rowCount = height; // 当前数据纹理有多少行
+
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
           flipY: true,
           data: data,
@@ -214,10 +217,11 @@ var TextModel = function (_BaseModel) {
 
       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_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,
@@ -248,11 +252,12 @@ var TextModel = function (_BaseModel) {
     value: function needUpdate() {
       var _ref5 = this.layer.getLayerConfig(),
           _ref5$textAllowOverla = _ref5.textAllowOverlap,
-          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla;
+          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla; // textAllowOverlap 发生改变
+
 
       var zoom = this.mapService.getZoom();
       var extent = this.mapService.getBounds();
-      var flag = boundsContains(this.extent, extent);
+      var flag = boundsContains(this.extent, extent); // 文本不能压盖则进行过滤
 
       if (!textAllowOverlap && (Math.abs(this.currentZoom - zoom) > 1 || !flag) || textAllowOverlap !== this.preTextStyle.textAllowOverlap) {
         this.reBuildModel();
@@ -297,6 +302,7 @@ var TextModel = function (_BaseModel) {
         descriptor: {
           name: 'a_textOffsets',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -306,13 +312,15 @@ var TextModel = 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
@@ -324,13 +332,15 @@ var TextModel = function (_BaseModel) {
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
-      });
+      }); // point layer size;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'textUv',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_tex',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -348,6 +358,10 @@ var TextModel = function (_BaseModel) {
       var bounds = this.mapService.getBounds();
       return padBounds(bounds, 0.5);
     }
+    /**
+     * 生成文字纹理（生成文字纹理字典）
+     */
+
   }, {
     key: "initTextFont",
     value: function initTextFont() {
@@ -371,6 +385,7 @@ var TextModel = function (_BaseModel) {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var char = _step.value;
 
+            // 去重
             if (characterSet.indexOf(char) === -1) {
               characterSet.push(char);
             }
@@ -388,6 +403,10 @@ var TextModel = function (_BaseModel) {
         iconfont: false
       });
     }
+    /**
+     * 生成 iconfont 纹理字典
+     */
+
   }, {
     key: "initIconFontTex",
     value: function initIconFontTex() {
@@ -415,11 +434,16 @@ var TextModel = function (_BaseModel) {
         iconfont: true
       });
     }
+    /**
+     * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
+     */
+
   }, {
     key: "generateGlyphLayout",
     value: function generateGlyphLayout(iconfont) {
       var _this2 = this;
 
+      // TODO:更新文字布局
       var mapping = this.fontService.mapping;
 
       var _ref8 = this.layer.getLayerConfig(),
@@ -437,11 +461,14 @@ var TextModel = function (_BaseModel) {
             size = _feature$size2 === void 0 ? 1 : _feature$size2,
             _feature$textOffset = feature.textOffset,
             textOffset = _feature$textOffset === void 0 ? [0, 0] : _feature$textOffset;
-        var shaping = shapeText(shape.toString(), mapping, size, textAnchor, 'left', spacing, textOffset, iconfont);
+        var shaping = shapeText(shape.toString(), mapping, // @ts-ignore
+        size, textAnchor, 'left', spacing, textOffset, iconfont);
         var glyphQuads = getGlyphQuads(shaping, textOffset, false);
         feature.shaping = shaping;
-        feature.glyphQuads = glyphQuads;
-        feature.centroid = calculateCentroid(feature.coordinates);
+        feature.glyphQuads = glyphQuads; // feature.centroid = calculteCentroid(coordinates);
+
+        feature.centroid = calculateCentroid(feature.coordinates); // 此时地图高德2.0 originCentroid == centroid
+
         feature.originCentroid = feature.version === 'GAODE2.x' ? calculateCentroid(feature.originCoordinates) : feature.originCentroid = feature.centroid;
         _this2.glyphInfoMap[id] = {
           shaping: shaping,
@@ -451,6 +478,10 @@ var TextModel = function (_BaseModel) {
         return feature;
       });
     }
+    /**
+     * 文字避让 depend on originCentorid
+     */
+
   }, {
     key: "filterGlyphs",
     value: function filterGlyphs() {
@@ -463,6 +494,8 @@ var TextModel = function (_BaseModel) {
           textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
 
       if (textAllowOverlap) {
+        // 如果允许文本覆盖
+        // this.layer.setEncodedData(this.glyphInfo);
         return;
       }
 
@@ -478,7 +511,9 @@ var TextModel = function (_BaseModel) {
       var filterData = this.glyphInfo.filter(function (feature) {
         var shaping = feature.shaping,
             _feature$id = feature.id,
-            id = _feature$id === void 0 ? 0 : _feature$id;
+            id = _feature$id === void 0 ? 0 : _feature$id; // const centroid = feature.centroid as [number, number];
+        // const centroid = feature.originCentroid as [number, number];
+
         var centroid = feature.version === 'GAODE2.x' ? feature.originCentroid : feature.centroid;
         var size = feature.size;
         var fontScale = size / 24;
@@ -496,6 +531,7 @@ var TextModel = function (_BaseModel) {
             box = _collisionIndex$place.box;
 
         if (box && box.length) {
+          // TODO：featureIndex
           collisionIndex.insertCollisionBox(box, id);
           return true;
         } else {
@@ -503,19 +539,31 @@ var TextModel = function (_BaseModel) {
         }
       });
       filterData.forEach(function (item) {
+        // @ts-ignore
         _this3.glyphInfoMap[item.id] = item;
-      });
+      }); // this.layer.setEncodedData(filterData);
     }
+    /**
+     * 初始化文字布局
+     */
+
   }, {
     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;
+          iconfont = _this$layer$getLayerC2 === void 0 ? false : _this$layer$getLayerC2; // 1.生成文字纹理（或是生成 iconfont）
+
+
+      iconfont ? this.initIconFontTex() : this.initTextFont(); // this.initTextFont();
+      // 2.生成文字布局
 
-      iconfont ? this.initIconFontTex() : this.initTextFont();
       this.generateGlyphLayout(iconfont);
     }
+    /**
+     * 更新文字纹理
+     */
+
   }, {
     key: "updateTexture",
     value: function updateTexture() {
@@ -571,5 +619,4 @@ var TextModel = function (_BaseModel) {
   return TextModel;
 }(BaseModel);
 
-export { TextModel as default };
-//# sourceMappingURL=text.js.map
+export { TextModel as default };

package/es/point/models/tile.js

@@ -13,13 +13,17 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { getCullFace, getMask } from '@antv/l7-utils';
-import BaseModel from '../../core/BaseModel';
-import { PointFillTriangulation } from '../../core/triangulation';
+import BaseModel from "../../core/BaseModel";
+import { PointFillTriangulation } from "../../core/triangulation";
+
+/* babel-plugin-inline-import '../shaders/tile/fill_tile_frag.glsl' */
 var point_tile_frag = "uniform float u_additive;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n  float stroke_opacity = styleMappingMat[0][1];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+
+/* babel-plugin-inline-import '../shaders/tile/fill_tile_vert.glsl' */
 var point_tile_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_isMeter;\n\nuniform vec2 u_tileOrigin;\nuniform float u_coord;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  float newSize = setPickingSize(a_Size);\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 - 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 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.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  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  v_color = a_Color;\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, u_blur);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + 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    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,shape_type);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n\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  }\n\nif(u_coord > 0.0) {\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, 0.0, 1.0));\n  }\n} else {\n  gl_PointSize = 24.0;\n  vec2 pointPos = a_Position.xy;\n  vec4 world = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // \u74E6\u7247\u8D77\u59CB\u70B9\u7684\u4E16\u754C\u5750\u6807\n\n  vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // \u74E6\u7247\u5185\u7684\u70B9\u7684\u504F\u79FB\u5750\u6807\n  \n  world.xy += offset;\n  world.xy += pointOffset;\n\n  if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    // Needs to be divided with project_uCommonUnitsPerMeter\n    world.w *= u_PixelsPerMeter.z;\n  }\n\n  gl_Position = u_ViewProjectionMatrix * world + u_ViewportCenterProjection;\n}\n\n \n  setPickingColor(a_PickingColor);\n\n\n}\n";
 import { Version } from '@antv/l7-maps';
 
-var FillModel = function (_BaseModel) {
+var FillModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillModel, _BaseModel);
 
   var _super = _createSuper(FillModel);
@@ -70,6 +74,7 @@ var FillModel = function (_BaseModel) {
         stroke: stroke,
         offsets: offsets
       })) {
+        // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
         this.judgeStyleAttributes({
           opacity: opacity,
           strokeOpacity: strokeOpacity,
@@ -84,7 +89,8 @@ var FillModel = function (_BaseModel) {
             width = _this$calDataFrame.width,
             height = _this$calDataFrame.height;
 
-        this.rowCount = height;
+        this.rowCount = height; // 当前数据纹理有多少行
+
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
           flipY: true,
           data: data,
@@ -109,6 +115,7 @@ var FillModel = function (_BaseModel) {
         u_blur: blur,
         u_additive: blend === 'additive' ? 1.0 : 0.0,
         u_dataTexture: this.dataTexture,
+        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
         u_cellTypeLayout: this.getCellTypeLayout(),
         u_opacity: Number(opacity),
         u_stroke_opacity: Number(strokeOpacity),
@@ -138,6 +145,11 @@ var FillModel = function (_BaseModel) {
 
       this.buildModels(callbackModel);
     }
+    /**
+     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
+     * @returns
+     */
+
   }, {
     key: "calMeter2Coord",
     value: function calMeter2Coord() {
@@ -161,13 +173,16 @@ var FillModel = function (_BaseModel) {
         var westLnglat = westCoord.toLngLat();
         this.meter2coord = center[0] - westLnglat.lng;
         return;
-      }
+      } // @ts-ignore
+
+
+      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]); // @ts-ignore
 
-      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]);
       var m2 = this.mapService.meterToCoord(center, [maxLng === minLng ? maxLng + 0.1 : maxLng, maxLat === minLat ? minLat + 0.1 : maxLat]);
       this.meter2coord = (m1 + m2) / 2;
 
       if (!Boolean(this.meter2coord)) {
+        // Tip: 兼容单个数据导致的 m1、m2 为 NaN
         this.meter2coord = 7.70681090738883;
       }
     }
@@ -214,7 +229,8 @@ var FillModel = function (_BaseModel) {
       var _this$dataTexture;
 
       (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    }
+    } // overwrite baseModel func
+
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
@@ -226,6 +242,7 @@ var FillModel = function (_BaseModel) {
         descriptor: {
           name: 'a_Extrude',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -237,13 +254,15 @@ var FillModel = function (_BaseModel) {
             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
@@ -251,17 +270,20 @@ var FillModel = function (_BaseModel) {
           size: 1,
           update: function update(feature, featureIdx, vertex, attributeIdx) {
             var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 5 : _feature$size;
+                size = _feature$size === void 0 ? 5 : _feature$size; // console.log('featureIdx', featureIdx, feature)
+
             return Array.isArray(size) ? [size[0] * _this2.meter2coord] : [size * _this2.meter2coord];
           }
         }
-      });
+      }); // point layer size;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'shape',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Shape',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -284,5 +306,4 @@ var FillModel = function (_BaseModel) {
   return FillModel;
 }(BaseModel);
 
-export { FillModel as default };
-//# sourceMappingURL=tile.js.map
+export { FillModel as default };

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

@@ -0,0 +1,65 @@
+
+uniform float u_additive;
+
+varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+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 ];
+
+#pragma include "sdf_2d"
+#pragma include "picking"
+
+void main() {
+
+  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);
+
+  float outer_df;
+  float inner_df;
+  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'
+  
+  outer_df = sdCircle(v_data.xy, 1.0);
+  inner_df = sdCircle(v_data.xy, r);
+
+
+  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
+
+  float color_t = smoothstep(
+    antialiasblur,
+    0.0,
+    inner_df
+  );
+  float PI = 3.14159;
+  float N_RINGS = 3.0;
+  float FREQ = 1.0;
+
+ gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+
+  float d = length(v_data.xy);
+  if(d > 0.5) {
+    discard;
+  }
+  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 模式下有的拾取效果 
+    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
+  } else {
+    gl_FragColor = vec4(gl_FragColor.xyz, gl_FragColor.a * intensity);
+    gl_FragColor = filterColor(gl_FragColor);
+  }
+}

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

@@ -0,0 +1,44 @@
+varying vec4 v_color;
+uniform float u_opacity: 1.0;
+
+uniform float u_pickLight: 0.0;
+
+#pragma include "picking"
+
+varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+uniform float u_linearColor: 0;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+
+uniform float u_opacitylinear: 0.0;
+uniform float u_opacitylinear_dir: 1.0;
+
+void main() {
+  float opacity = styleMappingMat[0][0];
+  float lightWeight = styleMappingMat[1][3];
+  float barLinearZ = styleMappingMat[2][3];
+
+  // 设置圆柱的底色
+  if(u_linearColor == 1.0) { // 使用渐变颜色
+    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);
+    gl_FragColor.rgb *= lightWeight;
+  } else { // 使用 color 方法传入的颜色
+     gl_FragColor = v_color;
+  }
+
+  // 应用透明度
+  gl_FragColor.a *= opacity;
+
+  // 开启透明度渐变
+  if(u_opacitylinear > 0.0) {
+    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;
+  }
+
+  // picking
+  if(u_pickLight > 0.0) {
+    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);
+  } else {
+    gl_FragColor = filterColor(gl_FragColor);
+  }
+}