@antv/l7-layers 2.25.6 → 2.25.7

package/lib/line/models/simple_line.js

@@ -1,126 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _l7Core = require("@antv/l7-core");
-var _l7Utils = require("@antv/l7-utils");
-var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-var _triangulation = require("../../core/triangulation");
-/* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
-const simple_line_frag = "\nlayout(std140) uniform commonUniorm {\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec4 u_dash_array;\n  float u_vertexScale: 1.0;\n  float u_linearColor: 0;\n};\nin float v_distanceScale;\nin vec4 v_color;\n//dash\nin vec4 v_dash_array;\n\nout vec4 outputColor;\nvoid main() {\n  if(u_dash_array!=vec4(0.0)){\n    float dashLength = mod(v_distanceScale, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);\n    if(!(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength <  v_dash_array.x + v_dash_array.y + v_dash_array.z))) {\n      // \u865A\u7EBF\u90E8\u5206\n      discard;\n    };\n  }\n  if(u_linearColor==1.0){\n    outputColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n    outputColor.a *= v_color.a; // \u5168\u5C40\u900F\u660E\u5EA6\n  }\n  else{\n    outputColor = v_color;\n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
-const simple_line_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in vec4 a_SizeDistanceAndTotalDistance;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec4 u_dash_array;\n  float u_vertexScale: 1.0;\n  float u_linearColor: 0;\n};\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nout vec4 v_color;\nout float v_distanceScale;\nout vec4 v_dash_array;\n\nvoid main() {\n  //dash\u8F93\u51FA\n  v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_SizeDistanceAndTotalDistance.a;\n\n  v_color = a_Color;\n  v_distanceScale = a_SizeDistanceAndTotalDistance.b / a_SizeDistanceAndTotalDistance.a;\n  v_color.a = v_color.a * opacity;\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  float lineHeight = a_SizeDistanceAndTotalDistance.y;\n  // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n  if (\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n  ) {\n    // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n    h *= 2.0 / pow(2.0, 20.0 - u_Zoom);\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n  gl_PointSize = 10.0;\n\n}\n";
-class SimpleLineModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9
-    });
-  }
-  getCommonUniformsInfo() {
-    const {
-      sourceColor,
-      targetColor,
-      lineType = 'solid',
-      dashArray = [10, 5, 0, 0],
-      vertexHeightScale = 20.0
-    } = this.layer.getLayerConfig();
-    let u_dash_array = dashArray;
-    if (lineType !== 'dash') {
-      u_dash_array = [0, 0, 0, 0];
-    }
-    if (u_dash_array.length === 2) {
-      u_dash_array.push(0, 0);
-    }
-    // 转化渐变色
-    let useLinearColor = 0; // 默认不生效
-    let sourceColorArr = [0, 0, 0, 0];
-    let targetColorArr = [0, 0, 0, 0];
-    if (sourceColor && targetColor) {
-      sourceColorArr = (0, _l7Utils.rgb2arr)(sourceColor);
-      targetColorArr = (0, _l7Utils.rgb2arr)(targetColor);
-      useLinearColor = 1;
-    }
-    const commonOptions = {
-      u_sourceColor: sourceColorArr,
-      u_targetColor: targetColorArr,
-      u_dash_array,
-      // 顶点高度 scale
-      u_vertexScale: vertexHeightScale,
-      // 渐变色支持参数
-      u_linearColor: useLinearColor
-    };
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  initModels() {
-    var _this = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      return _this.buildModels();
-    })();
-  }
-  getShaders() {
-    return {
-      frag: simple_line_frag,
-      vert: simple_line_vert,
-      type: 'lineSimpleNormal'
-    };
-  }
-  buildModels() {
-    var _this2 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      _this2.initUniformsBuffer();
-      const {
-        frag,
-        vert,
-        type
-      } = _this2.getShaders();
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        triangulation: _triangulation.SimpleLineTriangulation,
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        primitive: _l7Core.gl.LINES,
-        depth: {
-          enable: false
-        },
-        pick: false
-      });
-      return [model];
-    })();
-  }
-  registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
-
-    //size.x,size,y,distance,totalDistance
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'sizeDistanceAndTotalDistance',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_SizeDistanceAndTotalDistance',
-        shaderLocation: this.attributeLocation.SIZE,
-        buffer: {
-          usage: _l7Core.gl.STATIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 4,
-        update: (feature, featureIdx, vertex) => {
-          const {
-            size = 1
-          } = feature;
-          const a_Size = Array.isArray(size) ? [size[0], size[1]] : [size, 0];
-          return [a_Size[0], a_Size[1], vertex[3], vertex[5]];
-        }
-      }
-    });
-  }
-}
-exports.default = SimpleLineModel;

package/lib/line/models/wall.d.ts

@@ -1,34 +0,0 @@
-import type { IModel, ITexture2D } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class LineWallModel extends BaseModel {
-    protected get attributeLocation(): {
-        readonly POSITION: 0;
-        readonly POSITION_64LOW: 1;
-        readonly COLOR: 2;
-        readonly PICKING_COLOR: 3;
-        readonly STROKE: 4;
-        readonly OPACITY: 5;
-        readonly OFFSETS: 6;
-        readonly ROTATION: 7;
-        readonly MAX: 8;
-    } & Record<string, number> & {
-        MAX: 8;
-        SIZE: number;
-        NORMAL: number;
-        UV: number;
-        DISTANCE_MITER_TOTAL: number;
-    };
-    protected texture: ITexture2D;
-    protected getCommonUniformsInfo(): {
-        uniformsArray: number[];
-        uniformsLength: number;
-        uniformsOption: {
-            [key: string]: any;
-        };
-    };
-    initModels(): Promise<IModel[]>;
-    clearModels(): void;
-    buildModels(): Promise<IModel[]>;
-    protected registerBuiltinAttributes(): void;
-    private updateTexture;
-}

package/lib/line/models/wall.js

@@ -1,231 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _l7Core = require("@antv/l7-core");
-var _l7Utils = require("@antv/l7-utils");
-var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-var _triangulation = require("../../core/triangulation");
-/* babel-plugin-inline-import '../shaders/wall/wall_frag.glsl' */
-const line_frag = "#define Animate 0.0\n#define LineTexture 1.0\n\n// line texture\n\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed;\n  float u_linearColor: 0;\n  float u_line_texture;\n  float u_textureBlend;\n  float u_iconStepCount;\n  float u_time;\n};\n\n\nin vec2 v_iconMapUV;\nin vec4 v_color;\nin float v_blur;\nin vec4 v_dataset;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\n\nvoid main() {\n  float animateSpeed = 0.0; // \u8FD0\u52A8\u901F\u5EA6\n  float d_distance_ratio = v_dataset.r; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float v = v_dataset.a;\n\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    outputColor = mix(u_sourceColor, u_targetColor, v);\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     outputColor = v_color;\n  }\n\n  outputColor.a *= v_color.a; // \u5168\u5C40\u900F\u660E\u5EA6\n  if(u_animate.x == Animate) {\n      animateSpeed = u_time / u_animate.y;\n       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);\n      alpha = (alpha + u_animate.w -1.0) / u_animate.w;\n      alpha = smoothstep(0., 1., alpha);\n      outputColor.a *= alpha;\n  }\n\n  if(u_line_texture == LineTexture) { // while load texture\n    float aDistance = v_dataset.g;      // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n    float d_texPixelLen = v_dataset.b;  // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);\n    float v = v_dataset.a;  // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 start\n    float flag = 0.0;\n    if(u > 1.0/u_iconStepCount) {\n      flag = 1.0;\n    }\n    u = fract(u*u_iconStepCount);\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 end\n\n    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;\n    vec4 pattern = texture(SAMPLER_2D(u_texture), uv);\n\n    // Tip: \u5224\u65AD\u7EB9\u7406\u95F4\u9694\n    if(flag > 0.0) {\n      pattern = vec4(0.0);\n    }\n\n    if(u_textureBlend == 0.0) { // normal\n      pattern.a = 0.0;\n      outputColor = filterColor(outputColor + pattern);\n    } else { // replace\n        pattern.a *= v_color.a;\n        if(outputColor.a <= 0.0) {\n          pattern.a = 0.0;\n        }\n        outputColor = filterColor(pattern);\n    }\n  }\n\n\n  // blur - AA\n  if(v < v_blur) {\n    outputColor.a = mix(0.0, outputColor.a, v/v_blur);\n  } else if(v > 1.0 - v_blur) {\n    outputColor.a = mix(outputColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);\n  }\n\n  outputColor = filterColor(outputColor);\n}\n";
-/* babel-plugin-inline-import '../shaders/wall/wall_vert.glsl' */
-const line_vert = "#define Animate 0.0\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in vec2 a_Size;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;\nlayout(location = ATTRIBUTE_LOCATION_DISTANCE_MITER_TOTAL) in vec3 a_Distance_Total_Miter;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed;\n  float u_linearColor: 0;\n  float u_line_texture;\n  float u_textureBlend;\n  float u_iconStepCount;\n  float u_time;\n};\n\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nout vec2 v_iconMapUV;\nout vec4 v_color;\nout float v_blur;\nout vec4 v_dataset;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n  float a_Distance = a_Distance_Total_Miter.x;\n  float a_Miter = a_Distance_Total_Miter.y;\n  float a_Total_Distance = a_Distance_Total_Miter.z;\n\n  float d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float d_texPixelLen; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n\n  v_iconMapUV = a_iconMapUV;\n  if (u_heightfixed < 1.0) {\n    // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n    d_texPixelLen = project_pixel(u_icon_step);\n  } else {\n    d_texPixelLen = u_icon_step;\n  }\n\n  if (u_animate.x == Animate || u_linearColor == 1.0) {\n    d_distance_ratio = a_Distance / a_Total_Distance;\n  }\n\n  float miter = (a_Miter + 1.0) / 2.0;\n  // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\n  v_dataset[0] = d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  v_dataset[1] = a_Distance; // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n  v_dataset[2] = d_texPixelLen; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n  v_dataset[3] = miter; // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C 0 - 1\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);\n\n  float originSize = a_Size.x; // \u56FA\u5B9A\u9AD8\u5EA6\n  if (u_heightfixed < 1.0) {\n    originSize = project_float_meter(a_Size.x); // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n  }\n\n  float wallHeight = originSize * miter;\n  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));\n\n  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);\n  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n\n  // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n  if (\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n  ) {\n    // mapbox\n    // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);\n    if (u_heightfixed > 0.0) {\n      wallHeight *= mapboxZoomScale;\n    }\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-class LineWallModel extends _BaseModel.default {
-  constructor(...args) {
-    super(...args);
-    (0, _defineProperty2.default)(this, "texture", void 0);
-    (0, _defineProperty2.default)(this, "updateTexture", () => {
-      const {
-        createTexture2D
-      } = this.rendererService;
-      if (this.texture) {
-        this.texture.update({
-          data: this.iconService.getCanvas()
-        });
-        this.layer.render();
-        return;
-      }
-      this.texture = createTexture2D({
-        data: this.iconService.getCanvas(),
-        mag: _l7Core.gl.NEAREST,
-        min: _l7Core.gl.NEAREST,
-        premultiplyAlpha: false,
-        width: 1024,
-        height: this.iconService.canvasHeight || 128
-      });
-      this.textures = [this.texture];
-    });
-  }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      NORMAL: 12,
-      UV: 13,
-      DISTANCE_MITER_TOTAL: 15
-    });
-  }
-  getCommonUniformsInfo() {
-    const {
-      sourceColor,
-      targetColor,
-      textureBlend = 'normal',
-      heightfixed = false,
-      lineTexture = false,
-      iconStep = 100,
-      iconStepCount = 1
-    } = this.layer.getLayerConfig();
-    const {
-      animateOption
-    } = this.layer.getLayerConfig();
-    if (this.rendererService.getDirty()) {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
-    }
-
-    // 转化渐变色
-    let useLinearColor = 0; // 默认不生效
-    let sourceColorArr = [0, 0, 0, 0];
-    let targetColorArr = [0, 0, 0, 0];
-    if (sourceColor && targetColor) {
-      sourceColorArr = (0, _l7Utils.rgb2arr)(sourceColor);
-      targetColorArr = (0, _l7Utils.rgb2arr)(targetColor);
-      useLinearColor = 1;
-    }
-    const commonOptions = {
-      u_animate: this.animateOption2Array(animateOption),
-      u_sourceColor: sourceColorArr,
-      u_targetColor: targetColorArr,
-      u_textSize: [1024, this.iconService.canvasHeight || 128],
-      u_icon_step: iconStep,
-      u_heightfixed: Number(heightfixed),
-      // 渐变色支持参数
-      u_linearColor: useLinearColor,
-      u_line_texture: lineTexture ? 1.0 : 0.0,
-      // 传入线的标识
-      u_textureBlend: textureBlend === 'normal' ? 0.0 : 1.0,
-      u_iconStepCount: iconStepCount,
-      u_time: this.layer.getLayerAnimateTime() || 0
-    };
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  // public getAnimateUniforms(): IModelUniform {
-  //   const { animateOption } = this.layer.getLayerConfig() as ILayerConfig;
-  //   return {
-  //     u_animate: this.animateOption2Array(animateOption as IAnimateOption),
-  //     u_time: this.layer.getLayerAnimateTime(),
-  //   };
-  // }
-
-  initModels() {
-    var _this = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      _this.initUniformsBuffer();
-      _this.updateTexture();
-      _this.iconService.on('imageUpdate', _this.updateTexture);
-      return _this.buildModels();
-    })();
-  }
-  clearModels() {
-    var _this$texture2;
-    (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
-    this.iconService.off('imageUpdate', this.updateTexture);
-  }
-  buildModels() {
-    var _this2 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: 'lineWall',
-        vertexShader: line_vert,
-        fragmentShader: line_frag,
-        triangulation: _triangulation.LineTriangulation,
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        depth: {
-          enable: false
-        },
-        blend: _this2.getBlend()
-      });
-      return [model];
-    })();
-  }
-  registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'size',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 2,
-        update: feature => {
-          const {
-            size = 1
-          } = feature;
-          return Array.isArray(size) ? [size[0], size[1]] : [size, 0];
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'normal',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.STATIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 3,
-        // @ts-ignore
-        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
-          return normal;
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'distanceAndTotalAndMiter',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Distance_Total_Miter',
-        shaderLocation: this.attributeLocation.DISTANCE_MITER_TOTAL,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.STATIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 3,
-        update: (feature, featureIdx, vertex) => {
-          // [distance, miter, total_distance]
-          return [vertex[3], vertex[4], vertex[5]];
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'uv',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_iconMapUV',
-        shaderLocation: this.attributeLocation.UV,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 2,
-        update: feature => {
-          const iconMap = this.iconService.getIconMap();
-          const {
-            texture
-          } = feature;
-          const {
-            x,
-            y
-          } = iconMap[texture] || {
-            x: 0,
-            y: 0
-          };
-          return [x, y];
-        }
-      }
-    });
-  }
-}
-exports.default = LineWallModel;

package/lib/line/shaders/arc/line_arc_frag.glsl

@@ -1,92 +0,0 @@
-
-#define Animate 0.0
-#define LineTexture 1.0
-uniform sampler2D u_texture;
-layout(std140) uniform commonUniorm {
-  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
-  vec4 u_dash_array;
-  vec4 u_sourceColor;
-  vec4 u_targetColor;
-  vec2 u_textSize;
-  float segmentNumber;
-  float u_lineDir: 1.0;
-  float u_icon_step: 100;
-  float u_line_texture: 0.0;
-  float u_textureBlend;
-  float u_blur : 0.9;
-  float u_line_type: 0.0;
-  float u_time;
-  float u_linearColor: 0.0;
-};
-
-in vec4 v_color;
-in vec2 v_iconMapUV;
-in vec4 v_lineData;
-//dash
-in vec4 v_dash_array;
-in float v_distance_ratio;
-
-out vec4 outputColor;
-#pragma include "picking"
-
-void main() {
-  if(u_dash_array!=vec4(0.0)){
-    float dashLength = mod(v_distance_ratio, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);
-    if(!(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength <  v_dash_array.x + v_dash_array.y + v_dash_array.z))) {
-      discard;
-    };
-  }
-  float animateSpeed = 0.0; // 运动速度
-  outputColor = v_color;
-  if(u_animate.x == Animate && u_line_texture != LineTexture) {
-      animateSpeed = u_time / u_animate.y;
-      float alpha =1.0 - fract( mod(1.0- v_lineData.b, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
-      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
-      // alpha = smoothstep(0., 1., alpha);
-      alpha = clamp(alpha, 0.0, 1.0);
-      outputColor.a *= alpha;
-  }
-
-  // 当存在贴图时在底色上贴上贴图
-  if(u_line_texture == LineTexture) { // while load texture
-    float arcRadio = smoothstep( 0.0, 1.0, (v_lineData.r / segmentNumber));
-    // float arcRadio = smoothstep( 0.0, 1.0, d_distance_ratio);
-
-    float count = v_lineData.g; // 贴图在弧线上重复的数量
-
-    float time = 0.0;
-    if(u_animate.x == Animate) {
-      time = u_time / u_animate.y;
-    }
-    float redioCount = arcRadio * count;
-
-    float u = fract(redioCount - time);
-    float v = v_lineData.a; // 横向 v
-    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-
-    vec4 pattern = texture(SAMPLER_2D(u_texture), uv);
-
-    if(u_animate.x == Animate) {
-      float currentPlane = floor(redioCount - time);
-      float textureStep = floor(count * u_animate.z);
-      float a = mod(currentPlane, textureStep);
-      if(a < textureStep - 1.0) {
-        pattern = vec4(0.0);
-      }
-    }
-
-    if(u_textureBlend == 0.0) { // normal
-      pattern.a = 0.0;
-      outputColor = filterColor(outputColor + pattern);
-    } else { // replace
-        pattern.a *= v_color.a;
-        if(outputColor.a <= 0.0) {
-          pattern.a = 0.0;
-        }
-        outputColor = filterColor(pattern);
-    }
-    
-  } else {
-     outputColor = filterColor(outputColor);
-  }
-}

package/lib/line/shaders/arc/line_arc_vert.glsl

@@ -1,156 +0,0 @@
-#define Animate (0.0)
-#define LineTexture (1.0)
-
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
-layout(location = ATTRIBUTE_LOCATION_INSTANCE) in vec4 a_Instance;
-layout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
-
-layout(std140) uniform commonUniorm {
-  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
-  vec4 u_dash_array;
-  vec4 u_sourceColor;
-  vec4 u_targetColor;
-  vec2 u_textSize;
-  float segmentNumber;
-  float u_lineDir: 1.0;
-  float u_icon_step: 100;
-  float u_line_texture: 0.0;
-  float u_textureBlend;
-  float u_blur : 0.9;
-  float u_line_type: 0.0;
-  float u_time;
-  float u_linearColor: 0.0;
-};
-
-out vec4 v_color;
-out vec2 v_iconMapUV;
-out vec4 v_lineData;
-//dash
-out vec4 v_dash_array;
-out float v_distance_ratio;
-
-#pragma include "projection"
-#pragma include "project"
-#pragma include "picking"
-
-float bezier3(vec3 arr, float t) {
-  float ut = 1.0 - t;
-  return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
-}
-vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
-  vec2 center = target - source;
-  float r = length(center);
-  float theta = atan(center.y, center.x);
-  float thetaOffset = arcThetaOffset;
-  float r2 = r / 2.0 / cos(thetaOffset);
-  float theta2 = theta + thetaOffset;
-  vec2 mid = vec2(r2 * cos(theta2) + source.x, r2 * sin(theta2) + source.y);
-  if (u_lineDir == 1.0) {
-    // 正向
-    return mid;
-  } else {
-    // 逆向
-    // (mid + vmin)/2 = (s + t)/2
-    vec2 vmid = source + target - mid;
-    return vmid;
-  }
-  // return mid;
-}
-float getSegmentRatio(float index) {
-  // dash: index / (segmentNumber - 1.);
-  // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
-  return smoothstep(0.0, 1.0, index / (segmentNumber - 1.0));
-  //  return index / (segmentNumber - 1.);
-}
-vec2 interpolate(vec2 source, vec2 target, float t, float arcThetaOffset) {
-  // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
-  vec2 mid = midPoint(source, target, arcThetaOffset);
-  vec3 x = vec3(source.x, mid.x, target.x);
-  vec3 y = vec3(source.y, mid.y, target.y);
-  return vec2(bezier3(x, t), bezier3(y, t));
-}
-vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
-  // normalized direction of the line
-  vec2 dir_screenspace = normalize(line_clipspace);
-  // rotate by 90 degrees
-  dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-  vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
-  return offset;
-}
-vec2 getNormal(vec2 line_clipspace, float offset_direction) {
-  // normalized direction of the line
-  vec2 dir_screenspace = normalize(line_clipspace);
-  // rotate by 90 degrees
-   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-   return dir_screenspace.xy * sign(offset_direction);
-}
-
-void main() {
-  //vs中计算渐变色
-  if (u_linearColor == 1.0) {
-    float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
-    v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex / segmentNumber);
-  } else {
-    v_color = a_Color;
-  }
-  v_color.a = v_color.a * opacity;
-
-  vec2 source_world = a_Instance.rg; // 起始点
-  vec2 target_world = a_Instance.ba; // 终点
-
-  float segmentIndex = a_Position.x;
-  float segmentRatio = getSegmentRatio(segmentIndex);
-
-  // 计算 dashArray 和 distanceRatio 输出到片元
-  float total_Distance = pixelDistance(source_world, target_world) / 2.0 * PI;
-  v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
-  v_distance_ratio = segmentIndex / segmentNumber;
-
-  float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
-  float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
-  float d_distance_ratio;
-
-  if(u_animate.x == Animate) {
-      d_distance_ratio = segmentIndex / segmentNumber;
-      if(u_lineDir != 1.0) {
-        d_distance_ratio = 1.0 - d_distance_ratio;
-      }
-  }
-
-  v_lineData.b = d_distance_ratio;
-
-  vec4 source = project_position(vec4(source_world, 0, 1.), a_Instance64Low.xy);
-  vec4 target = project_position(vec4(target_world, 0, 1.), a_Instance64Low.zw);
-
-  vec2 currPos = interpolate(source.xy, target.xy, segmentRatio, thetaOffset);
-  vec2 nextPos = interpolate(source.xy, target.xy, nextSegmentRatio, thetaOffset);
-
-  vec2 offset = project_pixel(
-    getExtrusionOffset((nextPos.xy - currPos.xy) * indexDir, a_Position.y)
-  );
-
-  float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
-  v_lineData.r = d_segmentIndex;
-
-  if(LineTexture == u_line_texture) { // 开启贴图模式
-    float arcDistrance = length(source - target); // 起始点和终点的距离
-    arcDistrance = project_pixel(arcDistrance);
-
-    v_iconMapUV = a_iconMapUV;
-
-    float pixelLen = project_pixel_texture(u_icon_step); // 贴图沿弧线方向的长度 - 随地图缩放改变
-    float texCount = floor(arcDistrance / pixelLen); // 贴图在弧线上重复的数量
-    v_lineData.g = texCount;
-
-    float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
-    float linePixelSize = project_pixel(a_Size); // 定点位置偏移
-    v_lineData.a = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
-  }
-
-  gl_Position = project_common_position_to_clipspace(vec4(currPos.xy + offset, 0, 1.0));
-
-  setPickingColor(a_PickingColor);
-}