@antv/l7-layers 2.9.27-alpha.1 → 2.9.27-alpha.3

package/lib/wind/shaders/wind_vert.glsl

@@ -8,7 +8,7 @@ varying vec2 v_texCoord;
 void main() {
    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., 1.0));
+   
    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
       gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));
    } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.27-alpha.1",
+  "version": "2.9.27-alpha.3",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,13 +26,14 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.9.27-alpha.1",
-    "@antv/l7-maps": "2.9.27-alpha.1",
-    "@antv/l7-source": "2.9.27-alpha.1",
-    "@antv/l7-utils": "2.9.27-alpha.1",
+    "@antv/async-hook": "^2.2.2",
+    "@antv/l7-core": "2.9.27-alpha.3",
+    "@antv/l7-maps": "2.9.27-alpha.3",
+    "@antv/l7-source": "2.9.27-alpha.3",
+    "@antv/l7-utils": "2.9.27-alpha.3",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
+    "@turf/clone": "^6.5.0",
     "@turf/helpers": "^6.1.4",
     "@turf/meta": "^6.0.2",
     "@turf/polygon-to-line": "^6.5.0",
@@ -60,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "4de1a35dd04dcb651d469b77aa66ab821453005c",
+  "gitHead": "395ceeac3d64e838604f6acf8a84668488762ee3",
   "publishConfig": {
     "access": "public"
   }

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

@@ -1,79 +0,0 @@
-#define LineTexture 1.0
-uniform float u_blur : 0.99;
-uniform float u_opacity : 1.0;
-uniform float u_textureBlend;
-
-uniform float u_borderWidth: 0.0;
-uniform vec4 u_borderColor;
-varying vec4 v_color;
-
-// line texture
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-
-varying vec2 v_iconMapUV;
-
-#pragma include "picking"
-
-varying mat4 styleMappingMat;
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  gl_FragColor = v_color;
-  // anti-alias
-  // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
-  gl_FragColor.a *= opacity; // 全局透明度
-
-
-  if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
-    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
-
-    // v = max(smoothstep(0.95, 1.0, v), v);
-    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-    
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, vec2(u, v)));
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, uv));
-     vec4 pattern = texture2D(u_texture, uv);
-
-    if(u_textureBlend == 0.0) { // normal
-      pattern.a = 0.0;
-      gl_FragColor += pattern;
-    } else { // replace
-        pattern.a *= opacity;
-        if(gl_FragColor.a <= 0.0) {
-          pattern.a = 0.0;
-        }
-        gl_FragColor = pattern;
-    }
-  } 
-
-  float v = styleMappingMat[3].a;
-  float borderWidth = min(0.5, u_borderWidth);
-  // 绘制 border
-  if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth/2.0;
-
-    if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) {
-        float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, u_borderColor.rgb, linear);
-      } else if(v <= borderWidth) {
-        float linear = smoothstep(0.0, 1.0, v/borderWidth);
-        gl_FragColor.rgb = mix(u_borderColor.rgb, gl_FragColor.rgb, linear);
-      }
-    }
-
-    if(v < borderOuterWidth) {
-      gl_FragColor.a = mix(0.0, gl_FragColor.a, v/borderOuterWidth);
-    } else if(v > 1.0 - borderOuterWidth) {
-      gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);
-    }
-  }
-
-  gl_FragColor = filterColor(gl_FragColor);
-}

package/es/line/shaders/wall_vert.glsl

@@ -1,111 +0,0 @@
-#define Animate 0.0
-
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-attribute vec2 a_iconMapUV;
-
-attribute float a_Total_Distance;
-attribute float a_Distance;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
-uniform float u_icon_step: 100;
-uniform float u_heightfixed;
-
-#pragma include "projection"
-#pragma include "light"
-#pragma include "picking"
-
-varying vec4 v_color;
-varying float v_blur;
-
-// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-
-uniform float u_linearColor: 0;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "light"
-#pragma include "styleMappingCalOpacity"
-
-void main() {
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0  // distance_ratio/distance/pixelLen/texV
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
-
-  float d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-
-  v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    d_texPixelLen = project_pixel(u_icon_step);
-  } else {
-    d_texPixelLen = u_icon_step;
-  }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
-
-  if(u_aimate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
-  }
-
-  float miter = (a_Miter + 1.0)/2.0;
-  // 设置数据集的参数
-  styleMappingMat[3][0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  styleMappingMat[3][1] = a_Distance;       // 当前顶点的距离
-  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  styleMappingMat[3][3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    originSize = project_float_pixel(a_Size.x);
-  }
-
-  float wallHeight = originSize * miter;
-  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
-
-  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
-
-  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
-  // v_color = a_Color;
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
-  }
-
-  setPickingColor(a_PickingColor);
-}

package/es/mask/shaders/mask_frag.glsl

@@ -1,7 +0,0 @@
-uniform float u_opacity;
-varying vec4 v_Color;
-
-void main() {
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= u_opacity;
-}

package/es/polygon/shaders/tile/polygon_tile_frag.glsl

@@ -1,12 +0,0 @@
-uniform float u_opacity: 1.0;
-varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
-#pragma include "picking"
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= opacity;
-  gl_FragColor = filterColor(gl_FragColor);
-}

package/lib/line/shaders/tile/line_tile_frag.glsl

@@ -1,79 +0,0 @@
-#define LineTexture 1.0
-uniform float u_blur : 0.99;
-uniform float u_opacity : 1.0;
-uniform float u_textureBlend;
-
-uniform float u_borderWidth: 0.0;
-uniform vec4 u_borderColor;
-varying vec4 v_color;
-
-// line texture
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-
-varying vec2 v_iconMapUV;
-
-#pragma include "picking"
-
-varying mat4 styleMappingMat;
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  gl_FragColor = v_color;
-  // anti-alias
-  // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
-  gl_FragColor.a *= opacity; // 全局透明度
-
-
-  if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
-    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
-
-    // v = max(smoothstep(0.95, 1.0, v), v);
-    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-    
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, vec2(u, v)));
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, uv));
-     vec4 pattern = texture2D(u_texture, uv);
-
-    if(u_textureBlend == 0.0) { // normal
-      pattern.a = 0.0;
-      gl_FragColor += pattern;
-    } else { // replace
-        pattern.a *= opacity;
-        if(gl_FragColor.a <= 0.0) {
-          pattern.a = 0.0;
-        }
-        gl_FragColor = pattern;
-    }
-  } 
-
-  float v = styleMappingMat[3].a;
-  float borderWidth = min(0.5, u_borderWidth);
-  // 绘制 border
-  if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth/2.0;
-
-    if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) {
-        float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, u_borderColor.rgb, linear);
-      } else if(v <= borderWidth) {
-        float linear = smoothstep(0.0, 1.0, v/borderWidth);
-        gl_FragColor.rgb = mix(u_borderColor.rgb, gl_FragColor.rgb, linear);
-      }
-    }
-
-    if(v < borderOuterWidth) {
-      gl_FragColor.a = mix(0.0, gl_FragColor.a, v/borderOuterWidth);
-    } else if(v > 1.0 - borderOuterWidth) {
-      gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);
-    }
-  }
-
-  gl_FragColor = filterColor(gl_FragColor);
-}

package/lib/line/shaders/wall_vert.glsl

@@ -1,111 +0,0 @@
-#define Animate 0.0
-
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-attribute vec2 a_iconMapUV;
-
-attribute float a_Total_Distance;
-attribute float a_Distance;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
-uniform float u_icon_step: 100;
-uniform float u_heightfixed;
-
-#pragma include "projection"
-#pragma include "light"
-#pragma include "picking"
-
-varying vec4 v_color;
-varying float v_blur;
-
-// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-
-uniform float u_linearColor: 0;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "light"
-#pragma include "styleMappingCalOpacity"
-
-void main() {
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0  // distance_ratio/distance/pixelLen/texV
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
-
-  float d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-
-  v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    d_texPixelLen = project_pixel(u_icon_step);
-  } else {
-    d_texPixelLen = u_icon_step;
-  }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
-
-  if(u_aimate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
-  }
-
-  float miter = (a_Miter + 1.0)/2.0;
-  // 设置数据集的参数
-  styleMappingMat[3][0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  styleMappingMat[3][1] = a_Distance;       // 当前顶点的距离
-  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  styleMappingMat[3][3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    originSize = project_float_pixel(a_Size.x);
-  }
-
-  float wallHeight = originSize * miter;
-  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
-
-  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
-
-  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
-  // v_color = a_Color;
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
-  }
-
-  setPickingColor(a_PickingColor);
-}

package/lib/mask/shaders/mask_frag.glsl

@@ -1,7 +0,0 @@
-uniform float u_opacity;
-varying vec4 v_Color;
-
-void main() {
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= u_opacity;
-}

package/lib/polygon/shaders/tile/polygon_tile_frag.glsl

@@ -1,12 +0,0 @@
-uniform float u_opacity: 1.0;
-varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
-#pragma include "picking"
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= opacity;
-  gl_FragColor = filterColor(gl_FragColor);
-}