@antv/l7-layers 2.16.0 → 2.16.2

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);
 }

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

@@ -5,12 +5,10 @@ attribute float a_Size;
 attribute vec2 a_Uv;
 attribute float a_Rotate;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform mat2 u_RotateMatrix;
-uniform int u_Size_Unit;
+uniform int u_size_unit;
 
 varying vec2 v_uv; // 本身的 uv 坐标
 varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
@@ -20,69 +18,28 @@ uniform float u_heightfixed: 0.0;
 uniform float u_opacity : 1;
 uniform vec2 u_offsets;
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+
 
 #pragma include "projection"
 #pragma include "picking"
 
 void main() {
   vec3 extrude = a_Extrude;
-
   v_uv = (a_Extrude.xy + 1.0)/2.0;
   v_uv.y = 1.0 - v_uv.y;
   v_Iconuv = a_Uv;
 
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - empty - empty - empty
-    0.0, 0.0, 0.0, 0.0, // empty - empty - empty - empty
-    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 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
 
   highp float angle_sin = sin(a_Rotate);
   highp float angle_cos = cos(a_Rotate);
   mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
   float newSize = a_Size;
-  if(u_Size_Unit == 1) {
+  if(u_size_unit == 1) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
 
   // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
-  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + textrueOffsets);
+  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + u_offsets);
   vec3 aPosition = a_Position;
 
   offset = project_pixel(offset);

package/es/point/shaders/image_frag.glsl

@@ -5,13 +5,9 @@ varying vec2 v_uv;
 uniform vec2 u_textSize;
 uniform float u_opacity : 1;
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
 #pragma include "picking"
 
 void main(){
-      float opacity = styleMappingMat[0][0];
-      float size = styleMappingMat[1][0];
       vec2 pos = v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;
       vec4 textureColor;
 
@@ -34,7 +30,7 @@ void main(){
             gl_FragColor= step(0.01, textureColor.z) * v_color;
       }
 
-      gl_FragColor.a = gl_FragColor.a * opacity;
+      gl_FragColor.a = gl_FragColor.a * u_opacity;
       
       if (gl_FragColor.a < 0.01) {
          discard;

package/es/point/shaders/image_vert.glsl

@@ -13,61 +13,18 @@ uniform float u_opacity : 1;
 uniform float u_raisingHeight: 0.0;
 uniform float u_heightfixed: 0.0;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "picking"
 
 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
-  );
-
-  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;
-
-  styleMappingMat[1][0] = a_Size;
-
-  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 - 数据纹理映射部分的计算
   v_color = a_Color;
   v_uv = a_Uv;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
    
-  vec2 offset = project_pixel(textrueOffsets);
+  vec2 offset = project_pixel(u_offsets);
 
   float raisingHeight = u_raisingHeight;
   if(u_heightfixed < 1.0) { // false

package/es/point/shaders/normal_frag.glsl

@@ -1,6 +1,4 @@
-uniform float u_opacity : 1;
 varying vec4 v_color;
 void main() {
   gl_FragColor = v_color;
-  gl_FragColor.a *= u_opacity;
 }

package/es/point/shaders/normal_vert.glsl

@@ -1,6 +1,7 @@
 
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
+uniform float u_opacity : 1;
 uniform mat4 u_Mvp;
 attribute float a_Size;
 attribute vec4 a_Color;
@@ -11,7 +12,7 @@ varying vec4 v_color;
 #pragma include "project"
 
 void main() {
-  v_color = a_Color;
+  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity);
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);

package/es/point/shaders/radar/radar_vert.glsl

@@ -7,7 +7,7 @@ uniform float u_time;
 
 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;
@@ -37,7 +37,7 @@ void main() {
   float blur = 0.0;
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);
 
-  if(u_Size_Unit == 1) {
+  if(u_size_unit == 1) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
   // radius(16-bit)

package/es/point/shaders/simplePoint_frag.glsl

@@ -1,14 +1,10 @@
 
-uniform float u_opacity : 1;
-uniform vec2 u_offsets;
 uniform float u_additive;
-
 uniform float u_stroke_opacity : 1;
 
 uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
 
 varying vec4 v_color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
 varying float v_blur;
 varying float v_innerRadius;
 
@@ -16,7 +12,6 @@ varying float v_innerRadius;
 void main() {
   vec2 center = vec2(0.5);
 
-  float opacity = styleMappingMat[0][0];
   // Tip: 片元到中心点的距离 0 - 1
   float fragmengTocenter = distance(center, gl_PointCoord) * 2.0;
   // Tip: 片元的剪切成圆形
@@ -40,8 +35,6 @@ void main() {
     gl_FragColor = v_color;
   }
 
-  gl_FragColor.a *= opacity;
-
   gl_FragColor = filterColor(gl_FragColor);
   
   if(u_additive > 0.0) {

package/es/point/shaders/simplePoint_vert.glsl

@@ -10,62 +10,20 @@ uniform float u_opacity : 1;
 uniform vec2 u_offsets;
 uniform float u_stroke_width;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 varying float v_blur;
 varying float v_innerRadius;
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+
 
 #pragma include "projection"
 #pragma include "picking"
 #pragma include "project"
 void main() {
-  v_color = a_Color;
+  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity);
   v_blur = 1.0 - max(2.0/a_Size, 0.05);
   v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);
-
-  // 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 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
   
-  vec2 offset = project_pixel(textrueOffsets);
+  vec2 offset = project_pixel(u_offsets);
   
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * vec4(a_Position.xy + offset, a_Position.z, 1.0);

package/es/point/shaders/text_frag.glsl

@@ -3,47 +3,34 @@
 #define FONT_SIZE 48.0
 uniform sampler2D u_sdf_map;
 uniform float u_gamma_scale : 0.5;
-// uniform float u_font_size : 24.0;
-uniform float u_opacity : 1.0;
-uniform vec4 u_stroke_color : [0, 0, 0, 1];
 uniform float u_stroke_width : 2.0;
 uniform float u_halo_blur : 0.5;
 uniform float u_DevicePixelRatio;
 
 varying vec4 v_color;
+varying vec4 v_stroke_color;
 varying vec2 v_uv;
 varying float v_gamma_scale;
 varying float v_fontScale;
 
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
 
 #pragma include "picking"
 void main() {
   // get style data mapping
-  float opacity = styleMappingMat[0][0];
-  float strokeWidth = styleMappingMat[0][2];
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
 
   // get sdf from atlas
   float dist = texture2D(u_sdf_map, v_uv).a;
 
-  // float fontScale = u_font_size / FONT_SIZE;
-
-  // lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;
-  lowp float buff = (6.0 - strokeWidth / v_fontScale) / SDF_PX;
+  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;
   highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;
 
   highp float gamma_scaled = gamma * v_gamma_scale;
 
   highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
-  // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));
-  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));
-  gl_FragColor.a= gl_FragColor.a * alpha;
+
+  gl_FragColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));
+
+  gl_FragColor.a *= alpha;
    // 作为 mask 模板时需要丢弃透明的像素
   if (gl_FragColor.a < 0.01) {
     discard;

package/es/point/shaders/text_vert.glsl

@@ -16,86 +16,25 @@ uniform float u_raisingHeight: 0.0;
 varying vec2 v_uv;
 varying float v_gamma_scale;
 varying vec4 v_color;
+varying vec4 v_stroke_color;
 varying float v_fontScale;
-
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-uniform float u_opacity : 1;
+// uniform float u_opacity : 1;
 uniform float u_stroke_width : 2;
 uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-#pragma include "styleMappingCalStrokeWidth"
 
 #pragma include "projection"
 #pragma include "picking"
 
 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
-  );
-
-  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 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;
+  v_uv = a_tex / u_sdf_map_size;
 
-    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 - 数据纹理映射部分的计算
 
-  v_color = a_Color;
-  v_uv = a_tex / u_sdf_map_size;
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
+  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);
 
   // 文本缩放比例
   float fontScale = a_Size / FONT_SIZE;

package/es/polygon/index.d.ts

@@ -3,6 +3,7 @@ import { IPolygonLayerStyleOptions } from '../core/interface';
 import { PolygonModelType } from './models/';
 export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
     type: string;
+    enableEncodeStyles: string[];
     defaultSourceConfig: {
         data: [];
         options: {

package/es/polygon/index.js

@@ -22,6 +22,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'PolygonLayer');
+    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity']);
     return _this;
   }
   _createClass(PolygonLayer, [{