@antv/l7-layers 2.16.1 → 2.16.2

package/es/line/shaders/line_arc_3d_vert.glsl

@@ -26,12 +26,7 @@ varying float v_segmentIndex;
 
 attribute vec2 a_iconMapUV;
 varying vec2 v_iconMapUV;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec4 v_line_data;
 
 #pragma include "projection"
 #pragma include "project"
@@ -99,31 +94,6 @@ vec3 lglt2xyz(vec2 lnglat) {
 }
 
 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  // dataset 数据集
-  );
-
-  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 - 数据纹理映射部分的计算
 
   v_color = a_Color;
   vec2 source = project_position(vec4(a_Instance.rg, 0, 0)).xy;
@@ -148,7 +118,7 @@ void main() {
     if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
   }
-  styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例
+  v_line_data.g = d_distance_ratio; // 当前点位距离占线总长的比例
 
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   vec3 curr = getPos(source, target, segmentRatio);
@@ -162,12 +132,12 @@ void main() {
 
     float arcDistrance = length(source - target);
     float pixelLen =  project_pixel_texture(u_icon_step);
-    styleMappingMat[3].b = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
+    v_line_data.b = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
 
     vec2 projectOffset = project_pixel(offset);
     float lineOffsetWidth = length(projectOffset + projectOffset * sign(a_Position.y)); // 线横向偏移的距离
     float linePixelSize = project_pixel(a_Size);  // 定点位置偏移，按地图等级缩放后的距离
-    styleMappingMat[3].a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
+    v_line_data.a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
 
     v_iconMapUV = a_iconMapUV;
   }

package/es/line/shaders/line_arc_frag.glsl

@@ -19,24 +19,20 @@ uniform vec2 u_textSize;
 
 uniform float segmentNumber;
 varying vec2 v_iconMapUV;
+varying vec4 v_lineData;
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
 
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
   float animateSpeed = 0.0; // 运动速度
-  float d_segmentIndex = styleMappingMat[3].r;   // 当前顶点在弧线中所处的分段位置
-  float d_distance_ratio = styleMappingMat[3].b; // 当前顶点在弧线中所处的分段比例
-
   gl_FragColor = v_color;
   
-  gl_FragColor.a *= opacity;
+  gl_FragColor.a *= u_opacity;
 
   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);
+      float alpha =1.0 - fract( mod(1.0- v_lineData.b, 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);
@@ -45,10 +41,10 @@ void main() {
 
   // 当存在贴图时在底色上贴上贴图
   if(u_line_texture == LineTexture) { // while load texture
-    float arcRadio = smoothstep( 0.0, 1.0, (d_segmentIndex / segmentNumber));
+    float arcRadio = smoothstep( 0.0, 1.0, (v_lineData.r / segmentNumber));
     // float arcRadio = smoothstep( 0.0, 1.0, d_distance_ratio);
 
-    float count = styleMappingMat[3].g; // 贴图在弧线上重复的数量
+    float count = v_lineData.g; // 贴图在弧线上重复的数量
 
     float time = 0.0;
     if(u_animate.x == Animate) {
@@ -57,7 +53,7 @@ void main() {
     float redioCount = arcRadio * count;
 
     float u = fract(redioCount - time);
-    float v = styleMappingMat[3].a; // 横向 v
+    float v = v_lineData.a; // 横向 v
     vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
 
     vec4 pattern = texture2D(u_texture, uv);
@@ -75,7 +71,7 @@ void main() {
       pattern.a = 0.0;
       gl_FragColor = filterColor(gl_FragColor + pattern);
     } else { // replace
-        pattern.a *= opacity;
+        pattern.a *= u_opacity;
         if(gl_FragColor.a <= 0.0) {
           pattern.a = 0.0;
         }

package/es/line/shaders/line_arc_great_circle_frag.glsl

@@ -25,17 +25,16 @@ varying vec2 v_iconMapUV;
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
-
-varying mat4 styleMappingMat;
+varying vec4 v_line_data;
 
 #pragma include "picking"
 #pragma include "project"
 #pragma include "projection"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
+  float opacity = u_opacity;
   float animateSpeed = 0.0;
-  float d_segmentIndex = styleMappingMat[3].g;
+  float d_segmentIndex = v_line_data.g;
   
   // 设置弧线的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
@@ -70,14 +69,14 @@ void main() {
   if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { 
     float arcRadio = smoothstep( 0.0, 1.0, (d_segmentIndex / (segmentNumber - 1.0)));
     // float arcRadio = d_segmentIndex / (segmentNumber - 1.0);
-    float count = styleMappingMat[3].b; // 贴图在弧线上重复的数量
+    float count = v_line_data.b; // 贴图在弧线上重复的数量
     float u = fract(arcRadio * count - animateSpeed * count);
     // float u = fract(arcRadio * count - animateSpeed);
     if(u_animate.x == Animate) {
       u = gl_FragColor.a/opacity;
     }
 
-    float v = styleMappingMat[3].a; // 线图层贴图部分的 v 坐标值
+    float v = v_line_data.a; // 线图层贴图部分的 v 坐标值
 
     vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
     vec4 pattern = texture2D(u_texture, uv);

package/es/line/shaders/line_arc_great_circle_vert.glsl

@@ -23,12 +23,8 @@ uniform float u_line_texture: 0.0;
 
 attribute vec2 a_iconMapUV;
 varying vec2 v_iconMapUV;
+varying vec4 v_line_data;
 
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "project"
@@ -123,31 +119,7 @@ vec2 interpolate (vec2 source, vec2 target, float angularDist, float t) {
 }
 
 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  // dataset 数据集
-  );
-
-  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 - 数据纹理映射部分的计算
 
   v_color = a_Color;
   vec2 source = radians(a_Instance.rg);
@@ -184,7 +156,7 @@ void main() {
   //  vec4 project_pos = project_position(vec4(curr.xy, 0, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(curr.xy + offset, curr.z, 1.0));
 
-  styleMappingMat[3].g = a_Position.x; // 该顶点在弧线上的分段排序
+v_line_data.g = a_Position.x; // 该顶点在弧线上的分段排序
   if(LineTexture == u_line_texture) { // 开启贴图模式  
     // float mapZoomScale = u_CoordinateSystem !== COORDINATE_SYSTEM_P20_2?10000000.0:1.0;
     float d_arcDistrance = length(source - target);
@@ -195,11 +167,11 @@ void main() {
       d_arcDistrance = project_pixel_allmap(d_arcDistrance);
     }
     float d_pixelLen = project_pixel(u_icon_step)/8.0;
-    styleMappingMat[3].b = floor(d_arcDistrance/d_pixelLen); // 贴图在弧线上重复的数量
+v_line_data.b = floor(d_arcDistrance/d_pixelLen); // 贴图在弧线上重复的数量
 
     float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
     float linePixelSize = project_pixel(a_Size);  // 定点位置偏移，按地图等级缩放后的距离
-    styleMappingMat[3].a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
+v_line_data.a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
 
     v_iconMapUV = a_iconMapUV;
   }

package/es/line/shaders/line_arc_vert.glsl

@@ -18,13 +18,11 @@ uniform float u_icon_step: 100;
 uniform float u_line_texture: 0.0;
 attribute vec2 a_iconMapUV;
 varying vec2 v_iconMapUV;
+varying vec4 v_lineData;
+varying vec2 v_distance_ratio;
 
 uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-#pragma include "styleMappingCalThetaOffset"
 
 #pragma include "projection"
 #pragma include "project"
@@ -83,37 +81,6 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
 void main() {
   v_color = a_Color;
 
-  // 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  // dataset 数据集
-  );
-
-  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 -> thetaOffset... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-
-  vec2 thetaOffsetAndOffset = calThetaOffsetAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][1] = thetaOffsetAndOffset.r;
-  textureOffset = thetaOffsetAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
-
-  
   vec2 source = a_Instance.rg;  // 起始点
   vec2 target =  a_Instance.ba; // 终点
   float segmentIndex = a_Position.x;
@@ -130,20 +97,17 @@ void main() {
       }
   }
 
-   styleMappingMat[3].b = d_distance_ratio;
+ v_lineData.b = d_distance_ratio;
+
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
 
-  // styleMappingMat[0][1] - arcThetaOffset
-  float arcThetaOffset = styleMappingMat[0][1];
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, arcThetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, arcThetaOffset), 0.0, 1.0));
-  // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
-  //unProjCustomCoord
   
   vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
 
 
   float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
-  styleMappingMat[3].r = d_segmentIndex;
+ v_lineData.r = d_segmentIndex;
 
   if(LineTexture == u_line_texture) { // 开启贴图模式
 
@@ -159,11 +123,11 @@ void main() {
 
     float pixelLen = project_pixel_texture(u_icon_step); // 贴图沿弧线方向的长度 - 随地图缩放改变
     float texCount = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
-     styleMappingMat[3].g = texCount;
+    v_lineData.g = texCount;
 
     float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
     float linePixelSize = project_pixel(a_Size); // 定点位置偏移
-     styleMappingMat[3].a = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
+    v_lineData.a = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
   }
   
 

package/es/line/shaders/line_frag.glsl

@@ -1,3 +1,4 @@
+#extension GL_OES_standard_derivatives : enable
 #define Animate 0.0
 #define LineTexture 1.0
 uniform float u_opacity : 1.0;
@@ -13,24 +14,22 @@ varying vec4 v_color;
 uniform float u_line_texture;
 uniform sampler2D u_texture;
 uniform vec2 u_textSize;
-
 varying vec2 v_iconMapUV;
+varying vec4 v_texture_data;
+
 
 #pragma include "picking"
 
 uniform float u_time;
 uniform vec4 u_animate: [ 1, 2., 1.0, 0.2 ]; // 控制运动
-
-varying mat4 styleMappingMat;
 // [animate, duration, interval, trailLength],
 void main() {
-  float opacity = styleMappingMat[0][0];
   float animateSpeed = 0.0; // 运动速度
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
+  float d_distance_ratio = v_texture_data.r; // 当前点位距离占线总长的比例
   gl_FragColor = v_color;
   // anti-alias
   // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
-  gl_FragColor.a *= opacity; // 全局透明度
+  gl_FragColor.a *= u_opacity; // 全局透明度
   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);
@@ -40,23 +39,20 @@ void main() {
   }
 
   if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
+    float aDistance = v_texture_data.g;      // 当前顶点的距离
+    float d_texPixelLen = v_texture_data.b;  // 贴图的像素长度，根据地图层级缩放
     float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
+    float v = v_texture_data.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;
+        pattern.a *= u_opacity;
         if(gl_FragColor.a <= 0.0) {
           pattern.a = 0.0;
         }
@@ -64,15 +60,17 @@ void main() {
     }
   } 
 
-  float v = styleMappingMat[3].a;
+  float v = v_texture_data.a;
   float borderWidth = min(0.5, u_borderWidth);
   // 绘制 border
   if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth/2.0;
+    float borderOuterWidth = borderWidth / 2.0;
+
 
     if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) {
+      if(v > borderWidth) { // 外侧
         float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
+        //  float linear = step(0.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);
@@ -88,7 +86,7 @@ void main() {
   }
 
   // blur
-  float blurV = styleMappingMat[3][3];
+  float blurV = v_texture_data.a;
   if(blurV < 0.5) {
     gl_FragColor.a *= mix(u_blur.r, u_blur.g, blurV/0.5);
   } else {

package/es/line/shaders/line_vert.glsl

@@ -37,11 +37,7 @@ 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"
+varying vec4 v_texture_data;
 
 vec2 calculateArrow(vec2 offset) {
   /*
@@ -87,31 +83,7 @@ vec2 calculateArrow(vec2 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;
@@ -141,12 +113,9 @@ void main() {
   float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // 线横向偏移的距离（向两侧偏移的和）
   float linePixelSize = project_pixel(a_Size.x) * 2.0;  // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
   float texV = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
-
+  
+  v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);
   // 设置数据集的参数
-  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));
 

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

@@ -1,34 +1,20 @@
 
 #define Animate 0.0
-
-uniform float u_opacity;
-uniform float u_blur : 0.9;
-varying float v_segmentIndex;
-uniform float segmentNumber;
-
 uniform float u_time;
 uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+varying vec4 v_Color;
 
-uniform float u_linearColor: 0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-
-varying mat4 styleMappingMat;
-
+varying float v_distance_ratio;
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float animateSpeed = 0.0; // 运动速度
-  float d_distance_ratio = styleMappingMat[3].g; // 当前点位距离占线总长的比例
-
-  gl_FragColor = mix(u_sourceColor, u_targetColor, v_segmentIndex/segmentNumber);
 
-  gl_FragColor.a *= opacity;
+  float animateSpeed = 0.0; // 运动速度
+  gl_FragColor = v_Color;
 
   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);
+      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);

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

@@ -15,22 +15,19 @@ uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
 uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
 
 uniform float u_line_type: 0.0;
 uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 uniform float u_icon_step: 100;
 uniform float u_line_texture: 0.0;
-uniform float u_opacity: 1.0;
+varying float v_distance_ratio;
 
 varying vec4 v_dash_array;
 varying vec4 v_color;
-varying float v_segmentIndex;
 varying vec2 v_iconMapUV;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec4 v_Color;
 
 #pragma include "projection"
 #pragma include "project"
@@ -99,30 +96,6 @@ vec3 lglt2xyz(vec2 lnglat) {
 
 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  // dataset 数据集
-  );
-
-  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 - 数据纹理映射部分的计算
 
   v_color = a_Color;
   vec2 source = project_position(vec4(a_Instance.rg, 0, 0)).xy;
@@ -146,32 +119,20 @@ void main() {
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
     if(u_animate.x == Animate) {
-      d_distance_ratio = segmentIndex / segmentNumber;
+      v_distance_ratio = segmentIndex / segmentNumber;
   }
-  styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例
+
 
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   vec3 curr = getPos(source, target, segmentRatio);
   vec3 next = getPos(source, target, nextSegmentRatio);
   vec2 offset = getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y);
-  // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
-
 
-  v_segmentIndex = a_Position.x;
-  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { // 开启贴图模式  
+  float animateSpeed = 0.0; // 运动速度
+  v_Color = mix(u_sourceColor, u_targetColor, a_Position.x/segmentNumber);
 
-    float arcDistrance = length(source - target);
-    float pixelLen =  project_pixel_texture(u_icon_step);
-    styleMappingMat[3].b = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
+  v_Color.a *= opacity;
 
-    vec2 projectOffset = project_pixel(offset);
-    float lineOffsetWidth = length(projectOffset + projectOffset * sign(a_Position.y)); // 线横向偏移的距离
-    float linePixelSize = project_pixel(a_Size);  // 定点位置偏移，按地图等级缩放后的距离
-    styleMappingMat[3].a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
-
-    v_iconMapUV = a_iconMapUV;
-  }
-  
 
   // gl_Position = project_common_position_to_clipspace(vec4(curr.xy + project_pixel(offset), curr.z, 1.0));
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x

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

@@ -1,38 +1,10 @@
-#define Animate 0.0
-#define LineTexture 1.0
-
-uniform float u_opacity;
-uniform float u_textureBlend;
-uniform float u_blur : 0.9;
-uniform float u_line_type: 0.0;
-// varying vec2 v_normal;
-varying vec4 v_dash_array;
 varying vec4 v_color;
 
-uniform float u_time;
-uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
-
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-
-uniform float segmentNumber;
-varying vec2 v_iconMapUV;
-
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
-uniform float u_linearColor: 0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float d_segmentIndex = styleMappingMat[3].r;   // 当前顶点在弧线中所处的分段位置
+// 当前顶点在弧线中所处的分段位置
 
-  // 设置弧线的底色
-  gl_FragColor = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
-  gl_FragColor.a *= opacity;
+  gl_FragColor = v_Color;
   gl_FragColor = filterColor(gl_FragColor);
 }