@antv/l7-layers 2.25.5 → 2.25.7

package/lib/point/models/extrude.js

@@ -1,203 +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/extrude/extrude_frag.glsl' */
-const pointExtrudeFrag = "in vec4 v_color;\nin float v_lightWeight;\nout vec4 outputColor;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\n\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\n\nvoid main() {\n  outputColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if (u_pickLight > 0.0) {\n    outputColor = filterColorAlpha(outputColor, v_lightWeight);\n  } else {\n    outputColor = filterColor(outputColor);\n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/extrude/extrude_vert.glsl' */
-const pointExtrudeVert = "#define pi (3.1415926535)\n\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in vec3 a_Size;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec4 a_Extrude;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\nout vec4 v_color;\nout float v_lightWeight;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if (x > 0.0 && z > 0.0) {\n    return atan(x / z);\n  } else if (x > 0.0 && z <= 0.0) {\n    return atan(-z / x) + pi / 2.0;\n  } else if (x <= 0.0 && z <= 0.0) {\n    return pi + atan(x / z); //atan(x/z) +\n  } else {\n    return atan(z / -x) + pi * 3.0 / 2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y / r);\n}\n\nvoid main() {\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if (u_heightfixed < 1.0) {\n    // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n  } else {\n    // \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if (\n      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n    ) {\n      offset *= 4.0 / pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n  vec2 positions = a_Extrude.xy;\n  vec2 positions64Low = a_Extrude.zw;\n  vec4 project_pos = project_position(vec4(positions, 0.0, 1.0), positions64Low);\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if (u_lightEnable > 0.0) {\n    // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if (u_linearColor == 1.0) {\n    // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a = v_color.a * opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n  }\n\n  if (u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? 1.0 - a_Position.z : a_Position.z;\n  }\n\n  gl_Position = project_common_position_to_clipspace(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
-class ExtrudeModel extends _BaseModel.default {
-  constructor(...args) {
-    super(...args);
-    (0, _defineProperty2.default)(this, "raiseCount", 0);
-    (0, _defineProperty2.default)(this, "raiseRepeat", 0);
-  }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      EXTRUDE: 10,
-      NORMAL: 11
-    });
-  }
-  getCommonUniformsInfo() {
-    const {
-      animateOption = {
-        enable: false,
-        speed: 0.01,
-        repeat: false
-      },
-      sourceColor,
-      targetColor,
-      pickLight = false,
-      heightfixed = false,
-      opacityLinear = {
-        enable: false,
-        dir: 'up'
-      },
-      lightEnable = true
-    } = this.layer.getLayerConfig();
-
-    // 转化渐变色
-    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;
-    }
-    if (this.raiseCount < 1 && this.raiseRepeat > 0) {
-      if (animateOption.enable) {
-        const {
-          speed = 0.01
-        } = animateOption;
-        this.raiseCount += speed;
-        if (this.raiseCount >= 1) {
-          if (this.raiseRepeat > 1) {
-            this.raiseCount = 0;
-            this.raiseRepeat--;
-          } else {
-            this.raiseCount = 1;
-          }
-        }
-      }
-    }
-    const commonOptions = {
-      // 圆柱体的拾取高亮是否要计算光照
-      u_pickLight: Number(pickLight),
-      // 圆柱体是否固定高度
-      u_heightfixed: Number(heightfixed),
-      u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
-      // 渐变色支持参数
-      u_linearColor: useLinearColor,
-      u_sourceColor: sourceColorArr,
-      u_targetColor: targetColorArr,
-      // 透明度渐变
-      u_opacitylinear: Number(opacityLinear.enable),
-      u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,
-      // 光照计算开关
-      u_lightEnable: Number(lightEnable)
-    };
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  initModels() {
-    var _this = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      return _this.buildModels();
-    })();
-  }
-  buildModels() {
-    var _this2 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      const {
-        depth = true,
-        animateOption: {
-          repeat = 1
-        }
-      } = _this2.layer.getLayerConfig();
-      _this2.raiseRepeat = repeat;
-      _this2.initUniformsBuffer();
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: 'pointExtrude',
-        vertexShader: pointExtrudeVert,
-        fragmentShader: pointExtrudeFrag,
-        triangulation: _triangulation.PointExtrudeTriangulation,
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        cull: {
-          enable: true,
-          face: _l7Core.gl.FRONT
-        },
-        depth: {
-          enable: depth
-        }
-      });
-      return [model];
-    })();
-  }
-  registerBuiltinAttributes() {
-    // point layer size;
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'size',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
-        buffer: {
-          usage: _l7Core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 3,
-        update: feature => {
-          const {
-            size
-          } = feature;
-          if (size) {
-            let buffersize = [];
-            if (Array.isArray(size)) {
-              buffersize = size.length === 2 ? [size[0], size[0], size[1]] : size;
-            }
-            if (!Array.isArray(size)) {
-              buffersize = [size, size, size];
-            }
-            return buffersize;
-          } else {
-            return [2, 2, 2];
-          }
-        }
-      }
-    });
-    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,
-        update: (feature, featureIdx, vertex, attributeIdx, normal) => {
-          return normal;
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'extrude',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Extrude',
-        shaderLocation: this.attributeLocation.EXTRUDE,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 4,
-        update: feature => {
-          const coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
-          // [lng, lat, lowLng, lowLat]
-          // low part for enabled double precision
-          return [coordinates[0], coordinates[1], (0, _l7Utils.fp64LowPart)(coordinates[0]), (0, _l7Utils.fp64LowPart)(coordinates[1])];
-        }
-      }
-    });
-  }
-}
-exports.default = ExtrudeModel;

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

@@ -1,47 +0,0 @@
-import type { IAnimateOption, IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class FillModel 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;
-        SHAPE: number;
-        EXTRUDE: number;
-    };
-    protected getCommonUniformsInfo(): {
-        uniformsArray: number[];
-        uniformsLength: number;
-        uniformsOption: {
-            [key: string]: any;
-        };
-    };
-    getAnimateUniforms(): IModelUniform;
-    getAttribute(): {
-        attributes: {
-            [attributeName: string]: IAttribute;
-        };
-        elements: IElements;
-    };
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
-    /**
-     * 根据 animateOption 的值返回对应的 shader 代码
-     * @returns
-     */
-    getShaders(): {
-        frag: string;
-        vert: string;
-        type: string;
-    };
-    protected animateOption2Array(option: Partial<IAnimateOption>): number[];
-    protected registerBuiltinAttributes(): void;
-}

package/lib/point/models/fill.js

@@ -1,188 +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 _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-var _triangulation = require("../../core/triangulation");
-var _interface = require("../../core/interface");
-/* babel-plugin-inline-import '../shaders/fill/fill_frag.glsl' */
-const pointFillFrag = "layout(std140) uniform commonUniforms {\n  vec3 u_blur_height_fixed;\n  float u_stroke_width;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_size_unit;\n  float u_time;\n  vec4 u_animate;\n};\n\nin vec4 v_color;\nin vec4 v_stroke;\nin vec4 v_data;\nin float v_radius;\n\n#pragma include \"scene_uniforms\"\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\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.0));\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  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = u_stroke_width < 0.01 ? 0.0 : smoothstep(antialiasblur, 0.0, inner_df);\n\n  float PI = 3.14159;\n  float N_RINGS = 3.0;\n  float FREQ = 1.0;\n\n  if (u_stroke_width < 0.01) {\n    outputColor = v_color;\n  } else {\n    outputColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);\n  }\n  float intensity = 1.0;\n  if (u_time != -1.0) {\n    //wave\u76F8\u5173\u903B\u8F91\n    float d = length(v_data.xy);\n    if (d > 0.5) {\n      discard;\n    }\n    intensity =\n      clamp(cos(d * PI), 0.0, 1.0) *\n      clamp(cos(2.0 * PI * (d * 2.0 * u_animate.z - u_animate.y * u_time)), 0.0, 1.0);\n  }\n\n  if (u_additive > 0.0) {\n    outputColor *= opacity_t;\n    outputColor *= intensity; //wave\n    outputColor = filterColorAlpha(outputColor, outputColor.a);\n  } else {\n    outputColor.a *= opacity_t;\n    outputColor.a *= intensity; //wave\n    outputColor = filterColor(outputColor);\n  }\n  // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (outputColor.a < 0.01) {\n    discard;\n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/fill/fill_vert.glsl' */
-const pointFillVert = "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 float a_Size;\nlayout(location = ATTRIBUTE_LOCATION_SHAPE) in float a_Shape;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;\n\nlayout(std140) uniform commonUniforms {\n  vec3 u_blur_height_fixed;\n  float u_stroke_width;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_size_unit;\n  float u_time;\n  vec4 u_animate;\n};\n\nout vec4 v_color;\nout vec4 v_stroke;\nout vec4 v_data;\nout float v_radius;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // \u900F\u660E\u5EA6\u8BA1\u7B97\n   v_stroke = stroke;\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n\n\n  // unpack color(vec2)\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if(u_size_unit == 1.0) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n   v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);\n\n  offset = project_pixel(offset);\n  offset = rotate_matrix(offset,rotation);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_blur_height_fixed.y;\n\n  if(u_blur_height_fixed.z < 1.0) { // false\n    raisingHeight = project_pixel(u_blur_height_fixed.y);\n  } else {\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      raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;\n    }\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-class FillModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      SHAPE: 10,
-      EXTRUDE: 11
-    });
-  }
-  getCommonUniformsInfo() {
-    const {
-      strokeOpacity = 1,
-      strokeWidth = 0,
-      blend,
-      blur = 0,
-      raisingHeight = 0,
-      heightfixed = false,
-      unit = 'pixel'
-    } = this.layer.getLayerConfig();
-    let u_time = this.getAnimateUniforms().u_time;
-    if (isNaN(u_time)) {
-      u_time = -1.0;
-    }
-    const commonOptions = {
-      u_blur_height_fixed: [blur, Number(raisingHeight), Number(heightfixed)],
-      u_stroke_width: strokeWidth,
-      u_additive: blend === 'additive' ? 1.0 : 0.0,
-      u_stroke_opacity: strokeOpacity,
-      u_size_unit: _interface.SizeUnitType[unit],
-      u_time,
-      u_animate: this.getAnimateUniforms().u_animate
-    };
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  getAnimateUniforms() {
-    const {
-      animateOption = {
-        enable: false
-      }
-    } = this.layer.getLayerConfig();
-    return {
-      u_animate: this.animateOption2Array(animateOption),
-      u_time: animateOption.enable ? this.layer.getLayerAnimateTime() : -1.0
-    };
-  }
-  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* () {
-      const {
-        frag,
-        vert,
-        type
-      } = _this2.getShaders();
-      _this2.layer.triangulation = _triangulation.PointFillTriangulation;
-      _this2.initUniformsBuffer();
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        triangulation: _triangulation.PointFillTriangulation,
-        depth: {
-          enable: false
-        }
-      });
-      return [model];
-    })();
-  }
-
-  /**
-   * 根据 animateOption 的值返回对应的 shader 代码
-   * @returns
-   */
-  getShaders() {
-    return {
-      frag: pointFillFrag,
-      vert: pointFillVert,
-      type: 'pointFill'
-    };
-  }
-
-  // overwrite baseModel func
-  animateOption2Array(option) {
-    return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];
-  }
-  registerBuiltinAttributes() {
-    // 注册 Style 参与数据映射的内置属性
-    const shape2d = this.layer.getLayerConfig().shape2d;
-
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'extrude',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Extrude',
-        shaderLocation: this.attributeLocation.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]];
-        }
-      }
-    });
-
-    // point layer size;
-    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: 1,
-        update: feature => {
-          const {
-            size = 5
-          } = feature;
-          return Array.isArray(size) ? [size[0]] : [size];
-        }
-      }
-    });
-
-    // point layer shape;
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'shape',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Shape',
-        shaderLocation: this.attributeLocation.SHAPE,
-        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 {
-            shape = 2
-          } = feature;
-          const shapeIndex = shape2d.indexOf(shape);
-          return [shapeIndex];
-        }
-      }
-    });
-  }
-}
-exports.default = FillModel;

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

@@ -1,42 +0,0 @@
-import type { IAttribute, IElements, IModel } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class FillImageModel 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;
-        EXTRUDE: number;
-        UV: number;
-    };
-    private meter2coord;
-    private texture;
-    private isMeter;
-    private radian;
-    protected getCommonUniformsInfo(): {
-        uniformsArray: number[];
-        uniformsLength: number;
-        uniformsOption: {
-            [key: string]: any;
-        };
-    };
-    getAttribute(): {
-        attributes: {
-            [attributeName: string]: IAttribute;
-        };
-        elements: IElements;
-    };
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-    private updateTexture;
-}

package/lib/point/models/fillImage.js

@@ -1,197 +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 _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-var _interface = require("../../core/interface");
-var _triangulation = require("../../core/triangulation");
-/* babel-plugin-inline-import '../shaders/fillImage/fillImage_frag.glsl' */
-const pointFillFrag = "in vec2 v_uv;// \u672C\u8EAB\u7684 uv \u5750\u6807\nin vec2 v_Iconuv;\nin float v_opacity;\nout vec4 outputColor;\n\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniform {\n  vec2 u_textSize;\n  float u_heightfixed: 0.0;\n  float u_raisingHeight: 0.0;\n  float u_size_unit;\n};\n\n#pragma include \"scene_uniforms\"\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;\n  outputColor = texture(SAMPLER_2D(u_texture), pos);\n  outputColor.a *= v_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
-/* babel-plugin-inline-import '../shaders/fillImage/fillImage_vert.glsl' */
-const pointFillVert = "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 float a_Size;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniform {\n  vec2 u_textSize;\n  float u_heightfixed;\n  float u_raisingHeight;\n  float u_size_unit;\n};\n\nout vec2 v_uv;\nout vec2 v_Iconuv;\nout float v_opacity;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  v_uv = (a_Extrude.xy + 1.0) / 2.0;\n  v_uv.x = 1.0 - v_uv.x;\n  v_uv.y = 1.0 - v_uv.y;\n  v_Iconuv = a_Uv;\n  v_opacity = opacity;\n  float newSize = a_Size;\n  if (u_size_unit == 1.0) {\n    newSize = newSize * u_PixelsPerMeter.z;\n  }\n\n  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);\n  vec2 offset = extrude.xy * newSize + offsets;\n\n  offset = rotate_matrix(offset, rotation);\n\n  offset = project_pixel(offset);\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-class FillImageModel extends _BaseModel.default {
-  constructor(...args) {
-    super(...args);
-    (0, _defineProperty2.default)(this, "meter2coord", 1);
-    (0, _defineProperty2.default)(this, "texture", void 0);
-    (0, _defineProperty2.default)(this, "isMeter", false);
-    (0, _defineProperty2.default)(this, "radian", 0);
-    (0, _defineProperty2.default)(this, "updateTexture", () => {
-      const {
-        createTexture2D
-      } = this.rendererService;
-      if (this.texture) {
-        this.texture.update({
-          data: this.iconService.getCanvas(),
-          mag: 'linear',
-          min: 'linear mipmap nearest',
-          mipmap: true
-        });
-        // 更新完纹理后在更新的图层的时候需要更新所有的图层
-        this.layerService.throttleRenderLayers();
-        return;
-      }
-      this.texture = createTexture2D({
-        data: this.iconService.getCanvas(),
-        mag: _l7Core.gl.LINEAR,
-        min: _l7Core.gl.LINEAR_MIPMAP_LINEAR,
-        premultiplyAlpha: false,
-        width: 1024,
-        height: this.iconService.canvasHeight || 128,
-        mipmap: true
-      });
-      this.textures = [this.texture];
-    });
-  }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      EXTRUDE: 10,
-      UV: 11
-    });
-  }
-  // 旋转的弧度
-  getCommonUniformsInfo() {
-    const {
-      raisingHeight = 0.0,
-      heightfixed = false,
-      unit = 'pixel'
-    } = this.layer.getLayerConfig();
-    if (this.rendererService.getDirty()) {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.bind();
-    }
-    const commonOptions = {
-      u_textSize: [1024, this.iconService.canvasHeight || 128],
-      u_heightfixed: Number(heightfixed),
-      u_raisingHeight: Number(raisingHeight),
-      u_size_unit: _interface.SizeUnitType[unit]
-    }; //2+1+1+1
-    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-    return commonBufferInfo;
-  }
-  getAttribute() {
-    return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), _triangulation.PointFillTriangulation);
-  }
-  initModels() {
-    var _this = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      _this.iconService.on('imageUpdate', _this.updateTexture);
-      _this.updateTexture();
-      return _this.buildModels();
-    })();
-  }
-  buildModels() {
-    var _this2 = this;
-    return (0, _asyncToGenerator2.default)(function* () {
-      _this2.initUniformsBuffer();
-      const model = yield _this2.layer.buildLayerModel({
-        moduleName: 'pointFillImage',
-        vertexShader: pointFillVert,
-        fragmentShader: pointFillFrag,
-        triangulation: _triangulation.PointFillTriangulation,
-        depth: {
-          enable: false
-        },
-        defines: _this2.getDefines(),
-        inject: _this2.getInject(),
-        cull: {
-          enable: true,
-          face: _l7Core.gl.FRONT
-        }
-      });
-      return [model];
-    })();
-  }
-  clearModels() {
-    var _this$texture2;
-    this.iconService.off('imageUpdate', this.updateTexture);
-    (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
-  }
-
-  // overwrite baseModel func
-  registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'uv',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Uv',
-        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 {
-            shape
-          } = feature;
-          const {
-            x,
-            y
-          } = iconMap[shape] || {
-            x: -64,
-            y: -64
-          };
-          return [x, y];
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'extrude',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Extrude',
-        shaderLocation: this.attributeLocation.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]];
-        }
-      }
-    });
-
-    // point layer size;
-    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: 1,
-        update: feature => {
-          const {
-            size = 5
-          } = feature;
-          return Array.isArray(size) ? [size[0]] : [size];
-        }
-      }
-    });
-  }
-}
-exports.default = FillImageModel;