@antv/l7-layers 2.16.0 → 2.16.2

package/es/polygon/shaders/extrude/polygon_extrude_vert.glsl

@@ -11,50 +11,31 @@ attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+uniform float u_linearColor: 0;
+
+uniform float u_topsurface: 1.0;
+uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 void main() {
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide
-    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  // sidey
-  );
-  styleMappingMat[0][3] = a_Position.z;
-  styleMappingMat[3][0] = a_uvs[2];
-
-  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 isSide = a_Position.z;
+ float topU = a_uvs[0];
+ float topV = 1.0 - a_uvs[1];
+ float sidey = a_uvs[2];
 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
+  float lightWeight = calc_lighting(pos);
+
   vec4 project_pos = project_position(pos);
 
   if(u_heightfixed > 0.0) { // 判断几何体是否固定高度
@@ -68,10 +49,7 @@ void main() {
     }
   }
 
-  // project_pos.z += 500000.0; // amap1
 
-  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
@@ -80,11 +58,28 @@ void main() {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   }
 
-  float lightWeight = calc_lighting(pos);
+  // Tip: 部分机型 GPU 计算精度兼容
+  if(isSide < 0.999) {
+    // side face
+    // if(u_sidesurface < 1.0) {
+    //   discard;
+    // }
+
+    if(u_linearColor == 1.0) {
+      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);
+      linearColor.rgb *= lightWeight;
+      v_Color = linearColor;
+    } else {
+      v_Color = a_Color;
+    }
+
+  } else {
+    v_Color = a_Color;
+  }
+
   // v_Color = a_Color;
-  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
 
-  styleMappingMat[3][1] = lightWeight;
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl

@@ -8,19 +8,21 @@ uniform float u_topsurface: 1.0;
 uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+varying vec3 v_uvs;
+varying vec2 v_texture_data;
+
+
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float isSide = styleMappingMat[0][3];
-  float lightWeight = styleMappingMat[3][1];
-  float topU = styleMappingMat[2][2];
-  float topV = styleMappingMat[2][3];
-
-  float sidey = styleMappingMat[3][0];
+  float opacity = u_opacity;
+  float isSide = v_texture_data.x;
+  float lightWeight = v_texture_data.y;
+  float topU = v_uvs[0];
+  float topV = 1.0 - v_uvs[1];
+  float sidey = v_uvs[2];
   // Tip: 部分机型 GPU 计算精度兼容
-  if(isSide < 0.999) {
+  if(isSide < 0.999) {// 是否是边缘
     // side face
     if(u_sidesurface < 1.0) {
       discard;
@@ -41,6 +43,7 @@ void main() {
     }
 
     gl_FragColor = texture2D(u_texture, vec2(topU, topV));
+    // gl_FragColor = vec4(1.0, 0., 0., 1.0);
   }
   
 

package/es/polygon/shaders/extrude/polygon_extrudetex_vert.glsl

@@ -11,57 +11,33 @@ attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
+uniform sampler2D u_texture;
 
+
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+uniform float u_topsurface: 1.0;
+uniform float u_sidesurface: 1.0;
 varying vec4 v_Color;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
+uniform float u_linearColor: 0.0;
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec2 v_texture_data;
+varying vec3 v_uvs;
 
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 void main() {
-  v_Color = a_Color;
-
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - a_Position.z(judge side by a_Position.z)
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - u - v
-    0.0, 0.0, 0.0, 0.0  // sidey
-  );
-  
-  styleMappingMat[0][3] = a_Position.z;
-  styleMappingMat[2][2] = a_uvs[0];
-  styleMappingMat[2][3] = 1.0 - a_uvs[1];
-  styleMappingMat[3][0] = a_uvs[2];
-
-
-  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 - 数据纹理映射部分的计算
-
+ 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
+  float lightWeight = calc_lighting(pos);
   vec4 project_pos = project_position(pos);
+  v_uvs = a_uvs;
+
+  v_texture_data = vec2(a_Position.z, lightWeight);
 
   if(u_heightfixed > 0.0) { // 判断几何体是否固定高度
     project_pos.z = a_Position.z * a_Size;
@@ -74,10 +50,6 @@ void main() {
     }
   }
 
-  // project_pos.z += 500000.0; // amap1
-
-  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
@@ -86,8 +58,8 @@ void main() {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   }
 
-  float lightWeight = calc_lighting(pos);
-  styleMappingMat[3][1] = lightWeight;
+
+
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/polygon_frag.glsl

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

package/es/polygon/shaders/polygon_linear_frag.glsl

@@ -1,7 +1,3 @@
-uniform float u_opacity: 1.0;
-varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
 #pragma include "picking"
 uniform float u_opacitylinear: 0.0;
 uniform float u_dir: 1.0;
@@ -10,13 +6,9 @@ varying vec2 v_pos;
 
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  gl_FragColor = v_Color;
   
   if(u_opacitylinear > 0.0) {
     gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;
   }
-
-  gl_FragColor.a *= opacity;
   gl_FragColor = filterColor(gl_FragColor);
 }

package/es/polygon/shaders/polygon_linear_vert.glsl

@@ -3,14 +3,10 @@ attribute vec3 a_Position;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_opacity: 1.0;
 uniform float u_raisingHeight: 0.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "picking"
@@ -26,34 +22,6 @@ void main() {
     v_linear = a_linear;
     v_pos = a_Position.xy;
   }
-  
-  // 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;
-  // cal style mapping - 数据纹理映射部分的计算
-
-  v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   project_pos.z += u_raisingHeight;

package/es/polygon/shaders/polygon_vert.glsl

@@ -4,46 +4,20 @@ attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
-uniform float u_opacity: 1.0;
 uniform float u_raisingHeight: 0.0;
 
 varying vec4 v_color;
-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;
   // cal style mapping - 数据纹理映射部分的计算
 
-  v_color = a_Color;
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 

package/es/utils/layerData.js

@@ -25,7 +25,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
         d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoord(d.coordinates);
-        d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
+        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
@@ -40,7 +40,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
         d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoords(d.coordinates);
-        d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
+        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
       });
     }
   }