@antv/l7-layers 2.12.2 → 2.13.1

package/es/line/shaders/tile/line_tile_map_vert.glsl

@@ -1,25 +0,0 @@
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-uniform float u_size;
-
-#pragma include "projection"
-
-void main() {
-
-  vec3 size = a_Miter * u_size * reverse_offset_normal(a_Normal);
-  
-  vec2 offset = project_pixel(size.xy);
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
-  }
-}

package/es/line/shaders/tile/line_tile_vert.glsl

@@ -1,52 +0,0 @@
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-
-// uniform vec2 u_tileOrigin;
-// uniform float u_coord;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-
-
-#pragma include "projection"
-#pragma include "picking"
-
-varying vec4 v_color;
-
-void main() {
-  v_color = a_Color;
-
-  vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
-  
-  vec2 offset = project_pixel(size.xy);
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  // if(u_coord > 0.0) { // 使用经纬度坐标
-      if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));
-    } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
-    }
-  // } else { // 使用偏移坐标
-  //   vec2 pointPos = a_Position.xy;
-  //   vec4 tileWorld = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // 瓦片起始点的世界坐标
-
-  //   vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // 瓦片内的点的偏移坐标
-    
-  //   tileWorld.xy += pointOffset;
-
-  //   tileWorld.xy += offset;
-
-  //   if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-  //     // Needs to be divided with project_uCommonUnitsPerMeter
-  //     tileWorld.w *= u_PixelsPerMeter.z;
-  //   }
-  //   gl_Position = u_ViewProjectionMatrix * tileWorld + u_ViewportCenterProjection;
-  // }
-
-  setPickingColor(a_PickingColor);
-}

package/es/line/shaders/tile/simpleline_map_vert.glsl

@@ -1,15 +0,0 @@
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-
-#pragma include "projection"
-
-void main() {
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, 0.0, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
-  }
-}

package/es/line/shaders/tile/simpleline_vert.glsl

@@ -1,21 +0,0 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-
-#pragma include "projection"
-
-varying vec4 v_color;
-
-void main() {
-  v_color = a_Color; 
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, 0.0, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
-  }
-}

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

@@ -1,15 +0,0 @@
-import { IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class FillModel extends BaseModel {
-    getUninforms(): IModelUniform;
-    getAttribute(): {
-        attributes: {
-            [attributeName: string]: IAttribute;
-        };
-        elements: IElements;
-    };
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-}

package/es/point/models/tile.js

@@ -1,217 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-import { AttributeType, gl } from '@antv/l7-core';
-import { getCullFace } from '@antv/l7-utils';
-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;\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];\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\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + u_stroke_width);\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 = u_stroke_width < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(u_stroke_width < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_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\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n// uniform vec2 u_tileOrigin;\n// uniform 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];\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\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, 0.0);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width));\n  offset = project_pixel(offset);\n\n  v_data = vec4(extrude.x, extrude.y, antialiasblur,shape_type);\n\n  vec4 project_pos = project_position(vec4(a_Position.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\n// if(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\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";
-
-var FillModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(FillModel, _BaseModel);
-
-  var _super = _createSuper(FillModel);
-
-  function FillModel() {
-    _classCallCheck(this, FillModel);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(FillModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          _ref$strokeOpacity = _ref.strokeOpacity,
-          strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
-          _ref$strokeWidth = _ref.strokeWidth,
-          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
-          _ref$stroke = _ref.stroke,
-          stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
-          blend = _ref.blend;
-
-      return {
-        // u_tileOrigin: tileOrigin || [0, 0],
-        // u_coord: coord === 'lnglat' ? 1.0 : 0.0,
-        u_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_opacity: Number(opacity),
-        u_stroke_opacity: Number(strokeOpacity),
-        u_stroke_width: Number(strokeWidth),
-        u_stroke_color: this.getStrokeColor(stroke)
-      };
-    }
-  }, {
-    key: "getAttribute",
-    value: function getAttribute() {
-      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), PointFillTriangulation);
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this.buildModels();
-
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$workerEnabled, workerEnabled, usage, model;
-
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$workerEnabled = _ref2.workerEnabled, workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled, usage = _ref2.usage;
-                this.layer.triangulation = PointFillTriangulation;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'pointTile_' + usage,
-                  vertexShader: point_tile_vert,
-                  fragmentShader: point_tile_frag,
-                  triangulation: PointFillTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  cull: {
-                    enable: true,
-                    face: getCullFace(this.mapService.version)
-                  },
-                  blend: this.getBlend(),
-                  workerEnabled: workerEnabled,
-                  workerOptions: {
-                    modelType: 'pointTile'
-                  },
-                  pick: usage !== 'basemap'
-                });
-
-              case 4:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 6:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {}
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this = this;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'extrude',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Extrude',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
-            var extrudeIndex = attributeIdx % 4 * 3;
-            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
-          }
-        }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 5 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [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
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$shape = feature.shape,
-                shape = _feature$shape === void 0 ? 2 : _feature$shape;
-
-            var shape2d = _this.layer.getLayerConfig().shape2d;
-
-            var shapeIndex = shape2d.indexOf(shape);
-            return [shapeIndex];
-          }
-        }
-      });
-    }
-  }]);
-
-  return FillModel;
-}(BaseModel);
-
-export { FillModel as default };

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

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