@antv/l7-layers 2.16.1 → 2.16.2

package/es/point/shaders/animate/wave_frag.glsl

@@ -1,7 +1,6 @@
 
 uniform float u_additive;
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -14,15 +13,6 @@ uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 void main() {
 
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
-
-  float opacity = styleMappingMat[0][0];
-
   lowp float antialiasblur = v_data.z;
   float r = v_radius / (v_radius);
 
@@ -45,7 +35,7 @@ void main() {
   float N_RINGS = 3.0;
   float FREQ = 1.0;
 
- gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+  gl_FragColor = v_color;
 
   float d = length(v_data.xy);
   if(d > 0.5) {

package/es/point/shaders/earth/extrude_frag.glsl

@@ -5,7 +5,6 @@ uniform float u_pickLight: 0.0;
 
 #pragma include "picking"
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
 
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
@@ -13,31 +12,20 @@ uniform vec4 u_targetColor;
 
 uniform float u_opacitylinear: 0.0;
 uniform float u_opacitylinear_dir: 1.0;
-
+varying float v_lightWeight;
+varying float v_barLinearZ;
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float lightWeight = styleMappingMat[1][3];
-  float barLinearZ = styleMappingMat[2][3];
-
-  // 设置圆柱的底色
-  if(u_linearColor == 1.0) { // 使用渐变颜色
-    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);
-    gl_FragColor.rgb *= lightWeight;
-  } else { // 使用 color 方法传入的颜色
-     gl_FragColor = v_color;
-  }
 
-  // 应用透明度
-  gl_FragColor.a *= opacity;
+   gl_FragColor = v_color;
 
   // 开启透明度渐变
   if(u_opacitylinear > 0.0) {
-    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;
+    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - v_barLinearZ): v_barLinearZ;
   }
 
   // picking
   if(u_pickLight > 0.0) {
-    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);
+    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);
   } else {
     gl_FragColor = filterColor(gl_FragColor);
   }

package/es/point/shaders/earth/extrude_vert.glsl

@@ -20,11 +20,10 @@ varying vec4 v_color;
 
 uniform float u_opacity : 1;
 uniform float u_lightEnable: 1;
+varying float v_lightWeight;
+varying float v_barLinearZ;
+// 用于将在顶点着色器中计算好的样式值传递给片元
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "light"
@@ -48,35 +47,15 @@ float getXRadian(float y, float r) {
 
 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 - lightWeight
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(垂直方向 0 - 1 的值)
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  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 - 数据纹理映射部分的计算
   vec3 size = a_Size * a_Position;
 
   // a_Position.z 是在构建网格的时候传入的标准值 0 - 1，在插值器插值可以获取 0～1 线性渐变的值
-  styleMappingMat[2][3] =  a_Position.z;
+  v_barLinearZ =  a_Position.z;
 
   vec3 offset = size; // 控制圆柱体的大小 - 从标准单位圆柱体进行偏移
   if(u_heightfixed < 1.0) { // 圆柱体不固定高度
@@ -106,11 +85,17 @@ void main() {
   if(u_lightEnable > 0.0) { // 取消三元表达式，增强健壮性
     lightWeight = calc_lighting(pos);
   }
-  styleMappingMat[1][3] = lightWeight;
-
-  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_lightWeight = lightWeight;
+  // 设置圆柱的底色
+  if(u_linearColor == 1.0) { // 使用渐变颜色
+    v_color = mix(u_sourceColor, u_targetColor, barLinearZ);
+    v_color.rgb *= lightWeight;
+  } else { // 使用 color 方法传入的颜色
+     v_color = a_Color;
+  }
+  v_color.a *= u_opacity;
 
-  
+    
   // 在地球模式下，将原本垂直于 xy 平面的圆柱调整姿态到适应圆的角度
   //旋转矩阵mx，创建绕x轴旋转矩阵
   float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);

package/es/point/shaders/earth/fill_frag.glsl

@@ -1,6 +1,7 @@
 uniform float u_additive;
-
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+uniform float u_opacity : 1;
+uniform float u_stroke_opacity : 1;
+uniform float u_stroke_width : 2;
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -13,16 +14,6 @@ varying float v_radius;
 void main() {
   int shape = int(floor(v_data.w + 0.5));
 
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
-
-  float opacity = styleMappingMat[0][0];
-  float stroke_opacity = styleMappingMat[0][1];
-  float strokeWidth = styleMappingMat[0][2];
   vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;
 
   lowp float antialiasblur = v_data.z;
@@ -71,9 +62,9 @@ void main() {
   );
 
   if(strokeWidth < 0.01) {
-    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+    gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);
   } else {
-    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
+    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);
   }
 
   if(u_additive > 0.0) {

package/es/point/shaders/earth/fill_vert.glsl

@@ -3,9 +3,6 @@ attribute vec3 a_Position;
 attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute float a_Shape;
-
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
@@ -21,11 +18,6 @@ uniform vec2 u_offsets;
 
 uniform float u_blur : 0.0;
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-#pragma include "styleMappingCalStrokeOpacity"
-#pragma include "styleMappingCalStrokeWidth"
-
 #pragma include "projection"
 #pragma include "picking"
 
@@ -39,72 +31,6 @@ void main() {
   float newSize = setPickingSize(a_Size);
   // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;
 
-  // 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
-  );
-
-  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;
-
-  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][1] = strokeOpacityAndOffset.r;
-  textureOffset = strokeOpacityAndOffset.g;
-
-  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][2] = strokeWidthAndOffset.r;
-  textureOffset = strokeWidthAndOffset.g;
-
-  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);
-  if(hasStroke()) {
-    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R
-    textureOffset += 1.0;
-
-    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G
-    textureOffset += 1.0;
-
-    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B
-    textureOffset += 1.0;
-
-    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A
-    textureOffset += 1.0;
-  } else {
-    if(u_stroke_color == vec4(0.0)) {
-      styleMappingMat[1][0] = v_color.r;
-      styleMappingMat[1][1] = v_color.g;
-      styleMappingMat[1][2] = v_color.b;
-      styleMappingMat[1][3] = v_color.a;
-    } else {
-      styleMappingMat[1][0] = u_stroke_color.r;
-      styleMappingMat[1][1] = u_stroke_color.g;
-      styleMappingMat[1][2] = u_stroke_color.b;
-      styleMappingMat[1][3] = u_stroke_color.a;
-    }
-  }
-
-  // cal style mapping
-
   // unpack color(vec2)
   v_color = a_Color;
 
@@ -119,7 +45,7 @@ void main() {
   v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
 
 
-  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1, 1.0);
+  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + u_offsets, 1.0);
 
   setPickingColor(a_PickingColor);
 }

package/es/point/shaders/extrude/extrude_frag.glsl

@@ -1,43 +1,17 @@
 varying vec4 v_color;
-uniform float u_opacity: 1.0;
-
+varying float v_lightWeight;
 uniform float u_pickLight: 0.0;
 
 #pragma include "picking"
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
-uniform float u_linearColor: 0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-
-uniform float u_opacitylinear: 0.0;
-uniform float u_opacitylinear_dir: 1.0;
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float lightWeight = styleMappingMat[1][3];
-  float barLinearZ = styleMappingMat[2][3];
-
-  // 设置圆柱的底色
-  if(u_linearColor == 1.0) { // 使用渐变颜色
-    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);
-    gl_FragColor.rgb *= lightWeight;
-  } else { // 使用 color 方法传入的颜色
-     gl_FragColor = v_color;
-  }
-
-  // 应用透明度
-  gl_FragColor.a *= opacity;
 
+  gl_FragColor = v_color;
   // 开启透明度渐变
-  if(u_opacitylinear > 0.0) {
-    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;
-  }
-
   // picking
   if(u_pickLight > 0.0) {
-    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);
+    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);
   } else {
     gl_FragColor = filterColor(gl_FragColor);
   }

package/es/point/shaders/extrude/extrude_vert.glsl

@@ -16,14 +16,17 @@ uniform float u_r;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 varying vec4 v_color;
+varying float v_lightWeight;
+varying float v_barLinearZ;
 
 uniform float u_opacity : 1;
 uniform float u_lightEnable: 1;
+uniform float u_opacitylinear: 0.0;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+uniform float u_opacitylinear_dir: 1.0;
+uniform float  u_linearColor: 0.0;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "light"
@@ -47,37 +50,11 @@ float getXRadian(float y, float r) {
 
 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 - lightWeight
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(垂直方向 0 - 1 的值)
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  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 - 数据纹理映射部分的计算
-  vec3 size = a_Size * a_Position;
 
-  // a_Position.z 是在构建网格的时候传入的标准值 0 - 1，在插值器插值可以获取 0～1 线性渐变的值
-  styleMappingMat[2][3] =  a_Position.z;
+  vec3 size = a_Size * a_Position;
 
   vec3 offset = size; // 控制圆柱体的大小 - 从标准单位圆柱体进行偏移
+
   if(u_heightfixed < 1.0) { // 圆柱体不固定高度
     
     if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
@@ -100,14 +77,29 @@ void main() {
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
 
-  // 圆柱光照效果
+  // // 圆柱光照效果
   float lightWeight = 1.0;
+
   if(u_lightEnable > 0.0) { // 取消三元表达式，增强健壮性
     lightWeight = calc_lighting(pos);
   }
-  styleMappingMat[1][3] = lightWeight;
 
-  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_lightWeight = lightWeight;
+
+  v_color = a_Color;
+
+    // 设置圆柱的底色
+  if(u_linearColor == 1.0) { // 使用渐变颜色
+    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);
+    v_color.a =  v_color.a * u_opacity;
+  } else {
+    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);
+  }
+
+    if(u_opacitylinear > 0.0) {
+    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;
+  }
+
 
   // gl_Position = project_common_position_to_clipspace(pos);
 

package/es/point/shaders/fill_frag.glsl

@@ -1,10 +1,12 @@
 uniform float u_additive;
-
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+uniform float u_stroke_opacity : 1;
+uniform float u_stroke_width : 2;
 
 varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
+varying vec4 v_stroke;
+
 
 #pragma include "sdf_2d"
 #pragma include "picking"
@@ -12,21 +14,8 @@ varying float v_radius;
 
 void main() {
   int shape = int(floor(v_data.w + 0.5));
-
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
-
-  float opacity = styleMappingMat[0][0];
-  float stroke_opacity = styleMappingMat[0][1];
-  float strokeWidth = styleMappingMat[0][2];
-  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;
-
   lowp float antialiasblur = v_data.z;
-  float r = v_radius / (v_radius + strokeWidth);
+  float r = v_radius / (v_radius + u_stroke_width);
 
   float outer_df;
   float inner_df;
@@ -62,16 +51,16 @@ void main() {
 
   float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
 
-  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(
+  float color_t = u_stroke_width < 0.01 ? 0.0 : smoothstep(
     antialiasblur,
     0.0,
     inner_df
   );
 
-  if(strokeWidth < 0.01) {
-    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+  if(u_stroke_width < 0.01) {
+    gl_FragColor = v_color;
   } else {
-    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
+    gl_FragColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
   }
 
   if(u_additive > 0.0) {

package/es/point/shaders/fill_vert.glsl

@@ -4,36 +4,27 @@ attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute float a_Shape;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform int u_Size_Unit;
+uniform int u_size_unit;
 
 varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
+varying vec4 v_stroke;
 
-uniform float u_opacity : 1;
-uniform float u_stroke_opacity : 1;
-uniform float u_stroke_width : 2;
-uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
-uniform vec2 u_offsets;
-
-uniform float u_blur : 0.0;
-uniform float u_raisingHeight: 0.0;
-uniform float u_heightfixed: 0.0;
+// uniform float u_opacity : 1;
+uniform float u_stroke_width: 2;
+uniform vec3 u_blur_height_fixed: [0, 0, 0];
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-#pragma include "styleMappingCalStrokeOpacity"
-#pragma include "styleMappingCalStrokeWidth"
 
 #pragma include "projection"
 #pragma include "picking"
 
 
 void main() {
+  // 透明度计算
+  v_stroke = stroke;  
   vec3 extrude = a_Extrude;
   float shape_type = a_Shape;
   /*
@@ -43,88 +34,12 @@ void main() {
   float newSize = setPickingSize(a_Size);
   // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;
 
-  // 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
-  );
-
-  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;
-
-  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][1] = strokeOpacityAndOffset.r;
-  textureOffset = strokeOpacityAndOffset.g;
-
-  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][2] = strokeWidthAndOffset.r;
-  textureOffset = strokeWidthAndOffset.g;
-
-  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);
-  if(hasStroke()) {
-    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R
-    textureOffset += 1.0;
-
-    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G
-    textureOffset += 1.0;
-
-    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B
-    textureOffset += 1.0;
-
-    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A
-    textureOffset += 1.0;
-  } else {
-    if(u_stroke_color == vec4(0.0)) {
-      styleMappingMat[1][0] = v_color.r;
-      styleMappingMat[1][1] = v_color.g;
-      styleMappingMat[1][2] = v_color.b;
-      styleMappingMat[1][3] = v_color.a;
-    } else {
-      styleMappingMat[1][0] = u_stroke_color.r;
-      styleMappingMat[1][1] = u_stroke_color.g;
-      styleMappingMat[1][2] = u_stroke_color.b;
-      styleMappingMat[1][3] = u_stroke_color.a;
-    }
-  }
 
-  vec2 textrueOffsets = vec2(0.0, 0.0);
-  if(hasOffsets()) {
-    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-
-    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-  } else {
-    textrueOffsets = u_offsets;
-  }
-
-  // cal style mapping
 
   // unpack color(vec2)
-  v_color = a_Color;
-if(u_Size_Unit == 1) {
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
+
+  if(u_size_unit == 1) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
 
@@ -132,9 +47,9 @@ if(u_Size_Unit == 1) {
 
   // anti-alias
   //  float antialiased_blur = -max(u_blur, antialiasblur);
-  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);
+  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);
 
-  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);
+  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);
   vec3 aPosition = a_Position;
 
   offset = project_pixel(offset);
@@ -147,14 +62,14 @@ if(u_Size_Unit == 1) {
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
 
-  float raisingHeight = u_raisingHeight;
+  float raisingHeight = u_blur_height_fixed.y;
 
-  if(u_heightfixed < 1.0) { // false
-    raisingHeight = project_pixel(u_raisingHeight);
+  if(u_blur_height_fixed.z < 1.0) { // false
+    raisingHeight = project_pixel(u_blur_height_fixed.y);
   } else {
      if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
       float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
-      raisingHeight = u_raisingHeight * mapboxZoomScale;
+      raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;
     }
   }
  

package/es/point/shaders/image/fillImage_frag.glsl

@@ -1,7 +1,6 @@
 uniform sampler2D u_texture;
 uniform vec2 u_textSize;
-
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+uniform float u_opacity : 1;
 
 #pragma include "sdf_2d"
 #pragma include "picking"
@@ -10,11 +9,9 @@ varying vec2 v_Iconuv;
 
 void main() {
 
-  float opacity = styleMappingMat[0][0];
-
   vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;
   gl_FragColor = texture2D(u_texture, pos);
-  gl_FragColor.a *= opacity;
+  gl_FragColor.a *= u_opacity;
 
   gl_FragColor = filterColor(gl_FragColor);
 }