fix: mapbox 线图层的贴图变形 (#2474)

* fix: mapbox 线图层的贴图变形 * chore(CI): update snapshots (#2476) Co-authored-by: lvisei <26923747+lvisei@users.noreply.github.com> * chore: add changeset --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: lvisei <26923747+lvisei@users.noreply.github.com>
antvis · May 16, 2024 · 3e33888 · 3e33888
1 parent 7e3b672
commit 3e33888
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 21 deletions.
diff --git a/.changeset/clean-beers-try.md b/.changeset/clean-beers-try.md
@@ -0,0 +1,5 @@
+---
+'@antv/l7-layers': patch
+---
+
+fix: mapbox 线图层的贴图变形
diff --git a/__tests__/integration/snapshots/Line_arc.png b/__tests__/integration/snapshots/Line_arc.png
diff --git a/__tests__/integration/snapshots/Line_arc3D.png b/__tests__/integration/snapshots/Line_arc3D.png
diff --git a/__tests__/integration/snapshots/Line_normal.png b/__tests__/integration/snapshots/Line_normal.png
diff --git a/__tests__/integration/snapshots/Line_simple.png b/__tests__/integration/snapshots/Line_simple.png
diff --git a/__tests__/integration/snapshots/Line_wall.png b/__tests__/integration/snapshots/Line_wall.png
diff --git a/__tests__/integration/snapshots/Mask_multi.png b/__tests__/integration/snapshots/Mask_multi.png
diff --git a/__tests__/integration/snapshots/Mask_single.png b/__tests__/integration/snapshots/Mask_single.png
diff --git a/__tests__/integration/snapshots/Point_billboard.png b/__tests__/integration/snapshots/Point_billboard.png
diff --git a/__tests__/integration/snapshots/Point_column.png b/__tests__/integration/snapshots/Point_column.png
diff --git a/__tests__/integration/snapshots/Point_fill_image.png b/__tests__/integration/snapshots/Point_fill_image.png
diff --git a/__tests__/integration/snapshots/Point_text.png b/__tests__/integration/snapshots/Point_text.png
diff --git a/__tests__/integration/snapshots/Polygon_extrude.png b/__tests__/integration/snapshots/Polygon_extrude.png
diff --git a/__tests__/integration/snapshots/Polygon_extrusion.png b/__tests__/integration/snapshots/Polygon_extrusion.png
diff --git a/__tests__/integration/snapshots/Polygon_fill.png b/__tests__/integration/snapshots/Polygon_fill.png
diff --git a/examples/demos/gallery/vari-flight.ts b/examples/demos/gallery/vari-flight.ts
@@ -7,7 +7,7 @@ export function MapRender(options: RenderDemoOptions) {
     id: 'map',
     renderer: options.renderer,
     map: new allMap[options.map]({
-      style: 'light',
+      style: 'dark',
       center: [40, 40.16797],
       zoom: 2.5,
     }),

diff --git a/packages/core/src/shaders/projection.glsl b/packages/core/src/shaders/projection.glsl
@@ -79,13 +79,6 @@ vec2 project_pixel_size_to_clipspace(vec2 pixels) {
   return offset * u_FocalDistance;
 }
 
-float project_pixel_allmap(float pixel) {
-  if (u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT) {
-    return pixel * pow(2.0, u_Zoom);
-  }
-  return pixel * u_FocalDistance;
-}
-
 // 适配纹理贴图的等像素大小
 float project_pixel_texture(float pixel) {
   // mapbox zoom > 12

diff --git a/packages/layers/src/line/shaders/arc/line_arc_vert.glsl b/packages/layers/src/line/shaders/arc/line_arc_vert.glsl
@@ -137,10 +137,8 @@ void main() {
 
   if(LineTexture == u_line_texture) { // 开启贴图模式
     float arcDistrance = length(source - target); // 起始点和终点的距离
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) { // mapbox
-      // arcDistrance *= 8.0;
-      arcDistrance = project_pixel_allmap(arcDistrance);
-    }
+    arcDistrance = project_pixel(arcDistrance);
+
     v_iconMapUV = a_iconMapUV;
 
     float pixelLen = project_pixel_texture(u_icon_step); // 贴图沿弧线方向的长度 - 随地图缩放改变

diff --git a/packages/layers/src/line/shaders/flow/flow_line_vert.glsl b/packages/layers/src/line/shaders/flow/flow_line_vert.glsl
@@ -33,7 +33,7 @@ void main() {
   vec2 source_world = a_Instance.rg; // 起点
   vec2 target_world = a_Instance.ba; // 终点
   vec2 flowlineDir = line_dir(target_world, source_world);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x); // mapbox || 高德
+  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);
 
   vec2 position = mix(source_world, target_world, a_Position.x);
   vec2 position64Low = mix(a_Instance64Low.rg, a_Instance64Low.ba, a_Position.x);
@@ -56,7 +56,7 @@ void main() {
     a_Position.x
   );
 
-  vec2 normalsCommon = u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
+  vec2 normalsCommon = u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y));
 
   float gapCommon = -1. * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(

diff --git a/packages/layers/src/line/shaders/greatCircle/line_arc_great_circle_vert.glsl b/packages/layers/src/line/shaders/greatCircle/line_arc_great_circle_vert.glsl
@@ -147,13 +147,8 @@ void main() {
   v_line_data.g = a_Position.x; // 该顶点在弧线上的分段排序
   if (LineTexture == u_line_texture) {
     float d_arcDistrance = length(source - target);
-    if (
-      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
-      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
-    ) {
-      // mapbox
-      d_arcDistrance = project_pixel_allmap(d_arcDistrance);
-    }
+    d_arcDistrance = project_pixel(d_arcDistrance);
+
     float d_pixelLen = project_pixel(u_icon_step) / 8.0;
     v_line_data.b = floor(d_arcDistrance / d_pixelLen); // 贴图在弧线上重复的数量