@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4

package/es/line/shaders/line_arc_3d_vert.glsl

@@ -13,9 +13,9 @@ uniform float u_global_height: 10;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
-// varying vec2 v_normal;
+
 uniform float u_line_type: 0.0;
 uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 varying vec4 v_dash_array;
@@ -85,11 +85,11 @@ float torad(float deg) {
 
 vec3 lglt2xyz(vec2 lnglat) {
   float pi = 3.1415926;
-  // TODO: + Math.PI/2 是为了对齐坐标
+  // + Math.PI/2 是为了对齐坐标
   float lng = torad(lnglat.x) + pi / 2.0;
   float lat = torad(lnglat.y);
 
-  // TODO: 手动增加一些偏移，减轻面的冲突
+  // 手动增加一些偏移，减轻面的冲突
   float radius = u_globel_radius;
 
   float z = radius * cos(lat) * cos(lng);
@@ -135,7 +135,6 @@ void main() {
   float d_distance_ratio;
    if(u_line_type == LineTypeDash) {
     d_distance_ratio = segmentIndex / segmentNumber;
-    // float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba) / 2.0 * PI;
     vec2 s = source;
     vec2 t = target;
     
@@ -146,7 +145,7 @@ void main() {
     float total_Distance = pixelDistance(s, t) / 2.0 * PI;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
   }
   styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例

package/es/line/shaders/line_arc_frag.glsl

@@ -11,7 +11,7 @@ varying vec4 v_dash_array;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture;
 uniform sampler2D u_texture;
@@ -34,10 +34,10 @@ void main() {
   
   gl_FragColor.a *= opacity;
 
-  if(u_aimate.x == Animate && u_line_texture != LineTexture) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate && u_line_texture != LineTexture) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       // alpha = smoothstep(0., 1., alpha);
       alpha = clamp(alpha, 0.0, 1.0);
       gl_FragColor.a *= alpha;
@@ -51,8 +51,8 @@ void main() {
     float count = styleMappingMat[3].g; // 贴图在弧线上重复的数量
 
     float time = 0.0;
-    if(u_aimate.x == Animate) {
-      time = u_time / u_aimate.y;
+    if(u_animate.x == Animate) {
+      time = u_time / u_animate.y;
     }
     float redioCount = arcRadio * count;
 
@@ -62,9 +62,9 @@ void main() {
 
     vec4 pattern = texture2D(u_texture, uv);
 
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       float currentPlane = floor(redioCount - time);
-      float textureStep = floor(count * u_aimate.z);
+      float textureStep = floor(count * u_animate.z);
       float a = mod(currentPlane, textureStep);
       if(a < textureStep - 1.0) {
         pattern = vec4(0.0);
@@ -85,5 +85,4 @@ void main() {
   } else {
      gl_FragColor = filterColor(gl_FragColor);
   }
-  // gl_FragColor = filterColor(gl_FragColor);
 }

package/es/line/shaders/line_arc_great_circle_frag.glsl

@@ -13,7 +13,7 @@ varying float v_distance_ratio;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture: 0.0;
 uniform sampler2D u_texture;
@@ -58,10 +58,10 @@ void main() {
   }
 
   // 设置弧线的动画模式
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }
@@ -73,7 +73,7 @@ void main() {
     float count = styleMappingMat[3].b; // 贴图在弧线上重复的数量
     float u = fract(arcRadio * count - animateSpeed * count);
     // float u = fract(arcRadio * count - animateSpeed);
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       u = gl_FragColor.a/opacity;
     }
 

package/es/line/shaders/line_arc_great_circle_vert.glsl

@@ -10,9 +10,8 @@ attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
-// varying vec2 v_normal;
 
 varying float v_distance_ratio;
 uniform float u_line_type: 0.0;
@@ -172,7 +171,7 @@ void main() {
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
   }
 
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       v_distance_ratio = segmentIndex / segmentNumber;
   }
 

package/es/line/shaders/line_arc_vert.glsl

@@ -8,7 +8,7 @@ attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
 
 uniform float u_lineDir: 1.0;
@@ -52,8 +52,10 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   // return mid;
 }
 float getSegmentRatio(float index) {
-    // return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
-     return index / (segmentNumber - 1.);
+    // dash: index / (segmentNumber - 1.);
+    // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+    return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+    //  return index / (segmentNumber - 1.);
 }
 vec2 interpolate (vec2 source, vec2 target, float t, float arcThetaOffset) {
   // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
@@ -121,7 +123,7 @@ void main() {
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
   
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
       if(u_lineDir != 1.0) {
         d_distance_ratio = 1.0 - d_distance_ratio;

package/es/line/shaders/line_bezier_vert.glsl

@@ -7,7 +7,7 @@ attribute vec4 a_Instance;
 attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
 varying vec2 v_normal;
 
@@ -72,7 +72,7 @@ void main() {
       float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba) / 2.0 * PI;
       v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
     }
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       v_distance_ratio = segmentIndex / segmentNumber;
   }
   vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio), 0.0, 1.0));

package/es/line/shaders/line_frag.glsl

@@ -19,7 +19,7 @@ varying vec2 v_iconMapUV;
 #pragma include "picking"
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ]; // 控制运动
+uniform vec4 u_animate: [ 1, 2., 1.0, 0.2 ]; // 控制运动
 
 varying mat4 styleMappingMat;
 // [animate, duration, interval, trailLength],
@@ -31,10 +31,10 @@ void main() {
   // anti-alias
   // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
   gl_FragColor.a *= opacity; // 全局透明度
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + animateSpeed);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }
@@ -95,6 +95,5 @@ void main() {
     gl_FragColor.a *= mix(u_blur.g, u_blur.b, (blurV - 0.5)/0.5);
   }
   
-
   gl_FragColor = filterColor(gl_FragColor);
 }

package/es/line/shaders/line_vert.glsl

@@ -15,7 +15,7 @@ attribute vec2 a_DistanceAndIndex;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 uniform float u_icon_step: 100;
 
 uniform float u_heightfixed: 0.0;

package/es/line/shaders/linear/arc3d_linear_frag.glsl

@@ -6,9 +6,8 @@ uniform float u_blur : 0.9;
 varying float v_segmentIndex;
 uniform float segmentNumber;
 
-
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
@@ -27,16 +26,16 @@ void main() {
 
   gl_FragColor.a *= opacity;
 
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
 
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       // alpha = smoothstep(0., 1., alpha);
       alpha = clamp(alpha, 0.0, 1.0);
       gl_FragColor.a *= alpha;
 
-      // u_aimate 
+      // u_animate 
       // x enable
       // y duration
       // z interval

package/es/line/shaders/linear/arc3d_linear_vert.glsl

@@ -6,6 +6,7 @@ attribute vec3 a_Position;
 attribute vec4 a_Instance;
 attribute vec4 a_Color;
 attribute float a_Size;
+attribute vec2 a_iconMapUV;
 
 uniform float u_globel;
 uniform float u_globel_radius;
@@ -13,23 +14,21 @@ uniform float u_global_height: 10;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
-varying vec4 v_color;
-// varying vec2 v_normal;
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+
 uniform float u_line_type: 0.0;
 uniform vec4 u_dash_array: [10.0, 5., 0, 0];
-varying vec4 v_dash_array;
-
 uniform float u_icon_step: 100;
 uniform float u_line_texture: 0.0;
-varying float v_segmentIndex;
+uniform float u_opacity: 1.0;
 
-attribute vec2 a_iconMapUV;
+varying vec4 v_dash_array;
+varying vec4 v_color;
+varying float v_segmentIndex;
 varying vec2 v_iconMapUV;
-
-uniform float u_opacity: 1.0;
 varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
+
 #pragma include "styleMapping"
 #pragma include "styleMappingCalOpacity"
 
@@ -85,11 +84,11 @@ float torad(float deg) {
 
 vec3 lglt2xyz(vec2 lnglat) {
   float pi = 3.1415926;
-  // TODO: + Math.PI/2 是为了对齐坐标
+  // + Math.PI/2 是为了对齐坐标
   float lng = torad(lnglat.x) + pi / 2.0;
   float lat = torad(lnglat.y);
 
-  // TODO: 手动增加一些偏移，减轻面的冲突
+  // 手动增加一些偏移，减轻面的冲突
   float radius = u_globel_radius;
 
   float z = radius * cos(lat) * cos(lng);
@@ -146,7 +145,7 @@ void main() {
     float total_Distance = pixelDistance(s, t) / 2.0 * PI;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
   }
   styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例

package/es/line/shaders/linear/arc_linear_frag.glsl

@@ -10,7 +10,7 @@ varying vec4 v_dash_array;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture;
 uniform sampler2D u_texture;

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

@@ -0,0 +1,25 @@
+attribute float a_Miter;
+attribute vec4 a_Color;
+attribute vec3 a_Normal;
+attribute vec3 a_Position;
+
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+uniform float u_size;
+
+#pragma include "projection"
+
+void main() {
+
+  vec3 size = a_Miter * u_size * reverse_offset_normal(a_Normal);
+  
+  vec2 offset = project_pixel(size.xy);
+
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
+  }
+}

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

@@ -1,210 +1,52 @@
-
 attribute float a_Miter;
 attribute vec4 a_Color;
 attribute vec2 a_Size;
 attribute vec3 a_Normal;
 attribute vec3 a_Position;
 
-attribute vec2 a_iconMapUV;
-
-// dash line
-attribute float a_Total_Distance;
-attribute vec2 a_DistanceAndIndex;
-
-uniform vec2 u_tileOrigin;
-uniform float u_coord;
+// uniform vec2 u_tileOrigin;
+// uniform float u_coord;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_icon_step: 100;
 
-uniform float u_heightfixed: 0.0;
-uniform float u_vertexScale: 1.0;
 
 #pragma include "projection"
 #pragma include "picking"
 
 varying vec4 v_color;
 
-// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-
-
-uniform float u_linearColor: 0;
-uniform float u_arrow: 0.0;
-uniform float u_arrowHeight: 3.0;
-uniform float u_arrowWidth: 2.0;
-uniform float u_tailWidth: 1.0;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-
-vec2 calculateArrow(vec2 offset) {
-  /*
-  * 在支持箭头的时候，第二、第三组顶点是额外插入用于构建顶点的
-  */
-  float arrowFlag = -1.0;
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    // 高德 2.0 的旋转角度不同
-    arrowFlag = 1.0;
-  }
-  float pi = arrowFlag * 3.1415926/2.;
-  if(a_Miter < 0.) {
-    // 根据线的两侧偏移不同、旋转的方向相反
-    pi = -pi;
-  }
-  highp float angle_sin = sin(pi);
-  highp float angle_cos = cos(pi);
-  // 计算垂直与线方向的旋转矩阵
-  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
-  float arrowWidth = u_arrowWidth;
-  float arrowHeight = u_arrowHeight;
-
-  vec2 arrowOffset = vec2(0.0);
-  /*
-  * a_DistanceAndIndex.y 用于标记当前顶点属于哪一组（两个顶点一组，构成线的其实是矩形，最简需要四个顶点、两组顶点构成）
-  */
-  if(a_DistanceAndIndex.y == 0.0) {
-    // 箭头尖部
-    offset = vec2(0.0);
-  } else if(a_DistanceAndIndex.y == 1.0) {
-    // 箭头两侧
-    arrowOffset = rotation_matrix*(offset * arrowHeight);
-    offset += arrowOffset; // 沿线偏移
-    offset = offset * arrowWidth; // 垂直线向外偏移（是构建箭头两侧的顶点）
-  } else if(a_DistanceAndIndex.y == 2.0 || a_DistanceAndIndex.y == 3.0 || a_DistanceAndIndex.y == 4.0) {
-    // 偏移其余的点位（将长度让位给箭头）
-    arrowOffset = rotation_matrix*(offset * arrowHeight) * arrowWidth;
-    offset += arrowOffset;// 沿线偏移
-  }
-
-  return offset;
-}
-
 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_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-
-  v_iconMapUV = a_iconMapUV;
-  d_texPixelLen = project_float_pixel(u_icon_step);
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
-
   v_color = a_Color;
 
   vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
   
   vec2 offset = project_pixel(size.xy);
 
-  float lineDistance = a_DistanceAndIndex.x;
-  float currentLinePointRatio = lineDistance / a_Total_Distance;
- 
-  if(u_arrow > 0.0) {
-      //  计算箭头
-    offset = calculateArrow(offset);
-
-    if(a_DistanceAndIndex.y > 4.0) {
-      offset *= mix(1.0, u_tailWidth, currentLinePointRatio);
-    }
-  }
-
-  float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // 线横向偏移的距离（向两侧偏移的和）
-  float linePixelSize = project_pixel(a_Size.x) * 2.0;  // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
-  float texV = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
-
-  // 设置数据集的参数
-  styleMappingMat[3][0] = currentLinePointRatio; // 当前点位距离占线总长的比例
-  styleMappingMat[3][1] = lineDistance;       // 当前顶点的距离
-  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  styleMappingMat[3][3] = texV;             // 线图层贴图部分的 v 坐标值
-
   vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
 
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));
-
-  float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况 vertex height
-  float lineHeight = a_Size.y; // size 第二个参数代表的高度 [linewidth, lineheight]
-
-if(u_coord > 0.0) {
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    lineHeight *= 0.2; // 保持和 amap/mapbox 一致的效果
-    h *= 0.2;
-    if(u_heightfixed < 1.0) {
-      lineHeight = project_pixel(a_Size.y);
-    }
-    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h, 1.0));
-  } else {
-    // mapbox -  amap
-    
-    // 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // mapbox
-      // 保持高度相对不变
-      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
-      h *= mapboxZoomScale;
-      if(u_heightfixed > 0.0) {
-        lineHeight *= mapboxZoomScale;
-      }
-      
+  // if(u_coord > 0.0) { // 使用经纬度坐标
+      if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+      gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));
     } else {
-      // amap
-      // lineHeight 顶点偏移高度
-      if(u_heightfixed < 1.0) {
-        lineHeight *= pow(2.0, 20.0 - u_Zoom);
-      }
+      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
     }
+  // } else { // 使用偏移坐标
+  //   vec2 pointPos = a_Position.xy;
+  //   vec4 tileWorld = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // 瓦片起始点的世界坐标
 
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));
-  }
-} else {
-  vec2 pointPos = a_Position.xy;
-  vec4 tileWorld = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // 瓦片起始点的世界坐标
-
-  vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // 瓦片内的点的偏移坐标
-  
-  tileWorld.xy += pointOffset;
-
-  tileWorld.xy += offset;
-
-  if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-    // Needs to be divided with project_uCommonUnitsPerMeter
-    tileWorld.w *= u_PixelsPerMeter.z;
-  }
+  //   vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // 瓦片内的点的偏移坐标
+    
+  //   tileWorld.xy += pointOffset;
 
-  gl_Position = u_ViewProjectionMatrix * tileWorld + u_ViewportCenterProjection;
-}
+  //   tileWorld.xy += offset;
 
+  //   if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+  //     // Needs to be divided with project_uCommonUnitsPerMeter
+  //     tileWorld.w *= u_PixelsPerMeter.z;
+  //   }
+  //   gl_Position = u_ViewProjectionMatrix * tileWorld + u_ViewportCenterProjection;
+  // }
 
   setPickingColor(a_PickingColor);
-
-
 }

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

@@ -0,0 +1,15 @@
+attribute vec3 a_Position;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+#pragma include "projection"
+
+void main() {
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xy, 0.0, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
+  }
+}

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

@@ -0,0 +1,21 @@
+attribute vec4 a_Color;
+attribute vec3 a_Position;
+
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+#pragma include "projection"
+
+varying vec4 v_color;
+
+void main() {
+  v_color = a_Color; 
+
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xy, 0.0, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
+  }
+}