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

package/lib/utils/extrude_polyline.js

@@ -102,98 +102,6 @@ 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) {
@@ -276,131 +184,6 @@ 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 = (0, _l7Utils.aProjectFlat)([originCur[0], originCur[1]]);
-    const flatLast = (0, _l7Utils.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 = _glMatrix.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 = _glMatrix.vec2.create();
-        const out2 = _glMatrix.vec2.create();
-        _glMatrix.vec2.add(out1, this.normal, lineA);
-        _glMatrix.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 = _glMatrix.vec2.create();
-        const out2 = _glMatrix.vec2.create();
-        _glMatrix.vec2.sub(out2, lineA, this.normal);
-        _glMatrix.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)) {
-        _glMatrix.vec2.add(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        cur, _glMatrix.vec2.normalize(
-        // @ts-ignore
-        next,
-        // @ts-ignore
-        _glMatrix.vec2.subtract(next, cur, last)));
-      }
-      // @ts-ignore
-      direction(lineB, next, cur);
-      // stores tangent & miter
-
-      const [miterLen, miter] = computeMiter(tangent, _glMatrix.vec2.create(), lineA, lineB, this.thickness);
-      // normal(tmp, lineA)
-
-      // get orientation
-      let flip = _glMatrix.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);
-        _glMatrix.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
-        _glMatrix.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/lib/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/lib/wind/models/wind.js

@@ -15,7 +15,7 @@ var _windRender = require("./windRender");
 /* 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";
 const defaultRampColors = {
   0.0: '#3288bd',
   0.1: '#66c2a5',
@@ -39,6 +39,12 @@ class WindModel extends _BaseModel.default {
     (0, _defineProperty2.default)(this, "frequency", new _l7Utils.FrequencyController(7.2));
     (0, _defineProperty2.default)(this, "cacheZoom", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   render(options) {
     this.drawColorMode(options);
     // Tip: 控制风场的平均更新频率
@@ -115,6 +121,7 @@ class WindModel extends _BaseModel.default {
         moduleName: 'wind',
         vertexShader: WindVert,
         fragmentShader: WindFrag,
+        defines: _this.getDefines(),
         triangulation: _triangulation.RasterImageTriangulation,
         primitive: _l7Core.gl.TRIANGLES,
         depth: {
@@ -153,6 +160,7 @@ class WindModel extends _BaseModel.default {
       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,

package/lib/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));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.21.9",
+  "version": "2.21.11-beta.0",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -23,29 +23,29 @@
     "@turf/meta": "^6.0.2",
     "@turf/polygon-to-line": "^6.5.0",
     "@turf/union": "^6.5.0",
-    "d3-array": "1",
+    "d3-array": "^2",
     "d3-color": "^1.4.0",
     "d3-interpolate": "1.4.0",
-    "d3-scale": "2",
+    "d3-scale": "^2",
     "earcut": "^2.2.1",
     "eventemitter3": "^4.0.0",
     "extrude-polyline": "^1.0.6",
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
     "polyline-miter-util": "^1.0.1",
-    "@antv/l7-core": "2.21.9",
-    "@antv/l7-maps": "2.21.9",
-    "@antv/l7-source": "2.21.9",
-    "@antv/l7-utils": "2.21.9"
+    "@antv/l7-core": "2.21.11-beta.0",
+    "@antv/l7-maps": "2.21.11-beta.0",
+    "@antv/l7-source": "2.21.11-beta.0",
+    "@antv/l7-utils": "2.21.11-beta.0"
   },
   "devDependencies": {
-    "@types/d3-array": "^2.0.0",
+    "@types/d3-array": "^2",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
     "@types/d3-scale": "^2.1.1",
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.21.9"
+    "@antv/l7-test-utils": "^2.21.11-beta.0"
   },
   "publishConfig": {
     "access": "public",