@antv/l7-layers 2.21.1 → 2.21.2

package/lib/point/models/radar.js

@@ -5,163 +5,110 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 var _triangulation = require("../../core/triangulation");
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* babel-plugin-inline-import '../shaders/radar/radar_frag.glsl' */
-var pointFillFrag = "\nlayout(std140) uniform commonUniorm{\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\nin vec4 v_data;\nin vec4 v_color;\nin float v_radius;\nin vec2 v_extrude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\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  outputColor = vec4(v_color.rgb, v_color.a);\n\n  if(u_additive > 0.0) {\n    outputColor *= opacity_t;\n  } else {\n    outputColor.a *= opacity_t;\n  }\n\n  if(outputColor.a > 0.0) {\n    outputColor = filterColor(outputColor);\n  }\n\n  vec2 extrude =  v_extrude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\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  outputColor.a *= radar_v;\n}\n";
+const pointFillFrag = "\nlayout(std140) uniform commonUniorm{\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\nin vec4 v_data;\nin vec4 v_color;\nin float v_radius;\nin vec2 v_extrude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\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  outputColor = vec4(v_color.rgb, v_color.a);\n\n  if(u_additive > 0.0) {\n    outputColor *= opacity_t;\n  } else {\n    outputColor.a *= opacity_t;\n  }\n\n  if(outputColor.a > 0.0) {\n    outputColor = filterColor(outputColor);\n  }\n\n  vec2 extrude =  v_extrude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\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  outputColor.a *= radar_v;\n}\n";
 /* babel-plugin-inline-import '../shaders/radar/radar_vert.glsl' */
-var pointFillVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 11) in vec3 a_Extrude;\n\nlayout(std140) uniform commonUniorm {\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\n\nout vec4 v_data;\nout vec4 v_color;\nout float v_radius;\nout vec2 v_extrude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\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_extrude = rotateMatrix * a_Extrude.xy;\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_size_unit == 1.) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  v_radius = newSize;\n\n  vec2 offset = (a_Extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n  offset = project_pixel(offset);\n  \n  v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-var RadarModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(RadarModel, _BaseModel);
-  var _super = _createSuper(RadarModel);
-  function RadarModel() {
-    (0, _classCallCheck2.default)(this, RadarModel);
-    return _super.apply(this, arguments);
+const pointFillVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 11) in vec3 a_Extrude;\n\nlayout(std140) uniform commonUniorm {\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\n\nout vec4 v_data;\nout vec4 v_color;\nout float v_radius;\nout vec2 v_extrude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\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_extrude = rotateMatrix * a_Extrude.xy;\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_size_unit == 1.) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  v_radius = newSize;\n\n  vec2 offset = (a_Extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n  offset = project_pixel(offset);\n  \n  v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+class RadarModel extends _BaseModel.default {
+  getCommonUniformsInfo() {
+    const {
+      blend,
+      speed = 1,
+      unit = 'pixel'
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_additive: blend === 'additive' ? 1.0 : 0.0,
+      u_size_unit: _interface.SizeUnitType[unit],
+      u_speed: speed,
+      u_time: this.layer.getLayerAnimateTime()
+    }; //1+1+1+1
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
   }
-  (0, _createClass2.default)(RadarModel, [{
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref = this.layer.getLayerConfig(),
-        blend = _ref.blend,
-        _ref$speed = _ref.speed,
-        speed = _ref$speed === void 0 ? 1 : _ref$speed,
-        _ref$unit = _ref.unit,
-        unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
-      var commonOptions = {
-        u_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_size_unit: _interface.SizeUnitType[unit],
-        u_speed: speed,
-        u_time: this.layer.getLayerAnimateTime()
-      }; //1+1+1+1
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "getAnimateUniforms",
-    value: function getAnimateUniforms() {
-      return {};
-    }
-  }, {
-    key: "getAttribute",
-    value: function getAttribute() {
-      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _triangulation.PointFillTriangulation);
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              this.initUniformsBuffer();
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'pointRadar',
-                vertexShader: pointFillVert,
-                fragmentShader: pointFillFrag,
-                triangulation: _triangulation.PointFillTriangulation,
-                inject: this.getInject(),
-                depth: {
-                  enable: false
-                }
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }() // 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() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'extrude',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Extrude',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.EXTRUDE,
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.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]];
-          }
+  getAnimateUniforms() {
+    return {};
+  }
+  getAttribute() {
+    return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _triangulation.PointFillTriangulation);
+  }
+  initModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      return _this.buildModels();
+    })();
+  }
+  buildModels() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this2.initUniformsBuffer();
+      const model = yield _this2.layer.buildLayerModel({
+        moduleName: 'pointRadar',
+        vertexShader: pointFillVert,
+        fragmentShader: pointFillFrag,
+        triangulation: _triangulation.PointFillTriangulation,
+        inject: _this2.getInject(),
+        depth: {
+          enable: false
         }
       });
+      return [model];
+    })();
+  }
 
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
-          name: 'a_Size',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 5 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
+  // overwrite baseModel func
+  animateOption2Array(option) {
+    return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];
+  }
+  registerBuiltinAttributes() {
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'extrude',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Extrude',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.EXTRUDE,
+        buffer: {
+          // give the WebGL driver a hint that this buffer may change
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 3,
+        update: (feature, featureIdx, vertex, attributeIdx) => {
+          const extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
+          const extrudeIndex = attributeIdx % 4 * 3;
+          return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
         }
-      });
-    }
-  }]);
-  return RadarModel;
-}(_BaseModel2.default);
+      }
+    });
+
+    // point layer size;
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        name: 'a_Size',
+        buffer: {
+          // give the WebGL driver a hint that this buffer may change
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 5
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
+        }
+      }
+    });
+  }
+}
+exports.default = RadarModel;

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

@@ -0,0 +1,69 @@
+import type { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+import type { IGlyphQuad } from '../../utils/symbol-layout';
+export declare function TextTrianglation(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 rawEncodeData;
+    private texture;
+    private currentZoom;
+    private extent;
+    private textureHeight;
+    private textCount;
+    private preTextStyle;
+    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
+    needUpdate(): Promise<boolean>;
+    clearModels(): void;
+    protected registerBuiltinAttributes(): void;
+    private bindEvent;
+    private mapping;
+    private textExtent;
+    /**
+     * 生成文字纹理（生成文字纹理字典）
+     */
+    private initTextFont;
+    /**
+     * 生成 iconfont 纹理字典
+     */
+    private initIconFontTex;
+    private getTextStyle;
+    /**
+     * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
+     */
+    private generateGlyphLayout;
+    private getFontServiceMapping;
+    private getFontServiceCanvas;
+    /**
+     * 文字避让 depend on originCentorid
+     */
+    private filterGlyphs;
+    /**
+     * 初始化文字布局
+     */
+    private initGlyph;
+    /**
+     * 更新文字纹理
+     */
+    private updateTexture;
+    private reBuildModel;
+}