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

package/es/line/models/wall.js

@@ -3,12 +3,11 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { LineTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/wall/wall_frag.glsl' */
 const line_frag = "#define Animate 0.0\n#define LineTexture 1.0\n\n// line texture\n\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed;\n  float u_linearColor: 0;\n  float u_line_texture;\n  float u_textureBlend;\n  float u_iconStepCount;\n  float u_time;\n};\nin vec2 v_iconMapUV;\nin float v_blur;\nin float v_radio;\nin vec4 v_color;\nin vec4 v_dataset;\n\nout vec4 outputColor;\n#pragma include \"picking\"\n\nvoid main() {\n  float animateSpeed = 0.0; // \u8FD0\u52A8\u901F\u5EA6\n  float d_distance_ratio = v_dataset.r; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float v = v_dataset.a;\n\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    outputColor = mix(u_sourceColor, u_targetColor, v);\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     outputColor = v_color;\n  }\n\n  outputColor.a *= v_color.a; // \u5168\u5C40\u900F\u660E\u5EA6\n  if(u_animate.x == Animate) {\n      animateSpeed = u_time / u_animate.y;\n       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);\n      alpha = (alpha + u_animate.w -1.0) / u_animate.w;\n      alpha = smoothstep(0., 1., alpha);\n      outputColor.a *= alpha;\n  }\n\n  if(u_line_texture == LineTexture) { // while load texture\n    float aDistance = v_dataset.g;      // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n    float d_texPixelLen = v_dataset.b;  // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen - animateSpeed);\n    float v = v_dataset.a;  // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C\n\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 start\n    float flag = 0.0;\n    if(u > 1.0/u_iconStepCount) {\n      flag = 1.0;\n    }\n    u = fract(u*u_iconStepCount);\n    // \u8BA1\u7B97\u7EB9\u7406\u95F4\u9694 end\n\n    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;\n    vec4 pattern = texture(SAMPLER_2D(u_texture), uv);\n\n    // Tip: \u5224\u65AD\u7EB9\u7406\u95F4\u9694\n    if(flag > 0.0) {\n      pattern = vec4(0.0);\n    }\n\n    if(u_textureBlend == 0.0) { // normal\n      pattern.a = 0.0;\n      outputColor = filterColor(outputColor + pattern);\n    } else { // replace\n        pattern.a *= v_color.a;\n        if(outputColor.a <= 0.0) {\n          pattern.a = 0.0;\n        }\n        outputColor = filterColor(pattern);\n    }\n  }\n  \n\n  // blur - AA\n  if(v < v_blur) {\n    outputColor.a = mix(0.0, outputColor.a, v/v_blur);\n  } else if(v > 1.0 - v_blur) {\n    outputColor.a = mix(outputColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);\n  }\n\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/wall/wall_vert.glsl' */
-const line_vert = "#define Animate 0.0\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec2 a_Size;\nlayout(location = 10) in float a_Miter;\nlayout(location = 11) in float a_Total_Distance;\nlayout(location = 12) in vec4 a_Instance;\nlayout(location = 13) in vec3 a_Normal;\nlayout(location = 14) in vec2 a_iconMapUV;\nlayout(location = 15) in float a_Distance;\n\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed;\n  float u_linearColor: 0;\n  float u_line_texture;\n  float u_textureBlend;\n  float u_iconStepCount;\n  float u_time;\n};\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nout vec2 v_iconMapUV;\nout vec4 v_color;\nout float v_blur;\nout float v_radio;\nout vec4 v_dataset;\n\nvoid main() {\n\n\n  float d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float d_texPixelLen;    // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n\n  v_iconMapUV = a_iconMapUV;\n  if(u_heightfixed < 1.0) {     // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n    d_texPixelLen = project_pixel(u_icon_step);\n  } else {\n    d_texPixelLen = u_icon_step;\n  }\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n    d_texPixelLen *= 10.0;\n  }\n\n  if(u_animate.x == Animate || u_linearColor == 1.0) {\n      d_distance_ratio = a_Distance / a_Total_Distance;\n  }\n\n  float miter = (a_Miter + 1.0)/2.0;\n  // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\n  v_dataset[0] = d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  v_dataset[1] = a_Distance;       // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n  v_dataset[2] = d_texPixelLen;    // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n  v_dataset[3] = miter;          // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C 0 - 1\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float originSize = a_Size.x;  // \u56FA\u5B9A\u9AD8\u5EA6\n  if(u_heightfixed < 1.0) {    \n     originSize = project_float_meter(a_Size.x); // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n  }\n\n\n  float wallHeight = originSize * miter;\n  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));\n\n  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);\n  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));\n  } else {\n// \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // mapbox\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);\n      if(u_heightfixed > 0.0) {\n        wallHeight *= mapboxZoomScale;\n      }\n      \n    } else {\n      // lineHeight \u9876\u70B9\u504F\u79FB\u9AD8\u5EA6\n      if(u_heightfixed < 1.0) {\n        wallHeight *= pow(2.0, 20.0 - u_Zoom);\n      }\n    }\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
+const line_vert = "#define Animate 0.0\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 vec2 a_Size;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;\nlayout(location = ATTRIBUTE_LOCATION_DISTANCE_MITER_TOTAL) in vec3 a_Distance_Total_Miter;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  vec2 u_textSize;\n  float u_icon_step: 100;\n  float u_heightfixed;\n  float u_linearColor: 0;\n  float u_line_texture;\n  float u_textureBlend;\n  float u_iconStepCount;\n  float u_time;\n};\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n// texV \u7EBF\u56FE\u5C42 - \u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\uFF08\u7EBF\u7684\u5BBD\u5EA6\u65B9\u5411\uFF09\nout vec2 v_iconMapUV;\nout vec4 v_color;\nout float v_blur;\nout float v_radio;\nout vec4 v_dataset;\n\nvoid main() {\n  float a_Distance = a_Distance_Total_Miter.x;\n  float a_Miter = a_Distance_Total_Miter.y;\n  float a_Total_Distance = a_Distance_Total_Miter.z;\n\n  float d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  float d_texPixelLen; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n\n  v_iconMapUV = a_iconMapUV;\n  if (u_heightfixed < 1.0) {\n    // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n    d_texPixelLen = project_pixel(u_icon_step);\n  } else {\n    d_texPixelLen = u_icon_step;\n  }\n\n  if (u_animate.x == Animate || u_linearColor == 1.0) {\n    d_distance_ratio = a_Distance / a_Total_Distance;\n  }\n\n  float miter = (a_Miter + 1.0) / 2.0;\n  // \u8BBE\u7F6E\u6570\u636E\u96C6\u7684\u53C2\u6570\n  v_dataset[0] = d_distance_ratio; // \u5F53\u524D\u70B9\u4F4D\u8DDD\u79BB\u5360\u7EBF\u603B\u957F\u7684\u6BD4\u4F8B\n  v_dataset[1] = a_Distance; // \u5F53\u524D\u9876\u70B9\u7684\u8DDD\u79BB\n  v_dataset[2] = d_texPixelLen; // \u8D34\u56FE\u7684\u50CF\u7D20\u957F\u5EA6\uFF0C\u6839\u636E\u5730\u56FE\u5C42\u7EA7\u7F29\u653E\n  v_dataset[3] = miter; // \u7EBF\u56FE\u5C42\u8D34\u56FE\u90E8\u5206\u7684 v \u5750\u6807\u503C 0 - 1\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);\n\n  float originSize = a_Size.x; // \u56FA\u5B9A\u9AD8\u5EA6\n  if (u_heightfixed < 1.0) {\n    originSize = project_float_meter(a_Size.x); // \u9AD8\u5EA6\u968F zoom \u8C03\u6574\n  }\n\n  float wallHeight = originSize * miter;\n  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));\n\n  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);\n  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n\n  // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n  if (\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n  ) {\n    // mapbox\n    // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);\n    if (u_heightfixed > 0.0) {\n      wallHeight *= mapboxZoomScale;\n    }\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 export default class LineWallModel extends BaseModel {
   constructor(...args) {
     super(...args);
@@ -35,6 +34,15 @@ export default class LineWallModel extends BaseModel {
       this.textures = [this.texture];
     });
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      SIZE: 9,
+      NORMAL: 12,
+      UV: 13,
+      DISTANCE_MITER_TOTAL: 15
+    });
+  }
   getCommonUniformsInfo() {
     const {
       sourceColor,
@@ -110,6 +118,7 @@ export default class LineWallModel extends BaseModel {
         vertexShader: line_vert,
         fragmentShader: line_frag,
         triangulation: LineTriangulation,
+        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         depth: {
           enable: false
@@ -120,48 +129,14 @@ export default class LineWallModel extends BaseModel {
     })();
   }
   registerBuiltinAttributes() {
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'distance',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Distance',
-        shaderLocation: 15,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: gl.STATIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 1,
-        update: (feature, featureIdx, vertex) => {
-          return [vertex[3]];
-        }
-      }
-    });
-    this.styleAttributeService.registerStyleAttribute({
-      name: 'total_distance',
-      type: AttributeType.Attribute,
-      descriptor: {
-        name: 'a_Total_Distance',
-        shaderLocation: 11,
-        buffer: {
-          // give the WebGL driver a hint that this buffer may change
-          usage: gl.STATIC_DRAW,
-          data: [],
-          type: gl.FLOAT
-        },
-        size: 1,
-        update: (feature, featureIdx, vertex) => {
-          return [vertex[5]];
-        }
-      }
-    });
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'size',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: ShaderLocation.SIZE,
+        shaderLocation: this.attributeLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,
@@ -177,14 +152,12 @@ export default class LineWallModel extends BaseModel {
         }
       }
     });
-
-    // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'normal',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: ShaderLocation.NORMAL,
+        shaderLocation: this.attributeLocation.NORMAL,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.STATIC_DRAW,
@@ -199,20 +172,21 @@ export default class LineWallModel extends BaseModel {
       }
     });
     this.styleAttributeService.registerStyleAttribute({
-      name: 'miter',
+      name: 'distanceAndTotalAndMiter',
       type: AttributeType.Attribute,
       descriptor: {
-        name: 'a_Miter',
-        shaderLocation: 10,
+        name: 'a_Distance_Total_Miter',
+        shaderLocation: this.attributeLocation.DISTANCE_MITER_TOTAL,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.STATIC_DRAW,
           data: [],
           type: gl.FLOAT
         },
-        size: 1,
+        size: 3,
         update: (feature, featureIdx, vertex) => {
-          return [vertex[4]];
+          // [distance, miter, total_distance]
+          return [vertex[3], vertex[4], vertex[5]];
         }
       }
     });
@@ -221,7 +195,7 @@ export default class LineWallModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_iconMapUV',
-        shaderLocation: 14,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/line/shaders/arc/line_arc_vert.glsl

@@ -1,10 +1,12 @@
-#define Animate 0.0
-#define LineTexture 1.0
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 12) in vec4 a_Instance;
-layout(location = 14) in vec2 a_iconMapUV;
+#define Animate (0.0)
+#define LineTexture (1.0)
+
+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_INSTANCE) in vec4 a_Instance;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -22,6 +24,7 @@ layout(std140) uniform commonUniorm {
   float u_time;
   float u_linearColor: 0.0;
 };
+
 out vec4 v_color;
 out vec2 v_iconMapUV;
 out vec4 v_lineData;
@@ -29,13 +32,12 @@ out vec4 v_lineData;
 out vec4 v_dash_array;
 out float v_distance_ratio;
 
-
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
 
 float bezier3(vec3 arr, float t) {
-  float ut = 1. - t;
+  float ut = 1.0 - t;
   return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
 }
 vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
@@ -45,10 +47,12 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   float thetaOffset = arcThetaOffset;
   float r2 = r / 2.0 / cos(thetaOffset);
   float theta2 = theta + thetaOffset;
-  vec2 mid = vec2(r2*cos(theta2) + source.x, r2*sin(theta2) + source.y);
-  if(u_lineDir == 1.0) { // 正向
+  vec2 mid = vec2(r2 * cos(theta2) + source.x, r2 * sin(theta2) + source.y);
+  if (u_lineDir == 1.0) {
+    // 正向
     return mid;
-  } else { // 逆向
+  } else {
+    // 逆向
     // (mid + vmin)/2 = (s + t)/2
     vec2 vmid = source + target - mid;
     return vmid;
@@ -56,23 +60,23 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   // return mid;
 }
 float getSegmentRatio(float index) {
-    // dash: index / (segmentNumber - 1.);
-    // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
-    return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
-    //  return index / (segmentNumber - 1.);
+  // dash: index / (segmentNumber - 1.);
+  // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+  return smoothstep(0.0, 1.0, index / (segmentNumber - 1.0));
+  //  return index / (segmentNumber - 1.);
 }
-vec2 interpolate (vec2 source, vec2 target, float t, float arcThetaOffset) {
+vec2 interpolate(vec2 source, vec2 target, float t, float arcThetaOffset) {
   // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
   vec2 mid = midPoint(source, target, arcThetaOffset);
   vec3 x = vec3(source.x, mid.x, target.x);
   vec3 y = vec3(source.y, mid.y, target.y);
-  return vec2(bezier3(x ,t), bezier3(y,t));
+  return vec2(bezier3(x, t), bezier3(y, t));
 }
 vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
   // normalized direction of the line
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
-   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
+  dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
   vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
   return offset;
 }
@@ -81,43 +85,34 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
    dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-   return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
+   return dir_screenspace.xy * sign(offset_direction);
 }
 
 void main() {
   //vs中计算渐变色
-  if(u_linearColor==1.0){
+  if (u_linearColor == 1.0) {
     float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
-    v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
-  }
-  else{
+    v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex / segmentNumber);
+  } else {
     v_color = a_Color;
   }
   v_color.a = v_color.a * opacity;
 
-  vec2 source = a_Instance.rg;  // 起始点
-  vec2 target =  a_Instance.ba; // 终点
-
-
+  vec2 source_world = a_Instance.rg; // 起始点
+  vec2 target_world = a_Instance.ba; // 终点
 
   float segmentIndex = a_Position.x;
   float segmentRatio = getSegmentRatio(segmentIndex);
 
-  //计算dashArray和distanceRatio 输出到片元
-  vec2 s = source;
-  vec2 t = target;
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    s = unProjCustomCoord(source);
-    t = unProjCustomCoord(target);
-  }
-  float total_Distance = pixelDistance(s, t) / 2.0 * PI;
+  // 计算 dashArray 和 distanceRatio 输出到片元
+  float total_Distance = pixelDistance(source_world, target_world) / 2.0 * PI;
   v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
   v_distance_ratio = segmentIndex / segmentNumber;
 
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
-  
+
   if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
       if(u_lineDir != 1.0) {
@@ -127,38 +122,35 @@ void main() {
 
   v_lineData.b = d_distance_ratio;
 
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 source = project_position(vec4(source_world, 0, 1.), a_Instance64Low.xy);
+  vec4 target = project_position(vec4(target_world, 0, 1.), a_Instance64Low.zw);
 
-  
-  vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
+  vec2 currPos = interpolate(source.xy, target.xy, segmentRatio, thetaOffset);
+  vec2 nextPos = interpolate(source.xy, target.xy, nextSegmentRatio, thetaOffset);
 
+  vec2 offset = project_pixel(
+    getExtrusionOffset((nextPos.xy - currPos.xy) * indexDir, a_Position.y)
+  );
 
   float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
   v_lineData.r = d_segmentIndex;
 
   if(LineTexture == u_line_texture) { // 开启贴图模式
-
     float arcDistrance = length(source - target); // 起始点和终点的距离
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20) { // amap
-      arcDistrance *= 1000000.0;
-    }
-    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); // 贴图沿弧线方向的长度 - 随地图缩放改变
-    float texCount = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
+    float texCount = floor(arcDistrance / pixelLen); // 贴图在弧线上重复的数量
     v_lineData.g = texCount;
 
     float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
     float linePixelSize = project_pixel(a_Size); // 定点位置偏移
-    v_lineData.a = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
+    v_lineData.a = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
   }
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(currPos.xy + offset, 0, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/line/shaders/arc3d/line_arc_3d_vert.glsl

@@ -2,11 +2,13 @@
 #define LineTypeDash 1.0
 #define Animate 0.0
 #define LineTexture 1.0
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 12) in vec4 a_Instance;
-layout(location = 14) in vec2 a_iconMapUV;
+
+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_INSTANCE) in vec4 a_Instance;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
 
 
 layout(std140) uniform commonUniorm {
@@ -75,7 +77,7 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-  return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
+  return dir_screenspace.xy * sign(offset_direction);
 }
 
 float torad(float deg) {
@@ -107,8 +109,8 @@ void main() {
     v_color = a_Color;
   }
   v_color.a = v_color.a * opacity;
-  vec2 source = project_position(vec4(a_Instance.rg, 0, 0)).xy;
-  vec2 target = project_position(vec4(a_Instance.ba, 0, 0)).xy;
+  vec2 source = project_position(vec4(a_Instance.rg, 0, 0), a_Instance64Low.xy).xy;
+  vec2 target = project_position(vec4(a_Instance.ba, 0, 0), a_Instance64Low.zw).xy;
   float segmentIndex = a_Position.x;
   float segmentRatio = getSegmentRatio(segmentIndex);
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
@@ -116,14 +118,7 @@ void main() {
   float d_distance_ratio;
    if(u_line_type == LineTypeDash) {
     d_distance_ratio = segmentIndex / segmentNumber;
-    vec2 s = source;
-    vec2 t = target;
-    
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      s = unProjCustomCoord(source);
-      t = unProjCustomCoord(target);
-    }
-    float total_Distance = pixelDistance(s, t) / 2.0 * PI;
+    float total_Distance = pixelDistance(source, target) / 2.0 * PI;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
     if(u_animate.x == Animate) {
@@ -139,7 +134,7 @@ void main() {
 
 
   v_segmentIndex = a_Position.x;
-  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { // 开启贴图模式  
+  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { // 开启贴图模式
 
     float arcDistrance = length(source - target);
     float pixelLen =  project_pixel_texture(u_icon_step);
@@ -154,7 +149,7 @@ void main() {
   }
 
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + project_pixel(offset), curr.z * thetaOffset, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(curr.xy + project_pixel(offset), curr.z * thetaOffset, 1.0));
 
   // 地球模式
   if(u_globel > 0.0) {
@@ -173,10 +168,10 @@ void main() {
     float lineHeight = u_global_height * (-4.0*segmentRatio*segmentRatio + 4.0 * segmentRatio) * lnglatLength;
     // 地球点位
     vec3 globalPoint = normalize(mix(startLngLat, endLngLat, segmentRatio)) * (globalRadius + lineHeight) + lnglatOffset * a_Size;
-    
+
     gl_Position = u_ViewProjectionMatrix * vec4(globalPoint, 1.0);
   }
- 
+
 
   setPickingColor(a_PickingColor);
 }

package/es/line/shaders/flow/flow_line_vert.glsl

@@ -1,8 +1,9 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec2 a_Size;
-layout(location = 12) in vec4 a_Instance;
-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 vec2 a_Size;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE) in vec4 a_Instance;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
 
 layout(std140) uniform commonUniorm {
   float u_gap_width: 1.0;
@@ -17,78 +18,59 @@ layout(std140) uniform commonUniorm {
 out vec4 v_color;
 
 vec2 project_pixel_offset(vec2 offsets) {
+  vec2 data = project_pixel(offsets);
 
-   vec2 data = project_pixel(offsets);
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
-    return data;
-  }
-
-  return vec2(data.x, -data.y);;
+  return vec2(data.x, -data.y);
 }
 
 vec2 line_dir(vec2 target, vec2 source) {
-
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
-     return normalize(target - source);
-  }
   return normalize(ProjectFlat(target) - ProjectFlat(source));
 }
 
-float flag_gap() {
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
-     return 1.;
-  }
-  return -1.;
-
-}
-
 
 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);
 
-// 透明度计算
-  vec2 source = a_Instance.rg;  // 起始点
-  vec2 target =  a_Instance.ba; // 终点
-  vec2 flowlineDir = line_dir(target,source);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x); // mapbox || 高德
-   
-  vec2 position = mix(source, target, a_Position.x);
-  
-  float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    
+  vec2 position = mix(source_world, target_world, a_Position.x);
+  vec2 position64Low = mix(a_Instance64Low.rg, a_Instance64Low.ba, a_Position.x);
+
+  float lengthCommon = length(
+    project_position(vec4(target_world, 0, 1)) - project_position(vec4(source_world, 0, 1))
+  );
   vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || 高德
-  vec2 limitedOffsetDistances = clamp(   
-   offsetDistances,
-   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)
+  vec2 limitedOffsetDistances = clamp(
+    offsetDistances,
+    project_pixel(-lengthCommon * 0.2),
+    project_pixel(lengthCommon * 0.2)
   );
 
-
   float startOffsetCommon = project_pixel(offsets[0]);
   float endOffsetCommon = project_pixel(offsets[1]);
   float endpointOffset = mix(
-    clamp(startOffsetCommon, 0.0, lengthCommon*.2),
-    -clamp(endOffsetCommon, 0.0, lengthCommon*.2),
+    clamp(startOffsetCommon, 0.0, lengthCommon * 0.2),
+    -clamp(endOffsetCommon, 0.0, lengthCommon * 0.2),
     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 = flag_gap() * project_pixel(u_gap_width);
+  float gapCommon = -1. * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(
     flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -
-    perpendicularDir *  (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),
+      perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),
     0.0
   );
 
-  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0), position64Low);
 
   vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);
   v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy +  offsetCommon.xy, 0., 1.0));
-
-
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy +  offsetCommon.xy, 0., 1.0));
 
   setPickingColor(a_PickingColor);
 }