@antv/l7-layers 2.21.7 → 2.21.9-beta.0

package/lib/line/shaders/line/line_vert.glsl

@@ -1,12 +1,12 @@
+#define Animate (0.0)
 
-#define Animate 0.0
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec2 a_Size;
-layout(location = 10) in vec3 a_DistanceAndIndexAndMiter;
-layout(location = 13) in vec4 a_Normal_Total_Distance;
-layout(location = 14) in vec2 a_iconMapUV;
+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 vec2 a_Size;
+layout(location = ATTRIBUTE_LOCATION_DISTANCE_INDEX) in vec3 a_DistanceAndIndexAndMiter;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec4 a_Normal_Total_Distance;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -27,7 +27,6 @@ layout(std140) uniform commonUniorm {
   float u_time;
 };
 
-
 out vec4 v_color;
 out vec4 v_stroke;
 //dash
@@ -50,69 +49,53 @@ void main() {
   v_d_distance_ratio = a_DistanceAndIndex.x / a_Total_Distance;
 
   // cal style mapping - 数据纹理映射部分的计算
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  float d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
   v_iconMapUV = a_iconMapUV;
   d_texPixelLen = project_float_pixel(u_icon_step);
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
 
   v_color = a_Color;
   v_color.a *= opacity;
   v_stroke = stroke;
 
-  vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
-  
+  vec3 size = a_Miter * setPickingSize(a_Size.x) * a_Normal;
+
   vec2 offset = project_pixel(size.xy);
 
   float lineDistance = a_DistanceAndIndex.x;
   float currentLinePointRatio = lineDistance / a_Total_Distance;
- 
 
   float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // 线横向偏移的距离（向两侧偏移的和）
-  float linePixelSize = project_pixel(a_Size.x) * 2.0;  // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
-  float texV = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
-  
+  float linePixelSize = project_pixel(a_Size.x) * 2.0; // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
+  float texV = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
+
   v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);
   // 设置数据集的参数
 
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));
 
   float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况 vertex height
   float lineHeight = a_Size.y; // size 第二个参数代表的高度 [linewidth, lineheight]
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    lineHeight *= 0.2; // 保持和 amap/mapbox 一致的效果
-    h *= 0.2;
-    if(u_heightfixed < 1.0) {
-      lineHeight = project_pixel(a_Size.y);
-    }
-    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));
-  } else {
-    // 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // mapbox
-      // 保持高度相对不变
-      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
-      h *= mapboxZoomScale;
-      h += u_raisingHeight * mapboxZoomScale;
-      if(u_heightfixed > 0.0) {
-        lineHeight *= mapboxZoomScale;
-      }
-      
-    } else {
-      // amap
-      h += u_raisingHeight;
-      // lineHeight 顶点偏移高度
-      if(u_heightfixed < 1.0) {
-        lineHeight *= pow(2.0, 20.0 - u_Zoom);
-      }
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // mapbox
+    // 保持高度相对不变
+    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
+    h *= mapboxZoomScale;
+    h += u_raisingHeight * mapboxZoomScale;
+    if (u_heightfixed > 0.0) {
+      lineHeight *= mapboxZoomScale;
     }
-
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));
   }
 
+  gl_Position = project_common_position_to_clipspace(
+    vec4(project_pos.xy + offset, lineHeight + h, 1.0)
+  );
+
   setPickingColor(a_PickingColor);
 }

package/lib/line/shaders/simple/simpleline_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec4 a_SizeDistanceAndTotalDistance;
+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 vec4 a_SizeDistanceAndTotalDistance;
 
 layout(std140) uniform commonUniorm {
   vec4 u_sourceColor;
@@ -21,30 +22,24 @@ void main() {
   //dash输出
   v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_SizeDistanceAndTotalDistance.a;
 
-  v_color = a_Color; 
+  v_color = a_Color;
   v_distanceScale = a_SizeDistanceAndTotalDistance.b / a_SizeDistanceAndTotalDistance.a;
   v_color.a = v_color.a * opacity;
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
   float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_SizeDistanceAndTotalDistance.y) + h * 0.2, 1.0));
-  } else {
-    float lineHeight = a_SizeDistanceAndTotalDistance.y;
-    // 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // 保持高度相对不变
-      h *= 2.0/pow(2.0, 20.0 - u_Zoom);
-    }
-
-    // amap1.x
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
-      // 保持高度相对不变
-      lineHeight *= pow(2.0, 20.0 - u_Zoom);
-    }
-
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));
-    gl_PointSize = 10.0;
+  float lineHeight = a_SizeDistanceAndTotalDistance.y;
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // 保持高度相对不变
+    h *= 2.0 / pow(2.0, 20.0 - u_Zoom);
   }
+
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));
+  gl_PointSize = 10.0;
+
 }

package/lib/line/shaders/wall/wall_vert.glsl

@@ -1,14 +1,11 @@
 #define Animate 0.0
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec2 a_Size;
-layout(location = 10) in float a_Miter;
-layout(location = 11) in float a_Total_Distance;
-layout(location = 12) in vec4 a_Instance;
-layout(location = 13) in vec3 a_Normal;
-layout(location = 14) in vec2 a_iconMapUV;
-layout(location = 15) in float a_Distance;
-
+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 vec2 a_Size;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
+layout(location = ATTRIBUTE_LOCATION_DISTANCE_MITER_TOTAL) in vec3 a_Distance_Total_Miter;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -23,6 +20,7 @@ layout(std140) uniform commonUniorm {
   float u_iconStepCount;
   float u_time;
 };
+
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
@@ -35,66 +33,59 @@ out float v_radio;
 out vec4 v_dataset;
 
 void main() {
-
+  float a_Distance = a_Distance_Total_Miter.x;
+  float a_Miter = a_Distance_Total_Miter.y;
+  float a_Total_Distance = a_Distance_Total_Miter.z;
 
   float d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  float d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
 
   v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+  if (u_heightfixed < 1.0) {
+    // 高度随 zoom 调整
     d_texPixelLen = project_pixel(u_icon_step);
   } else {
     d_texPixelLen = u_icon_step;
   }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
 
-  if(u_animate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
+  if (u_animate.x == Animate || u_linearColor == 1.0) {
+    d_distance_ratio = a_Distance / a_Total_Distance;
   }
 
-  float miter = (a_Miter + 1.0)/2.0;
+  float miter = (a_Miter + 1.0) / 2.0;
   // 设置数据集的参数
   v_dataset[0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  v_dataset[1] = a_Distance;       // 当前顶点的距离
-  v_dataset[2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  v_dataset[3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
+  v_dataset[1] = a_Distance; // 当前顶点的距离
+  v_dataset[2] = d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
+  v_dataset[3] = miter; // 线图层贴图部分的 v 坐标值 0 - 1
 
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {    
-     originSize = project_float_meter(a_Size.x); // 高度随 zoom 调整
+  float originSize = a_Size.x; // 固定高度
+  if (u_heightfixed < 1.0) {
+    originSize = project_float_meter(a_Size.x); // 高度随 zoom 调整
   }
 
-
   float wallHeight = originSize * miter;
   float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
 
   v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
   v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-// 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // mapbox
-      // 保持高度相对不变
-      float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
-      if(u_heightfixed > 0.0) {
-        wallHeight *= mapboxZoomScale;
-      }
-      
-    } else {
-      // lineHeight 顶点偏移高度
-      if(u_heightfixed < 1.0) {
-        wallHeight *= pow(2.0, 20.0 - u_Zoom);
-      }
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // mapbox
+    // 保持高度相对不变
+    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
+    if (u_heightfixed > 0.0) {
+      wallHeight *= mapboxZoomScale;
     }
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
   }
 
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
+
   setPickingColor(a_PickingColor);
 }

package/lib/mask/models/fill.js

@@ -13,7 +13,7 @@ var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
 const mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-const mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+const mask_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n}\n\n";
 class MaskModel extends _BaseModel.default {
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
@@ -47,6 +47,7 @@ class MaskModel extends _BaseModel.default {
         moduleName: 'mask',
         vertexShader: mask_vert,
         fragmentShader: mask_frag,
+        defines: _this2.getDefines(),
         triangulation: _triangulation.polygonTriangulation,
         depth: {
           enable: false

package/lib/mask/shaders/mask_vert.glsl

@@ -1,4 +1,4 @@
-layout(location = 0) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
 
 layout(std140) uniform commonUniorm {
   vec4 u_color;
@@ -9,11 +9,6 @@ layout(std140) uniform commonUniorm {
 
 void main() {
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 }
 

package/lib/plugins/DataMappingPlugin.d.ts

@@ -5,7 +5,6 @@ export default class DataMappingPlugin implements ILayerPlugin {
     apply(layer: ILayer, { styleAttributeService, mapService, fontService }: L7Container): void;
     private generateMaping;
     private mapping;
-    private adjustData2Amap2Coordinates;
     private adjustData2SimpleCoordinates;
     private unProjectCoordinates;
     private applyAttributeMapping;

package/lib/plugins/DataMappingPlugin.js

@@ -10,9 +10,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-const {
-  cloneDeep
-} = _l7Utils.lodashUtil;
 class DataMappingPlugin {
   constructor() {
     (0, _defineProperty2.default)(this, "mapService", void 0);
@@ -143,31 +140,11 @@ class DataMappingPlugin {
     attributes.forEach(attribute => {
       attribute.needRemapping = false;
     });
-    // 调整数据兼容 Amap2.0
-    this.adjustData2Amap2Coordinates(mappedData, layer);
 
     // 调整数据兼容 SimpleCoordinates
     this.adjustData2SimpleCoordinates(mappedData);
     return mappedData;
   }
-  adjustData2Amap2Coordinates(mappedData, layer) {
-    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
-    if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {
-      const layerCenter = layer.coordCenter || layer.getSource().center;
-      // 单个的点数据
-      // @ts-ignore
-      mappedData
-      // TODO: 避免经纬度被重复计算导致坐标位置偏移
-      .filter(d => !d.originCoordinates).map(d => {
-        d.version = 'GAODE2.x';
-        // @ts-ignore
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-        // @ts-ignore
-        // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
-        d.coordinates = this.mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
-      });
-    }
-  }
   adjustData2SimpleCoordinates(mappedData) {
     if (mappedData.length > 0 && this.mapService.version === 'SIMPLE') {
       mappedData.map(d => {

package/lib/plugins/PixelPickingPlugin.js

@@ -66,7 +66,7 @@ class PixelPickingPlugin {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_PickingColor',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.PICKING_COLOR,
+          shaderLocation: _CommonStyleAttribute.COMMON_ATTRIBUTE_LOCATION.PICKING_COLOR,
           buffer: {
             data: [],
             type: _l7Core.gl.FLOAT

package/lib/plugins/RegisterStyleAttributePlugin.d.ts

@@ -7,5 +7,4 @@ export default class RegisterStyleAttributePlugin implements ILayerPlugin {
     private registerBuiltinAttributes;
     private registerPositionAttribute;
     private registerColorAttribute;
-    private registerVertexIdAttribute;
 }

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -32,7 +32,6 @@ class RegisterStyleAttributePlugin {
     this.registerPositionAttribute(styleAttributeService);
     // this.registerFilterAttribute(styleAttributeService);//数据层数据过滤
     this.registerColorAttribute(styleAttributeService);
-    this.registerVertexIdAttribute(styleAttributeService);
   }
   registerPositionAttribute(styleAttributeService) {
     styleAttributeService.registerStyleAttribute({
@@ -40,7 +39,7 @@ class RegisterStyleAttributePlugin {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Position',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.POSITION,
+        shaderLocation: _CommonStyleAttribute.COMMON_ATTRIBUTE_LOCATION.POSITION,
         buffer: {
           data: [],
           type: _l7Core.gl.FLOAT
@@ -58,7 +57,7 @@ class RegisterStyleAttributePlugin {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Color',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.COLOR,
+        shaderLocation: _CommonStyleAttribute.COMMON_ATTRIBUTE_LOCATION.COLOR,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -75,26 +74,5 @@ class RegisterStyleAttributePlugin {
       }
     });
   }
-  registerVertexIdAttribute(styleAttributeService) {
-    styleAttributeService.registerStyleAttribute({
-      // 统一注册每个顶点的唯一编号（目前用于样式的数据映射计算使用）
-      name: 'vertexId',
-      type: _l7Core.AttributeType.Attribute,
-      descriptor: {
-        name: 'a_vertexId',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.VERTEX_ID,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: _l7Core.gl.DYNAMIC_DRAW,
-          data: [],
-          type: _l7Core.gl.FLOAT
-        },
-        size: 1,
-        update: (feature, featureIdx) => {
-          return [featureIdx];
-        }
-      }
-    });
-  }
 }
 exports.default = RegisterStyleAttributePlugin;

package/lib/plugins/ShaderUniformPlugin.d.ts

@@ -13,10 +13,5 @@ export default class ShaderUniformPlugin implements ILayerPlugin {
     private mapService;
     private layerService;
     apply(layer: ILayer, { rendererService, mapService, layerService, coordinateSystemService, cameraService, }: L7Container): void;
-    /**
-     * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
-     * @param layer
-     */
-    private setLayerCenter;
     private generateUBO;
 }

package/lib/plugins/ShaderUniformPlugin.js

@@ -35,9 +35,6 @@ class ShaderUniformPlugin {
     this.layerService = layerService;
     this.coordinateSystemService = coordinateSystemService;
     this.cameraService = cameraService;
-    const version = this.mapService.version;
-    let mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
-    let sceneCenterMercator = [0, 0];
     let uniformBuffer;
     if (!this.rendererService.uniformBuffers[0]) {
       // Create a Uniform Buffer Object(UBO).
@@ -52,19 +49,6 @@ class ShaderUniformPlugin {
       const offset = layer.getLayerConfig().tileOrigin;
       // 重新计算坐标系参数
       this.coordinateSystemService.refresh(offset);
-      if (version === 'GAODE2.x') {
-        this.setLayerCenter(layer);
-        // @ts-ignore
-        mvp = this.mapService.map.customCoords.getMVPMatrix();
-        // mvp = amapCustomCoords.getMVPMatrix()
-        // @ts-ignore
-        sceneCenterMercator = this.mapService.getCustomCoordCenter();
-        const uniformBuffer = layer.getLayerUniformBuffer();
-        uniformBuffer.subData({
-          offset: 0,
-          data: new Uint8Array(new Float32Array([...mvp, ...sceneCenterMercator]).buffer)
-        });
-      }
       const {
         width,
         height
@@ -72,7 +56,7 @@ class ShaderUniformPlugin {
       const {
         data,
         uniforms
-      } = this.generateUBO(mvp, sceneCenterMercator, width, height);
+      } = this.generateUBO(width, height);
       if (this.layerService.alreadyInRendering && this.rendererService.uniformBuffers[0]) {
         const renderUniformBuffer = this.rendererService.uniformBuffers[0];
         // Update only once since all models can share one UBO.
@@ -96,20 +80,7 @@ class ShaderUniformPlugin {
       }
     });
   }
-
-  /**
-   * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
-   * @param layer
-   */
-  setLayerCenter(layer) {
-    if (layer.coordCenter === undefined) {
-      layer.coordCenter = layer.getSource().center;
-    }
-    if (this.mapService.setCoordCenter) {
-      this.mapService.setCoordCenter(layer.coordCenter);
-    }
-  }
-  generateUBO(u_Mvp, sceneCenterMercator, width, height) {
+  generateUBO(width, height) {
     const u_ProjectionMatrix = this.cameraService.getProjectionMatrix();
     const u_ViewMatrix = this.cameraService.getViewMatrix();
     const u_ViewProjectionMatrix = this.cameraService.getViewProjectionMatrix();
@@ -169,9 +140,6 @@ class ShaderUniformPlugin {
         [_l7Core.CoordinateUniform.PixelsPerDegree]: u_PixelsPerDegree,
         [_l7Core.CoordinateUniform.PixelsPerDegree2]: u_PixelsPerDegree2,
         [_l7Core.CoordinateUniform.PixelsPerMeter]: u_PixelsPerMeter,
-        // 坐标系是高德2.0的时候单独计算
-        [_l7Core.CoordinateUniform.Mvp]: u_Mvp,
-        u_sceneCenterMercator: sceneCenterMercator,
         // 其他参数，例如视口大小、DPR 等
         u_ViewportSize: u_ViewportSize,
         u_ModelMatrix,

package/lib/point/models/billboard_point.d.ts

@@ -7,6 +7,20 @@ export declare function PointTriangulation(feature: IEncodeFeature): {
     size: number;
 };
 export default class SimplePointModel 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;
+    };
     getDefaultStyle(): Partial<IPointLayerStyleOptions>;
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];

package/lib/point/models/billboard_point.js

@@ -10,11 +10,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _l7Utils = require("@antv/l7-utils");
-var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 /* babel-plugin-inline-import '../shaders/billboard/billboard_point_frag.glsl' */
 const simplePointFrag = "\nlayout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nin vec4 v_color;\nin float v_blur;\nin float v_innerRadius;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  vec2 center = vec2(0.5);\n\n  // Tip: \u7247\u5143\u5230\u4E2D\u5FC3\u70B9\u7684\u8DDD\u79BB 0 - 1\n  float fragmengTocenter = distance(center, gl_PointCoord) * 2.0;\n  // Tip: \u7247\u5143\u7684\u526A\u5207\u6210\u5706\u5F62\n  float circleClipOpacity = 1.0 - smoothstep(v_blur, 1.0, fragmengTocenter);\n\n\n  if(v_innerRadius < 0.99) {\n    // \u5F53\u5B58\u5728 stroke \u4E14 stroke > 0.01\n    float blurWidth = (1.0 - v_blur)/2.0;\n    vec4 stroke = vec4(u_stroke_color.rgb, u_stroke_opacity);\n    if(fragmengTocenter > v_innerRadius + blurWidth) {\n      outputColor = stroke;\n    } else if(fragmengTocenter > v_innerRadius - blurWidth){\n      float mixR = (fragmengTocenter - (v_innerRadius - blurWidth)) / (blurWidth * 2.0);\n      outputColor = mix(v_color, stroke, mixR);\n    } else {\n      outputColor = v_color;\n    }\n  } else {\n    // \u5F53\u4E0D\u5B58\u5728 stroke \u6216 stroke <= 0.01\n    outputColor = v_color;\n  }\n\n  outputColor = filterColor(outputColor);\n  \n  if(u_additive > 0.0) {\n    outputColor *= circleClipOpacity;\n  } else {\n    outputColor.a *= circleClipOpacity;\n  }\n\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard/billboard_point_vert.glsl' */
-const simplePointVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nout vec4 v_color;\nout float v_blur;\nout float v_innerRadius;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"project\"\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_blur = 1.0 - max(2.0/a_Size, 0.05);\n  v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);\n  \n  vec2 offset = project_pixel(u_offsets);\n  \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position.xy + offset, a_Position.z, 1.0);\n  } else { // else\n    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);\n    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));\n  }\n  \n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n  setPickingColor(a_PickingColor);\n}\n";
+const simplePointVert = "\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nout vec4 v_color;\nout float v_blur;\nout float v_innerRadius;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"project\"\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_blur = 1.0 - max(2.0 / a_Size, 0.05);\n  v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);\n\n  vec2 offset = project_pixel(u_offsets);\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n  setPickingColor(a_PickingColor);\n}\n";
 function PointTriangulation(feature) {
   const coordinates = feature.coordinates;
   return {
@@ -24,6 +23,12 @@ function PointTriangulation(feature) {
   };
 }
 class SimplePointModel extends _BaseModel.default {
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      SIZE: 9
+    });
+  }
   getDefaultStyle() {
     return {
       blend: 'additive'
@@ -60,6 +65,7 @@ class SimplePointModel extends _BaseModel.default {
         moduleName: 'pointSimple',
         vertexShader: simplePointVert,
         fragmentShader: simplePointFrag,
+        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         triangulation: PointTriangulation,
         depth: {
@@ -71,12 +77,14 @@ class SimplePointModel extends _BaseModel.default {
     })();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'size',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        shaderLocation: this.attributeLocation.SIZE,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],

package/lib/point/models/earthExtrude.d.ts

@@ -1,6 +1,22 @@
 import type { IModel } 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;
+        POS: number;
+        NORMAL: number;
+    };
     private raiseCount;
     private raiseRepeat;
     protected getCommonUniformsInfo(): {