@antv/l7-layers 2.21.8 → 2.21.9-beta.0

package/es/raster/models/raster.js

@@ -4,18 +4,23 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_frag.glsl' */
 const rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value)) {\n    discard;\n  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {\n    discard;\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_vert.glsl' */
-const rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+const rasterVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_texCoord = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterModel extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
     _defineProperty(this, "colorTexture", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -107,6 +112,7 @@ export default class RasterModel extends BaseModel {
         moduleName: 'rasterImageData',
         vertexShader: rasterVert,
         fragmentShader: rasterFrag,
+        defines: _this2.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -123,12 +129,15 @@ export default class RasterModel extends BaseModel {
     (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
+
     // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         name: 'a_Uv',
         buffer: {
           // give the WebGL driver a hint that this buffer may change

package/es/raster/models/rasterRgb.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel 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;
+        UV: number;
+    };
     protected texture: ITexture2D;
     protected dataOption: any;
     getUninforms(): {

package/es/raster/models/rasterRgb.js

@@ -6,18 +6,23 @@ const _excluded = ["data"],
   _excluded2 = ["rasterData"];
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/rgb/raster_rgb_frag.glsl' */
 const rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n\n  if(outputColor.a < 0.01)\n    discard;\n \n}";
 /* babel-plugin-inline-import '../shaders/rgb/raster_rgb_vert.glsl' */
-const rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+const rasterVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_rminmax;\n  vec2 u_gminmax;\n  vec2 u_bminmax;\n  float u_opacity;\n  float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\nvoid main() {\n  v_texCoord = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterModel extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
     _defineProperty(this, "dataOption", {});
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -105,6 +110,7 @@ export default class RasterModel extends BaseModel {
         moduleName: 'rasterImageDataRGBA',
         vertexShader: rasterVert,
         fragmentShader: rasterFrag,
+        defines: _this2.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -126,13 +132,16 @@ export default class RasterModel extends BaseModel {
     (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
+
     // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/raster/models/rasterTerrainRgb.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterTerrainRGB 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;
+        UV: number;
+    };
     protected texture: ITexture2D;
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];

package/es/raster/models/rasterTerrainRgb.js

@@ -3,17 +3,22 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_frag.glsl' */
 const Raster_terrainFrag = "uniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nlayout(std140) uniform commonUniforms {\n vec4 u_unpack;\n vec2 u_domain;\n float u_opacity;\n float u_noDataValue;\n float u_clampLow;\n float u_clampHigh;\n};\n\nin vec2 v_texCoord;\nout vec4 outputColor;\n\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data =  texture(SAMPLER_2D(u_texture), coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return  texture(SAMPLER_2D(u_colorTexture), coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {\n     outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    outputColor = getColor(value);\n    outputColor.a =  outputColor.a * u_opacity ;\n      if(outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_vert.glsl' */
-const Raster_terrainVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n   vec4 u_unpack;\n   vec2 u_domain;\n   float u_opacity;\n   float u_noDataValue;\n   float u_clampLow;\n   float u_clampHigh;\n};\nout vec2 v_texCoord;\n#pragma include \"projection\"\n\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+const Raster_terrainVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_unpack;\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\nout vec2 v_texCoord;\n#pragma include \"projection\"\n\nvoid main() {\n  v_texCoord = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterTerrainRGB extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getCommonUniformsInfo() {
     const {
       opacity,
@@ -69,6 +74,7 @@ export default class RasterTerrainRGB extends BaseModel {
         moduleName: 'RasterTileDataImage',
         vertexShader: Raster_terrainVert,
         fragmentShader: Raster_terrainFrag,
+        defines: _this.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -89,12 +95,14 @@ export default class RasterTerrainRGB extends BaseModel {
     })();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],

package/es/raster/shaders/raster/raster_2d_vert.glsl

@@ -1,6 +1,6 @@
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   vec2 u_domain;
@@ -15,7 +15,7 @@ out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

package/es/raster/shaders/rgb/raster_rgb_vert.glsl

@@ -1,13 +1,13 @@
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
- vec2 u_rminmax;
- vec2 u_gminmax;
- vec2 u_bminmax;
- float u_opacity;
- float u_noDataValue;
+  vec2 u_rminmax;
+  vec2 u_gminmax;
+  vec2 u_bminmax;
+  float u_opacity;
+  float u_noDataValue;
 };
 
 out vec2 v_texCoord;
@@ -15,7 +15,7 @@ out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

package/es/raster/shaders/terrain/terrain_rgb_vert.glsl

@@ -1,19 +1,19 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
-   vec4 u_unpack;
-   vec2 u_domain;
-   float u_opacity;
-   float u_noDataValue;
-   float u_clampLow;
-   float u_clampHigh;
+  vec4 u_unpack;
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  float u_clampLow;
+  float u_clampHigh;
 };
 out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

package/es/tile/core/BaseLayer.js

@@ -32,22 +32,6 @@ export default class BaseTileLayer {
         latLonBounds,
         zoom
       } = this.getCurrentView();
-      if (this.mapService.version === 'GAODE1.x') {
-        const {
-          visible
-        } = this.parent.getLayerConfig();
-        if (zoom < 2 && visible) {
-          this.parent.updateLayerConfig({
-            visible: false
-          });
-          this.layerService.reRender();
-        } else if (zoom >= 2 && !visible) {
-          this.parent.updateLayerConfig({
-            visible: true
-          });
-          this.layerService.reRender();
-        }
-      }
       if (this.lastViewStates && this.lastViewStates.zoom === zoom && this.lastViewStates.latLonBounds.toString() === latLonBounds.toString()) {
         return;
       }

package/es/utils/extrude_polyline.d.ts

@@ -39,20 +39,6 @@ export default class ExtrudePolyline {
         startIndex: number;
         indexes: number[];
     };
-    simpleExtrude_gaode2(points: number[][], originPoints: number[][]): {
-        positions: number[];
-        indices: number[];
-        normals: number[];
-        startIndex: number;
-        indexes: number[];
-    };
-    extrude_gaode2(points: number[][], originPoints: number[][]): {
-        positions: number[];
-        indices: number[];
-        normals: number[];
-        startIndex: number;
-        indexes: number[];
-    };
     extrude(points: number[][]): {
         positions: number[];
         indices: number[];
@@ -61,7 +47,6 @@ export default class ExtrudePolyline {
         indexes: number[];
     };
     private simpleSegment;
-    private segment_gaode2;
     private segment;
     private extrusions;
     private lineSegmentDistance;

package/es/utils/extrude_polyline.js

@@ -91,98 +91,6 @@ export default class ExtrudePolyline {
     complex.startIndex = complex.positions.length / 6;
     return complex;
   }
-  simpleExtrude_gaode2(points, originPoints) {
-    const complex = this.complex;
-    if (points.length <= 1) {
-      return complex;
-    }
-    this.lastFlip = -1;
-    this.started = false;
-    this.normal = null;
-    this.totalDistance = 0;
-    // 去除数组里重复的点
-    // points = getArrayUnique(points);
-    const total = points.length;
-    let count = complex.startIndex;
-    for (let i = 1; i < total; i++) {
-      var _originPoints$, _originPoints$i$, _originPoints$2;
-      const last = points[i - 1];
-      last.push((_originPoints$ = originPoints[i - 1][2]) !== null && _originPoints$ !== void 0 ? _originPoints$ : 0);
-      // @ts-ignore
-      const originLast = originPoints[i - 1];
-      const cur = points[i];
-      cur.push((_originPoints$i$ = originPoints[i][2]) !== null && _originPoints$i$ !== void 0 ? _originPoints$i$ : 0);
-      // @ts-ignore
-      const originCur = originPoints[i];
-      const next = i < points.length - 1 ? [...points[i + 1], (_originPoints$2 = originPoints[i + 1][2]) !== null && _originPoints$2 !== void 0 ? _originPoints$2 : 0] : null;
-      const originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
-      const amt = this.simpleSegment(complex, count,
-      // @ts-ignore
-      last,
-      // @ts-ignore
-      cur,
-      // @ts-ignore
-      next,
-      // @ts-ignore
-      originLast, originCur,
-      // @ts-ignore
-      originNext);
-      count += amt;
-    }
-    if (this.dash) {
-      for (let i = 0; i < complex.positions.length / 6; i++) {
-        complex.positions[i * 6 + 5] = this.totalDistance;
-      }
-    }
-    complex.startIndex = complex.positions.length / 6;
-    return complex;
-  }
-  extrude_gaode2(points, originPoints) {
-    const complex = this.complex;
-    if (points.length <= 1) {
-      return complex;
-    }
-    this.lastFlip = -1;
-    this.started = false;
-    this.normal = null;
-    this.totalDistance = 0;
-    // 去除数组里重复的点
-    // points = getArrayUnique(points);
-    const total = points.length;
-    let count = complex.startIndex;
-    for (let i = 1; i < total; i++) {
-      var _originPoints$3, _originPoints$i$2, _originPoints$4;
-      const last = points[i - 1];
-      last.push((_originPoints$3 = originPoints[i - 1][2]) !== null && _originPoints$3 !== void 0 ? _originPoints$3 : 0);
-      // @ts-ignore
-      const originLast = originPoints[i - 1];
-      const cur = points[i];
-      cur.push((_originPoints$i$2 = originPoints[i][2]) !== null && _originPoints$i$2 !== void 0 ? _originPoints$i$2 : 0);
-      // @ts-ignore
-      const originCur = originPoints[i];
-      const next = i < points.length - 1 ? [...points[i + 1], (_originPoints$4 = originPoints[i + 1][2]) !== null && _originPoints$4 !== void 0 ? _originPoints$4 : 0] : null;
-      const originNext = i < originPoints.length - 1 ? originPoints[i + 1] : null;
-      const amt = this.segment_gaode2(complex, count,
-      // @ts-ignore
-      last,
-      // @ts-ignore
-      cur,
-      // @ts-ignore
-      next,
-      // @ts-ignore
-      originLast, originCur,
-      // @ts-ignore
-      originNext);
-      count += amt;
-    }
-    if (this.dash) {
-      for (let i = 0; i < complex.positions.length / 6; i++) {
-        complex.positions[i * 6 + 5] = this.totalDistance;
-      }
-    }
-    complex.startIndex = complex.positions.length / 6;
-    return complex;
-  }
   extrude(points) {
     const complex = this.complex;
     if (points.length <= 1) {
@@ -265,131 +173,6 @@ export default class ExtrudePolyline {
     }
     return count;
   }
-  segment_gaode2(complex, index, last, cur, next, originLast, originCur,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  originNext) {
-    let count = 0;
-    const indices = complex.indices;
-    const positions = complex.positions;
-    const normals = complex.normals;
-    const capSquare = this.cap === 'square';
-    const joinBevel = this.join === 'bevel';
-    const flatCur = aProjectFlat([originCur[0], originCur[1]]);
-    const flatLast = aProjectFlat([originLast[0], originLast[1]]);
-    // @ts-ignore
-    direction(lineA, cur, last);
-    let segmentDistance = 0;
-    if (this.dash) {
-      // @ts-ignore
-      segmentDistance = this.lineSegmentDistance(flatCur, flatLast);
-      this.totalDistance += segmentDistance;
-    }
-    if (!this.normal) {
-      this.normal = vec2.create();
-      computeNormal(this.normal, lineA);
-    }
-    if (!this.started) {
-      this.started = true;
-
-      // if the end cap is type square, we can just push the verts out a bit
-      if (capSquare) {
-        // vec2.scaleAndAdd(capEnd, last, lineA, -this.thickness);
-        const out1 = vec2.create();
-        const out2 = vec2.create();
-        vec2.add(out1, this.normal, lineA);
-        vec2.add(out2, this.normal, lineA);
-        normals.push(out2[0], out2[1], 0);
-        normals.push(out1[0], out1[1], 0);
-        positions.push(last[0], last[1], last[2] | 0, this.totalDistance - segmentDistance, -this.thickness, last[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(last[0], last[1], last[2] | 0, this.totalDistance - segmentDistance, this.thickness, last[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-      } else {
-        this.extrusions(positions, normals, last, this.normal, this.thickness, this.totalDistance - segmentDistance);
-      }
-    }
-    indices.push(index + 0, index + 1, index + 2);
-    if (!next) {
-      computeNormal(this.normal, lineA);
-      if (capSquare) {
-        const out1 = vec2.create();
-        const out2 = vec2.create();
-        vec2.sub(out2, lineA, this.normal);
-        vec2.add(out1, lineA, this.normal);
-        normals.push(out2[0], out2[1], 0);
-        normals.push(out1[0], out1[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-      } else {
-        this.extrusions(positions, normals, cur, this.normal, this.thickness, this.totalDistance);
-      }
-      indices.push(...(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-      count += 2;
-    } else {
-      // @ts-ignore
-      if (isPointEqual(cur, next)) {
-        vec2.add(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        cur, vec2.normalize(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        vec2.subtract(next, cur, last)));
-      }
-      // @ts-ignore
-      direction(lineB, next, cur);
-      // stores tangent & miter
-
-      const [miterLen, miter] = computeMiter(tangent, vec2.create(), lineA, lineB, this.thickness);
-      // normal(tmp, lineA)
-
-      // get orientation
-      let flip = vec2.dot(tangent, this.normal) < 0 ? -1 : 1;
-      let bevel = joinBevel;
-      if (!bevel && this.join === 'miter') {
-        const limit = miterLen;
-        if (limit > this.miterLimit) {
-          bevel = true;
-        }
-      }
-      if (bevel) {
-        normals.push(this.normal[0], this.normal[1], 0);
-        normals.push(miter[0], miter[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-        indices.push(...(this.lastFlip !== -flip ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-
-        // now add the bevel triangle
-        indices.push(index + 2, index + 3, index + 4);
-        computeNormal(tmp, lineB);
-        vec2.copy(this.normal, tmp); // store normal for next round
-        normals.push(this.normal[0], this.normal[1], 0);
-        positions.push(cur[0], cur[1], cur[2] | 0, this.totalDistance, -this.thickness * flip, cur[2] | 0);
-        this.complex.indexes.push(this.currentIndex);
-        this.currentIndex++;
-        count += 3;
-      } else {
-        this.extrusions(positions, normals, cur, miter, miterLen, this.totalDistance);
-        indices.push(...(this.lastFlip === 1 ? [index, index + 2, index + 3] : [index + 2, index + 1, index + 3]));
-        flip = -1;
-
-        // the miter is now the normal for our next join
-        vec2.copy(this.normal, miter);
-        count += 2;
-      }
-      this.lastFlip = flip;
-    }
-    return count;
-  }
   segment(complex, index, last, cur, next) {
     let count = 0;
     const indices = complex.indices;

package/es/wind/models/wind.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class WindModel 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;
+        UV: number;
+    };
     protected texture: ITexture2D;
     private colorModel;
     private wind;

package/es/wind/models/wind.js

@@ -7,7 +7,7 @@ import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/wind_frag.glsl' */
 const WindFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/wind_vert.glsl' */
-const WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+const WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n  v_texCoord = a_Uv;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 import { Wind } from "./windRender";
 const defaultRampColors = {
   0.0: '#3288bd',
@@ -32,6 +32,12 @@ export default class WindModel extends BaseModel {
     _defineProperty(this, "frequency", new FrequencyController(7.2));
     _defineProperty(this, "cacheZoom", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   render(options) {
     this.drawColorMode(options);
     // Tip: 控制风场的平均更新频率
@@ -108,6 +114,7 @@ export default class WindModel extends BaseModel {
         moduleName: 'wind',
         vertexShader: WindVert,
         fragmentShader: WindFrag,
+        defines: _this.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -146,6 +153,7 @@ export default class WindModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/wind/shaders/wind_vert.glsl

@@ -1,13 +1,14 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
 
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
+
 varying vec2 v_texCoord;
 #pragma include "projection"
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }