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

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

@@ -7,20 +7,6 @@ export declare function PointTriangulation(feature: IEncodeFeature): {
     size: number;
 };
 export default class NormalModel 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/normal.js

@@ -9,10 +9,11 @@ exports.default = void 0;
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 /* babel-plugin-inline-import '../shaders/normal/normal_frag.glsl' */
 const normalFrag = "in vec4 v_color;\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n}";
 /* babel-plugin-inline-import '../shaders/normal/normal_vert.glsl' */
-const normalVert = "layout(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 u_Common {\n  float u_size_scale;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(project_pos);\n\n  gl_PointSize = a_Size * u_size_scale * 2.0 * u_DevicePixelRatio;\n}\n";
+const normalVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\n\nlayout(std140) uniform u_Common {\n  float u_size_scale;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if (u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position, 1.0);\n  } 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(project_pos);\n  }\n\n  gl_PointSize = a_Size * u_size_scale *  2.0  * u_DevicePixelRatio;\n}\n";
 function PointTriangulation(feature) {
   const coordinates = feature.coordinates;
   return {
@@ -22,12 +23,6 @@ function PointTriangulation(feature) {
   };
 }
 class NormalModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9
-    });
-  }
   getDefaultStyle() {
     return {
       blend: 'additive'
@@ -56,7 +51,6 @@ class NormalModel extends _BaseModel.default {
         vertexShader: normalVert,
         fragmentShader: normalFrag,
         triangulation: PointTriangulation,
-        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         depth: {
           enable: false
@@ -71,14 +65,12 @@ class NormalModel extends _BaseModel.default {
     return;
   }
   registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'size',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],

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

@@ -1,21 +1,6 @@
 import type { IAnimateOption, IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RadarModel 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;
-        EXTRUDE: number;
-    };
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];
         uniformsLength: number;

package/lib/point/models/radar.js

@@ -10,18 +10,12 @@ var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 /* babel-plugin-inline-import '../shaders/radar/radar_frag.glsl' */
 const pointFillFrag = "\nlayout(std140) uniform commonUniorm{\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\nin vec4 v_data;\nin vec4 v_color;\nin float v_radius;\nin vec2 v_extrude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\n\nvoid main() {\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius);\n\n  float outer_df = sdCircle(v_data.xy, 1.0);\n  float inner_df = sdCircle(v_data.xy, r);\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  outputColor = vec4(v_color.rgb, v_color.a);\n\n  if(u_additive > 0.0) {\n    outputColor *= opacity_t;\n  } else {\n    outputColor.a *= opacity_t;\n  }\n\n  if(outputColor.a > 0.0) {\n    outputColor = filterColor(outputColor);\n  }\n\n  vec2 extrude =  v_extrude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\n  float flag = sign(dir.y);\n  float rades = dot(dir, baseDir);\n  float radar_v = (flag - 1.0) * -0.5 * acos(rades)/pi;\n  // simple AA\n  if(radar_v > 0.99) {\n    radar_v = 1.0 - (radar_v - 0.99)/0.01;\n  }\n\n  outputColor.a *= radar_v;\n}\n";
 /* babel-plugin-inline-import '../shaders/radar/radar_vert.glsl' */
-const pointFillVert = "layout(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;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;\n\nlayout(std140) uniform commonUniorm {\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\n\nout vec4 v_data;\nout vec4 v_color;\nout float v_radius;\nout vec2 v_extrude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  float newSize = setPickingSize(a_Size);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2(\n    cos(time), sin(time),\n    -sin(time), cos(time)\n  );\n  v_extrude = rotateMatrix * a_Extrude.xy;\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_size_unit == 1.) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  v_radius = newSize;\n\n  vec2 offset = (a_Extrude.xy * (newSize));\n\n  offset = project_pixel(offset);\n\n  v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+const pointFillVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 11) in vec3 a_Extrude;\n\nlayout(std140) uniform commonUniorm {\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\n\nout vec4 v_data;\nout vec4 v_color;\nout float v_radius;\nout vec2 v_extrude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  float newSize = setPickingSize(a_Size);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2( \n    cos(time), sin(time), \n    -sin(time), cos(time)\n  );\n  v_extrude = rotateMatrix * a_Extrude.xy;\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_size_unit == 1.) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  v_radius = newSize;\n\n  vec2 offset = (a_Extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n  offset = project_pixel(offset);\n  \n  v_data = vec4(a_Extrude.x, a_Extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 class RadarModel extends _BaseModel.default {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      EXTRUDE: 10
-    });
-  }
   getCommonUniformsInfo() {
     const {
       blend,
@@ -58,7 +52,6 @@ class RadarModel extends _BaseModel.default {
         vertexShader: pointFillVert,
         fragmentShader: pointFillFrag,
         triangulation: _triangulation.PointFillTriangulation,
-        defines: _this2.getDefines(),
         inject: _this2.getInject(),
         depth: {
           enable: false
@@ -73,14 +66,12 @@ class RadarModel extends _BaseModel.default {
     return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];
   }
   registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'extrude',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Extrude',
-        shaderLocation: this.attributeLocation.EXTRUDE,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.EXTRUDE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -101,7 +92,7 @@ class RadarModel extends _BaseModel.default {
       name: 'size',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
         name: 'a_Size',
         buffer: {
           // give the WebGL driver a hint that this buffer may change

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

@@ -7,22 +7,6 @@ export declare function TextTrianglation(feature: IEncodeFeature): {
     size: number;
 };
 export default class TextModel 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;
-        TEXT_OFFSETS: number;
-        UV: number;
-    };
     glyphInfo: IEncodeFeature[];
     glyphInfoMap: {
         [key: string]: {

package/lib/point/models/text.js

@@ -12,12 +12,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _collisionIndex = _interopRequireDefault(require("../../utils/collision-index"));
 var _symbolLayout = require("../../utils/symbol-layout");
 /* babel-plugin-inline-import '../shaders/text/text_frag.glsl' */
 const textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\n\nuniform sampler2D u_sdf_map;\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nin vec2 v_uv;\nin float v_gamma_scale;\nin vec4 v_color;\nin vec4 v_stroke_color;\nin float v_fontScale;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n\n  // get sdf from atlas\n  float dist = texture(SAMPLER_2D(u_sdf_map), v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n\n  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));\n\n  outputColor.a *= alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (outputColor.a < 0.01) {\n    discard;\n  }\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/text/text_vert.glsl' */
-const textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\n\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;\nlayout(location = ATTRIBUTE_LOCATION_TEXT_OFFSETS) in vec2 a_textOffsets;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_tex;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nout vec2 v_uv;\nout float v_gamma_scale;\nout vec4 v_color;\nout vec4 v_stroke_color;\nout float v_fontScale;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_uv = a_tex / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textOffsets,rotation);\n\n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+const textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_textOffsets;\nlayout(location = 14) in vec2 a_tex;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nout vec2 v_uv;\nout float v_gamma_scale;\nout vec4 v_color;\nout vec4 v_stroke_color;\nout float v_fontScale;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  \n  v_uv = a_tex / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textOffsets,rotation);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
 const {
   isEqual
 } = _l7Utils.lodashUtil;
@@ -68,14 +69,6 @@ class TextModel extends _BaseModel.default {
       yield _this.reBuildModel();
     }));
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      TEXT_OFFSETS: 10,
-      UV: 11
-    });
-  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -139,7 +132,6 @@ class TextModel extends _BaseModel.default {
         moduleName: 'pointText',
         vertexShader: textVert,
         fragmentShader: textFrag,
-        defines: _this3.getDefines(),
         inject: _this3.getInject(),
         triangulation: TextTrianglation.bind(_this3),
         depth: {
@@ -195,13 +187,11 @@ class TextModel extends _BaseModel.default {
     this.layer.off('remapping', this.mapping);
   }
   registerBuiltinAttributes() {
-    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 20层级以上出现数据偏移
-    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'textOffsets',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
-        shaderLocation: this.attributeLocation.TEXT_OFFSETS,
+        shaderLocation: 10,
         name: 'a_textOffsets',
         // 文字偏移量
         buffer: {
@@ -221,7 +211,7 @@ class TextModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_tex',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],
@@ -233,14 +223,13 @@ class TextModel extends _BaseModel.default {
         }
       }
     });
-
     // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'size',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -380,6 +369,9 @@ class TextModel extends _BaseModel.default {
       // feature.centroid = calculteCentroid(coordinates);
 
       feature.centroid = (0, _l7Utils.calculateCentroid)(feature.coordinates);
+
+      // 此时地图高德2.0 originCentroid == centroid
+      feature.originCentroid = feature.version === 'GAODE2.x' ? (0, _l7Utils.calculateCentroid)(feature.originCoordinates) : feature.originCentroid = feature.centroid;
       this.glyphInfoMap[id] = {
         shaping,
         glyphQuads,
@@ -429,7 +421,9 @@ class TextModel extends _BaseModel.default {
         shaping,
         id = 0
       } = feature;
-      const centroid = feature.centroid;
+      // const centroid = feature.centroid as [number, number];
+      // const centroid = feature.originCentroid as [number, number];
+      const centroid = feature.version === 'GAODE2.x' ? feature.originCentroid : feature.centroid;
       const size = feature.size;
       const fontScale = size / 16;
       const pixels = this.mapService.lngLatToContainer(centroid);
@@ -498,7 +492,6 @@ class TextModel extends _BaseModel.default {
         vertexShader: textVert,
         fragmentShader: textFrag,
         triangulation: TextTrianglation.bind(_this5),
-        defines: _this5.getDefines(),
         inject: _this5.getInject(),
         depth: {
           enable: false

package/lib/point/shaders/billboard/billboard_point_vert.glsl

@@ -1,8 +1,7 @@
 
-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 = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
 
 layout(std140) uniform commonUniorm {
   vec4 u_stroke_color;
@@ -20,14 +19,18 @@ out float v_innerRadius;
 #pragma include "project"
 void main() {
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
-  v_blur = 1.0 - max(2.0 / a_Size, 0.05);
+  v_blur = 1.0 - max(2.0/a_Size, 0.05);
   v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);
-
+  
   vec2 offset = project_pixel(u_offsets);
-
-  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
-  gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));
-
+  
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * vec4(a_Position.xy + offset, a_Position.z, 1.0);
+  } else { // 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(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));
+  }
+  
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
   setPickingColor(a_PickingColor);
 }

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

@@ -5,11 +5,13 @@ precision highp float;
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-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(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(std140) uniform commonUniform {
   vec4 u_sourceColor;
@@ -40,7 +42,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;
   }
@@ -60,7 +62,15 @@ 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);
@@ -88,7 +98,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);
@@ -96,9 +106,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轴旋转矩阵
@@ -106,13 +116,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/lib/point/shaders/earthFill/earthFill_vert.glsl

@@ -1,8 +1,8 @@
-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(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(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/lib/point/shaders/extrude/extrude_vert.glsl

@@ -1,10 +1,10 @@
-#define pi (3.1415926535)
+#define pi 3.1415926535
 
-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(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(std140) uniform commonUniforms {
   float u_pickLight;
@@ -25,41 +25,46 @@ 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) {
-    // 圆柱体不固定高度
-  } 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) { // 圆柱体不固定高度
+    
+    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);
     }
   }
 
-  vec2 positions = a_Extrude.xy;
-  vec2 positions64Low = a_Extrude.zw;
-  vec4 project_pos = project_position(vec4(positions, 0.0, 1.0), positions64Low);
+
+  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));
 
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
@@ -67,8 +72,7 @@ void main() {
   // // 圆柱光照效果
   float lightWeight = 1.0;
 
-  if (u_lightEnable > 0.0) {
-    // 取消三元表达式，增强健壮性
+  if(u_lightEnable > 0.0) { // 取消三元表达式，增强健壮性
     lightWeight = calc_lighting(pos);
   }
 
@@ -76,20 +80,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(pos);
+
+  gl_Position = project_common_position_to_clipspace_v2(pos);
 
   setPickingColor(a_PickingColor);
 }

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

@@ -1,9 +1,8 @@
-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(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(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
@@ -12,7 +11,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;
@@ -26,7 +25,7 @@ out float v_radius;
 
 void main() {
   // 透明度计算
-   v_stroke = stroke;
+   v_stroke = stroke;  
   vec3 extrude = a_Extrude;
   float shape_type = a_Shape;
   /*
@@ -52,14 +51,17 @@ 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), a_Position64Low);
+
+  // 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));
   // 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;
@@ -72,8 +74,8 @@ void main() {
       raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;
     }
   }
-
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
+  
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   setPickingColor(a_PickingColor);
 }