@antv/l7-layers 2.21.10 → 2.21.11-beta.1

package/es/point/shaders/earthExtrude/earthExtrude_vert.glsl

@@ -5,13 +5,11 @@ precision highp float;
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec3 a_Size;
-layout(location = 11) in vec3 a_Pos;
-layout(location = 13) in vec3 a_Normal;
-
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in vec3 a_Size;
+layout(location = ATTRIBUTE_LOCATION_POS) in vec3 a_Pos;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
 
 layout(std140) uniform commonUniform {
   vec4 u_sourceColor;
@@ -42,7 +40,7 @@ float getYRadian(float x, float z) {
   } else if(x > 0.0 && z <= 0.0){
     return atan(-z/x) + pi/2.0;
   } else if(x <= 0.0 && z <= 0.0) {
-    return  pi + atan(x/z); //atan(x/z) + 
+    return  pi + atan(x/z); //atan(x/z) +
   } else {
     return atan(z/-x) + pi*3.0/2.0;
   }
@@ -62,15 +60,7 @@ void main() {
 
   vec3 offset = size; // 控制圆柱体的大小 - 从标准单位圆柱体进行偏移
   if(u_heightfixed < 1.0) { // 圆柱体不固定高度
-    
-    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
-      // P20 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减1
-      offset = offset * pow(2.0, (19.0 - u_Zoom));
-    }
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-      // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
-      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));
-    }
+    //
   } else {// 圆柱体固定高度 （ 处理 mapbox ）
     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
       offset *= 4.0/pow(2.0, 21.0 - u_Zoom);
@@ -98,7 +88,7 @@ void main() {
   }
   v_color.a *= u_opacity;
 
-    
+
   // 在地球模式下，将原本垂直于 xy 平面的圆柱调整姿态到适应圆的角度
   //旋转矩阵mx，创建绕x轴旋转矩阵
   float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);
@@ -106,9 +96,9 @@ void main() {
   float xcos = cos(xRadian);//求解旋转角度余弦值
   float xsin = sin(xRadian);//求解旋转角度正弦值
   mat4 mx = mat4(
-    1,0,0,0,  
-    0,xcos,-xsin,0,  
-    0,xsin,xcos,0,  
+    1,0,0,0,
+    0,xcos,-xsin,0,
+    0,xsin,xcos,0,
     0,0,0,1);
 
   //旋转矩阵my，创建绕y轴旋转矩阵
@@ -116,13 +106,13 @@ void main() {
   float ycos = cos(yRadian);//求解旋转角度余弦值
   float ysin = sin(yRadian);//求解旋转角度正弦值
   mat4 my = mat4(
-    ycos,0,-ysin,0,  
-    0,1,0,0,  
-    ysin,0,ycos,0,  
+    ycos,0,-ysin,0,
+    0,1,0,0,
+    ysin,0,ycos,0,
     0,0,0,1);
 
   gl_Position = u_ViewProjectionMatrix * vec4(( my * mx *  vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);
-  
+
 
   setPickingColor(a_PickingColor);
 }

package/es/point/shaders/earthFill/earthFill_vert.glsl

@@ -1,8 +1,8 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 10) in float a_Shape;
-layout(location = 11) in vec3 a_Extrude;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_SHAPE) in float a_Shape;
+layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;
 
 layout(std140) uniform commonUniform {
   float u_additive;
@@ -43,4 +43,4 @@ void main() {
   gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + vec3(u_offsets,0.0), 1.0);
 
   setPickingColor(a_PickingColor);
-}
+}

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

@@ -1,10 +1,10 @@
-#define pi 3.1415926535
+#define pi (3.1415926535)
 
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec3 a_Size;
-layout(location = 11) in vec3 a_Extrude;
-layout(location = 13) in vec3 a_Normal;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in vec3 a_Size;
+layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec4 a_Extrude;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
 
 layout(std140) uniform commonUniforms {
   float u_pickLight;
@@ -25,46 +25,41 @@ out float v_lightWeight;
 #pragma include "picking"
 
 float getYRadian(float x, float z) {
-  if(x > 0.0 && z > 0.0) {
-    return atan(x/z);
-  } else if(x > 0.0 && z <= 0.0){
-    return atan(-z/x) + pi/2.0;
-  } else if(x <= 0.0 && z <= 0.0) {
-    return  pi + atan(x/z); //atan(x/z) + 
+  if (x > 0.0 && z > 0.0) {
+    return atan(x / z);
+  } else if (x > 0.0 && z <= 0.0) {
+    return atan(-z / x) + pi / 2.0;
+  } else if (x <= 0.0 && z <= 0.0) {
+    return pi + atan(x / z); //atan(x/z) +
   } else {
-    return atan(z/-x) + pi*3.0/2.0;
+    return atan(z / -x) + pi * 3.0 / 2.0;
   }
 }
 
 float getXRadian(float y, float r) {
-  return atan(y/r);
+  return atan(y / r);
 }
 
 void main() {
-
-
   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) {
-      // P20 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减1
-      offset = offset * pow(2.0, (19.0 - u_Zoom));
-    }
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-      // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
-      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));
-    }
-  } else {// 圆柱体固定高度 （ 处理 mapbox ）
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);
+  if (u_heightfixed < 1.0) {
+    // 圆柱体不固定高度
+  } else {
+    // 圆柱体固定高度 （ 处理 mapbox ）
+    if (
+      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+    ) {
+      offset *= 4.0 / pow(2.0, 21.0 - u_Zoom);
     }
   }
 
-
-  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));
+  vec2 positions = a_Extrude.xy;
+  vec2 positions64Low = a_Extrude.zw;
+  vec4 project_pos = project_position(vec4(positions, 0.0, 1.0), positions64Low);
 
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
@@ -72,7 +67,8 @@ void main() {
   // // 圆柱光照效果
   float lightWeight = 1.0;
 
-  if(u_lightEnable > 0.0) { // 取消三元表达式，增强健壮性
+  if (u_lightEnable > 0.0) {
+    // 取消三元表达式，增强健壮性
     lightWeight = calc_lighting(pos);
   }
 
@@ -80,20 +76,20 @@ void main() {
 
   v_color = a_Color;
 
-    // 设置圆柱的底色
-  if(u_linearColor == 1.0) { // 使用渐变颜色
+  // 设置圆柱的底色
+  if (u_linearColor == 1.0) {
+    // 使用渐变颜色
     v_color = mix(u_sourceColor, u_targetColor, a_Position.z);
-    v_color.a =  v_color.a * opacity;
+    v_color.a = v_color.a * opacity;
   } else {
     v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
   }
 
-    if(u_opacitylinear > 0.0) {
-    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;
+  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_v2(pos);
+  gl_Position = project_common_position_to_clipspace(pos);
 
   setPickingColor(a_PickingColor);
 }

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

@@ -1,8 +1,9 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 10) in float a_Shape;
-layout(location = 11) in vec3 a_Extrude;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_SHAPE) in float a_Shape;
+layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;
 
 layout(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
@@ -11,7 +12,7 @@ layout(std140) uniform commonUniforms {
   float u_stroke_opacity;
   float u_size_unit;
   float u_time;
-  vec4 u_animate;   
+  vec4 u_animate;
 };
 
 out vec4 v_color;
@@ -25,7 +26,7 @@ out float v_radius;
 
 void main() {
   // 透明度计算
-   v_stroke = stroke;  
+   v_stroke = stroke;
   vec3 extrude = a_Extrude;
   float shape_type = a_Shape;
   /*
@@ -51,17 +52,14 @@ void main() {
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);
 
   vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);
-  vec3 aPosition = a_Position;
 
   offset = project_pixel(offset);
   offset = rotate_matrix(offset,rotation);
-  
+
   // TODP: /abs(extrude.x) 是为了兼容地球模式
   v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
 
-
-  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
-  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
 
   float raisingHeight = u_blur_height_fixed.y;
@@ -74,8 +72,8 @@ void main() {
       raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;
     }
   }
-  
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));
+
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   setPickingColor(a_PickingColor);
 }

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

@@ -1,13 +1,14 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 11) in vec3 a_Extrude;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniform {
   vec2 u_textSize;
-  float u_heightfixed: 0.0;
-  float u_raisingHeight: 0.0;
+  float u_heightfixed;
+  float u_raisingHeight;
   float u_size_unit;
 };
 
@@ -15,43 +16,30 @@ out vec2 v_uv;
 out vec2 v_Iconuv;
 out float v_opacity;
 
-
 #pragma include "projection"
 #pragma include "picking"
 #pragma include "rotation_2d"
 
 void main() {
   vec3 extrude = a_Extrude;
-  v_uv = (a_Extrude.xy + 1.0)/2.0;
+  v_uv = (a_Extrude.xy + 1.0) / 2.0;
   v_uv.y = 1.0 - v_uv.y;
   v_Iconuv = a_Uv;
   v_opacity = opacity;
   float newSize = a_Size;
-  if(u_size_unit == 1.0) {
-    newSize = newSize  * u_PixelsPerMeter.z;
+  if (u_size_unit == 1.0) {
+    newSize = newSize * u_PixelsPerMeter.z;
   }
-  
-  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
-  vec2 offset = (extrude.xy * (newSize) + offsets);
 
-  offset = rotate_matrix(offset,rotation);
+  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
+  vec2 offset = extrude.xy * newSize + offsets;
 
-  vec3 aPosition = a_Position;
+  offset = rotate_matrix(offset, rotation);
 
   offset = project_pixel(offset);
 
-  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
-  float raisingHeight = u_raisingHeight;
-  if(u_heightfixed < 1.0) { // height fixed
-    raisingHeight = project_pixel(u_raisingHeight);
-  } 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;
-    }
-  }
-
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, 0.0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
 
   setPickingColor(a_PickingColor);
 }

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

@@ -1,7 +1,8 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   vec2 u_textSize;
@@ -17,27 +18,29 @@ out float v_opacity;
 #pragma include "picking"
 
 void main() {
-
   // cal style mapping - 数据纹理映射部分的计算
   v_color = a_Color;
   v_opacity = opacity;
   v_uv = a_Uv;
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+
   vec2 offset = project_pixel(offsets);
 
   float raisingHeight = u_raisingHeight;
-  if(u_heightfixed < 1.0) { // false
+  if (u_heightfixed < 1.0) {
+    // false
     raisingHeight = project_pixel(u_raisingHeight);
   } else {
-     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+    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;
     }
   }
 
-
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
   setPickingColor(a_PickingColor);

package/es/point/shaders/normal/normal_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
 
 layout(std140) uniform u_Common {
   float u_size_scale;
@@ -14,12 +15,8 @@ out vec4 v_color;
 void main() {
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
-  if (u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(a_Position, 1.0);
-  } else {
-    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2., -a_Size /2., 0., 0.);
-    gl_Position = project_common_position_to_clipspace(project_pos);
-  }
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(project_pos);
 
-  gl_PointSize = a_Size * u_size_scale *  2.0  * u_DevicePixelRatio;
+  gl_PointSize = a_Size * u_size_scale * 2.0 * u_DevicePixelRatio;
 }

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

@@ -1,7 +1,8 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 11) in vec3 a_Extrude;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;
 
 layout(std140) uniform commonUniorm {
   float u_additive;
@@ -22,8 +23,8 @@ void main() {
   float newSize = setPickingSize(a_Size);
 
   float time = u_time * u_speed;
-  mat2 rotateMatrix = mat2( 
-    cos(time), sin(time), 
+  mat2 rotateMatrix = mat2(
+    cos(time), sin(time),
     -sin(time), cos(time)
   );
   v_extrude = rotateMatrix * a_Extrude.xy;
@@ -40,14 +41,13 @@ void main() {
   v_radius = newSize;
 
   vec2 offset = (a_Extrude.xy * (newSize));
-  vec3 aPosition = a_Position;
-  
+
   offset = project_pixel(offset);
-  
+
   v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);
 
-  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/point/shaders/text/text_vert.glsl

@@ -2,11 +2,12 @@
 #define EDGE_GAMMA 0.105
 #define FONT_SIZE 24.0
 
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 10) in vec2 a_textOffsets;
-layout(location = 14) in vec2 a_tex;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_TEXT_OFFSETS) in vec2 a_textOffsets;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_tex;
 
 layout(std140) uniform commonUniforms {
   vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
@@ -29,7 +30,7 @@ out float v_fontScale;
 
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
-  
+
   v_uv = a_tex / u_sdf_map_size;
 
 
@@ -41,11 +42,11 @@ void main() {
   float fontScale = a_Size / FONT_SIZE;
   v_fontScale = fontScale;
 
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
   // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   vec2 offset = rotate_matrix(a_textOffsets,rotation);
-  
+
   // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
 
   float raiseHeight = u_raisingHeight;
@@ -54,7 +55,7 @@ void main() {
     raiseHeight = u_raisingHeight * mapboxZoomScale;
   }
 
-  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
+  vec4 projected_position = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
 
   gl_Position = vec4(
     projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);

package/es/polygon/models/extrude.d.ts

@@ -1,6 +1,22 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class ExtrudeModel extends BaseModel {
+    protected get attributeLocation(): {
+        readonly POSITION: 0;
+        readonly POSITION_64LOW: 1;
+        readonly COLOR: 2;
+        readonly PICKING_COLOR: 3;
+        readonly STROKE: 4;
+        readonly OPACITY: 5;
+        readonly OFFSETS: 6;
+        readonly ROTATION: 7;
+        readonly MAX: 8;
+    } & Record<string, number> & {
+        MAX: 8;
+        SIZE: number;
+        NORMAL: number;
+        UV: number;
+    };
     protected texture: ITexture2D;
     getUninforms(): {
         [x: string]: any;