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

package/es/geometry/models/billboard.d.ts

@@ -1,21 +1,6 @@
 import type { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class BillBoardModel 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;
-        EXTRUDE: number;
-        UV: number;
-    };
     protected texture: ITexture2D;
     private radian;
     planeGeometryTriangulation: () => {

package/es/geometry/models/billboard.js

@@ -3,10 +3,11 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/billboard_frag.glsl' */
 const planeFrag = "layout(std140) uniform commonUniforms {\n vec2 u_size;\n float u_raisingHeight;\n float u_rotation;\n float u_opacity;\n};\n\nuniform sampler2D u_texture;\n\nin vec2 v_uv;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
-const planeVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_size;\n  float u_raisingHeight;\n  float u_rotation;\n  float u_opacity;\n};\n\nout vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\nvoid main() {\n  vec3 extrude = a_Extrude;\n  v_uv = a_Uv;\n  float raiseHeight = u_raisingHeight;\n  if (\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n  ) {\n    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n  // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n  vec2 offsetXY = project_pixel(rotate_matrix(vec2(extrude.x * u_size.x, 0.0), u_rotation));\n  // \u7ED5 z \u8F74\u65CB\u8F6C\n  float x = project_pos.x + offsetXY.x;\n  float y = project_pos.y + offsetXY.y;\n  // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n  float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n  gl_Position = project_common_position_to_clipspace(vec4(x, y, z, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+const planeVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 11) in vec3 a_Extrude;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_size;\n float u_raisingHeight;\n float u_rotation;\n float u_opacity;\n};\n\nout vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_uv = a_Uv;\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   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(rotate_matrix(vec2(extrude.x * u_size.x, 0.0),u_rotation));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
 export default class BillBoardModel extends BaseModel {
   constructor(...args) {
     super(...args);
@@ -24,13 +25,6 @@ export default class BillBoardModel extends BaseModel {
       };
     });
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      EXTRUDE: 9,
-      UV: 10
-    });
-  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -48,11 +42,12 @@ export default class BillBoardModel extends BaseModel {
     /**
      *               rotateFlag
      * DEFAULT            1
-     * MAPBOX             1
-     * AMAP              -1
+     * MAPBOX           1
+     * GAODE2.x         -1
+     * GAODE1.x         -1
      */
     let rotateFlag = 1;
-    if (this.mapService.getType() === 'amap') {
+    if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
       rotateFlag = -1;
     }
     // 控制图标的旋转角度（绕 Z 轴旋转）
@@ -94,7 +89,6 @@ export default class BillBoardModel extends BaseModel {
         vertexShader: planeVert,
         fragmentShader: planeFrag,
         triangulation: _this.planeGeometryTriangulation,
-        defines: _this.getDefines(),
         inject: _this.getInject(),
         primitive: gl.TRIANGLES,
         depth: {
@@ -140,7 +134,7 @@ export default class BillBoardModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Extrude',
-        shaderLocation: this.attributeLocation.EXTRUDE,
+        shaderLocation: ShaderLocation.EXTRUDE,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],
@@ -159,7 +153,7 @@ export default class BillBoardModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: ShaderLocation.UV,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],

package/es/geometry/models/plane.d.ts

@@ -1,20 +1,6 @@
 import type { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class PlaneModel 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;
-        UV: number;
-    };
     protected texture: ITexture2D;
     protected terrainImage: HTMLImageElement;
     protected terrainImageLoaded: boolean;

package/es/geometry/models/plane.js

@@ -4,10 +4,11 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 // import { mat4, vec3 } from 'gl-matrix';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/plane_frag.glsl' */
 const planeFrag = "\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nin vec3 v_Color;\nin vec2 v_uv;\nin float v_clip;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n    outputColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    outputColor = vec4(v_Color, u_opacity);\n  }\n  outputColor.a *= v_clip;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
-const planeVert = "\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
+const planeVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec3 a_Color;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n  \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
 export default class PlaneModel extends BaseModel {
   constructor(...args) {
     super(...args);
@@ -39,12 +40,6 @@ export default class PlaneModel extends BaseModel {
       };
     });
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      UV: 10
-    });
-  }
   initPlane(width = 1, height = 1, widthSegments = 1, heightSegments = 1, lng = 120, lat = 30) {
     // https://github.com/mrdoob/three.js/blob/dev/src/geometries/PlaneGeometry.js
     const widthHalf = width / 2;
@@ -61,7 +56,13 @@ export default class PlaneModel extends BaseModel {
       const y = iy * segmentHeight - heightHalf;
       for (let ix = 0; ix < gridX1; ix++) {
         const x = ix * segmentWidth - widthHalf;
-        positions.push(x + lng, -y + lat, 0);
+        if (this.mapService.version === 'GAODE2.x') {
+          // @ts-ignore
+          const [a, b] = this.mapService.lngLatToCoord([x + lng, -y + lat]);
+          positions.push(a, b, 0);
+        } else {
+          positions.push(x + lng, -y + lat, 0);
+        }
         positions.push(ix / gridX);
         positions.push(1 - iy / gridY);
       }
@@ -138,7 +139,6 @@ export default class PlaneModel extends BaseModel {
         vertexShader: planeVert,
         fragmentShader: planeFrag,
         triangulation: _this.planeGeometryTriangulation,
-        defines: _this.getDefines(),
         inject: _this.getInject(),
         primitive: gl.TRIANGLES,
         depth: {
@@ -296,7 +296,7 @@ export default class PlaneModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: this.attributeLocation.UV,
+        shaderLocation: ShaderLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/geometry/models/sprite.js

@@ -6,7 +6,7 @@ import BaseModel from "../../core/BaseModel";
 /* babel-plugin-inline-import '../shaders/sprite_frag.glsl' */
 const spriteFrag = "\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\nuniform sampler2D u_texture;\n\nin vec3 v_Color;\nin float v_d;\nout vec4 outputColor;\n\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), gl_PointCoord);\n    outputColor.a *= u_opacity;\n  } else {\n    outputColor = vec4(v_Color, u_opacity);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/sprite_vert.glsl' */
-const spriteVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\n\nout vec3 v_Color;\nout float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n  v_Color = a_Color.xyz;\n  v_d = a_Position.z;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n  gl_PointSize = pow(u_Zoom - 1.0, 2.0) * u_Scale;\n}\n";
+const spriteVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec3 a_Color;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\n\nout vec3 v_Color;\nout float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n   v_Color = a_Color.xyz;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_d = a_Position.z;\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));\ngl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;\n}\n";
 var SPRITE_ANIMATE_DIR = /*#__PURE__*/function (SPRITE_ANIMATE_DIR) {
   SPRITE_ANIMATE_DIR["UP"] = "up";
   SPRITE_ANIMATE_DIR["DOWN"] = "down";
@@ -92,6 +92,7 @@ export default class SpriteModel extends BaseModel {
   initSprite(radius = 10, spriteCount = 100, lng = 120, lat = 30) {
     const indices = [];
     const positions = [];
+    const mapService = this.mapService;
     const heightLimit = this.spriteAnimate === SPRITE_ANIMATE_DIR.UP ? -this.spriteTop : this.spriteTop;
     for (let i = 0; i < spriteCount; i++) {
       const height = Math.random() * heightLimit;
@@ -105,7 +106,13 @@ export default class SpriteModel extends BaseModel {
       const randomY = radius * Math.random();
       const x = -radius / 2 + randomX;
       const y = -radius / 2 + randomY;
-      return [x + lng, -y + lat, z, 0, 0];
+      if (mapService.version === 'GAODE2.x') {
+        // @ts-ignore
+        const [a, b] = mapService.lngLatToCoord([x + lng, -y + lat]);
+        return [a, b, z, 0, 0];
+      } else {
+        return [x + lng, -y + lat, z, 0, 0];
+      }
     }
     return {
       indices,
@@ -177,7 +184,6 @@ export default class SpriteModel extends BaseModel {
         vertexShader: spriteVert,
         fragmentShader: spriteFrag,
         triangulation: _this.planeGeometryTriangulation,
-        defines: _this.getDefines(),
         inject: _this.getInject(),
         primitive: gl.POINTS,
         depth: {

package/es/geometry/shaders/billboard_vert.glsl

@@ -1,12 +1,12 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
-  vec2 u_size;
-  float u_raisingHeight;
-  float u_rotation;
-  float u_opacity;
+ vec2 u_size;
+ float u_raisingHeight;
+ float u_rotation;
+ float u_opacity;
 };
 
 out vec2 v_uv;
@@ -15,29 +15,26 @@ out vec2 v_uv;
 #pragma include "picking"
 #pragma include "rotation_2d"
 void main() {
-  vec3 extrude = a_Extrude;
-  v_uv = a_Uv;
-  float raiseHeight = u_raisingHeight;
-  if (
-    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
-    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
-  ) {
-    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
-    raiseHeight = u_raisingHeight * mapboxZoomScale;
-  }
+   vec3 extrude = a_Extrude;
+   v_uv = a_Uv;
+   float raiseHeight = u_raisingHeight;
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+      raiseHeight = u_raisingHeight * mapboxZoomScale;
+   }
 
-  // 计算经纬度点位坐标
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
+   // 计算经纬度点位坐标
+   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
 
-  // 计算绕 z 轴旋转后的偏移
-  vec2 offsetXY = project_pixel(rotate_matrix(vec2(extrude.x * u_size.x, 0.0), u_rotation));
-  // 绕 z 轴旋转
-  float x = project_pos.x + offsetXY.x;
-  float y = project_pos.y + offsetXY.y;
-  // z 轴不参与旋转
-  float z = project_pixel(extrude.y * u_size.y + raiseHeight);
+   // 计算绕 z 轴旋转后的偏移
+   vec2 offsetXY = project_pixel(rotate_matrix(vec2(extrude.x * u_size.x, 0.0),u_rotation));
+   // 绕 z 轴旋转
+   float x = project_pos.x + offsetXY.x;
+   float y = project_pos.y + offsetXY.y;
+   // z 轴不参与旋转
+   float z = project_pixel(extrude.y * u_size.y + raiseHeight);
 
-  gl_Position = project_common_position_to_clipspace(vec4(x, y, z, 1.0));
+   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));
 
-  setPickingColor(a_PickingColor);
+   setPickingColor(a_PickingColor);
 }

package/es/geometry/shaders/plane_vert.glsl

@@ -1,7 +1,7 @@
 
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;
-layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec3 a_Color;
+layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -18,15 +18,15 @@ out float v_clip;
 void main() {
    v_Color = a_Color;
    v_uv = a_Uv;
-
+  
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
    v_clip = 1.0;
    if(a_Position.z < u_terrainClipHeight) {
       v_clip = 0.0;
    }
-
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
+  
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));
 
    setPickingColor(a_PickingColor);
 }

package/es/geometry/shaders/sprite_vert.glsl

@@ -1,5 +1,5 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec3 a_Color;
 
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -12,10 +12,12 @@ out float v_d;
 
 #pragma include "projection"
 void main() {
-  v_Color = a_Color.xyz;
-  v_d = a_Position.z;
+   v_Color = a_Color.xyz;
+  
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
-  gl_PointSize = pow(u_Zoom - 1.0, 2.0) * u_Scale;
+   v_d = a_Position.z;
+
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));
+gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;
 }

package/es/heatmap/models/grid.d.ts

@@ -1,20 +1,6 @@
 import type { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class GridModel 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;
-        POS: number;
-    };
     getUninforms(): IModelUniform;
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];

package/es/heatmap/models/grid.js

@@ -6,14 +6,8 @@ import { HeatmapGridTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/grid/grid_frag.glsl' */
 const grid_frag = "in vec4 v_color;\n\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/grid/grid_vert.glsl' */
-const grid_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location =  ATTRIBUTE_LOCATION_POS) in vec3 a_Pos;\n\nlayout(std140) uniform commonUniforms {\n    vec2 u_radius;\n    float u_opacity;\n    float u_coverage;\n    float u_angle;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\n  v_color.a *= u_opacity;\n\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage;\n\n  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n  vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  gl_Position = project_common_position_to_clipspace(project_pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
+const grid_vert = "layout(location = 0) in vec3 a_Position;\r\nlayout(location = 1) in vec4 a_Color;\r\nlayout(location = 10) in vec3 a_Pos;\r\n\r\nlayout(std140) uniform commonUniforms {\r\n    vec2 u_radius;\r\n    float u_opacity;\r\n    float u_coverage;\r\n    float u_angle;\r\n};\r\n\r\n\r\nout vec4 v_color;\r\n\r\n\r\n#pragma include \"projection\"\r\n#pragma include \"project\"\r\n#pragma include \"picking\"\r\n\r\nvoid main() {\r\n  v_color = a_Color;\r\n  v_color.a *= u_opacity;\r\n\r\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\r\n  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage ;\r\n  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n  // gl_Position = project_common_position_to_clipspace(project_pos);\r\n\r\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\r\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\r\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\r\n    gl_Position = u_Mvp * (project_pos);\r\n  } else {\r\n     vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n    gl_Position = project_common_position_to_clipspace(project_pos);\r\n  }\r\n\r\n  setPickingColor(a_PickingColor);\r\n}\r\n";
 export default class GridModel extends BaseModel {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      POS: 9
-    });
-  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -49,7 +43,6 @@ export default class GridModel extends BaseModel {
         moduleName: 'heatmapGrid',
         vertexShader: grid_vert,
         fragmentShader: grid_frag,
-        defines: _this2.getDefines(),
         triangulation: HeatmapGridTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -65,7 +58,7 @@ export default class GridModel extends BaseModel {
       // 顶点经纬度位置
       type: AttributeType.Attribute,
       descriptor: {
-        shaderLocation: this.attributeLocation.POS,
+        shaderLocation: 10,
         name: 'a_Pos',
         buffer: {
           usage: gl.DYNAMIC_DRAW,
@@ -74,7 +67,7 @@ export default class GridModel extends BaseModel {
         },
         size: 3,
         update: feature => {
-          const coordinates = feature.coordinates;
+          const coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
           return [coordinates[0], coordinates[1], 0];
         }
       }

package/es/heatmap/models/grid3d.d.ts

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

package/es/heatmap/models/grid3d.js

@@ -2,20 +2,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/grid3d/grid_3d_frag.glsl' */
 const grid_3d_frag = "in vec4 v_color;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_radius;\n  float u_opacity;\n  float u_coverage;\n  float u_angle;\n};\n\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/grid3d/grid_3d_vert.glsl' */
-const grid_3d_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;\nlayout(location = ATTRIBUTE_LOCATION_POS) in vec3 a_Pos;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_radius;\n  float u_opacity;\n  float u_coverage;\n  float u_angle;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset = vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage);\n\n  vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n  vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n\n  float lightWeight = calc_lighting(project_pos);\n  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  gl_Position = project_common_position_to_clipspace(project_pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
+const grid_3d_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec3 a_Pos;\nlayout(location = 13) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_radius;\n  float u_opacity;\n  float u_coverage;\n  float u_angle;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n \n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u7ECF\u7EAC\u5EA6\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\n    vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));\n\n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w * u_opacity);\n  \n    gl_Position = u_Mvp * vec4(customLnglat , a_Position.z * a_Size, 1.0);\n  } else {\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n    vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n    \n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n    \n    gl_Position = project_common_position_to_clipspace(project_pos);\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
 export default class Grid3DModel extends BaseModel {
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      POS: 10,
-      NORMAL: 11
-    });
-  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -51,7 +44,6 @@ export default class Grid3DModel extends BaseModel {
         moduleName: 'heatmapGrid3d',
         vertexShader: grid_3d_vert,
         fragmentShader: grid_3d_frag,
-        defines: _this2.getDefines(),
         triangulation: PointExtrudeTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -66,7 +58,7 @@ export default class Grid3DModel extends BaseModel {
       name: 'size',
       type: AttributeType.Attribute,
       descriptor: {
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: ShaderLocation.SIZE,
         name: 'a_Size',
         buffer: {
           usage: gl.DYNAMIC_DRAW,
@@ -87,7 +79,7 @@ export default class Grid3DModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: this.attributeLocation.NORMAL,
+        shaderLocation: ShaderLocation.NORMAL,
         buffer: {
           usage: gl.STATIC_DRAW,
           data: [],
@@ -105,7 +97,7 @@ export default class Grid3DModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Pos',
-        shaderLocation: this.attributeLocation.POS,
+        shaderLocation: 10,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],
@@ -113,7 +105,7 @@ export default class Grid3DModel extends BaseModel {
         },
         size: 3,
         update: feature => {
-          const coordinates = feature.coordinates;
+          const coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
           return [coordinates[0], coordinates[1], 0];
         }
       }

package/es/heatmap/models/heatmap.d.ts

@@ -1,22 +1,6 @@
 import type { IFramebuffer, IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class HeatMapModel 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;
-        UV: number;
-        DIR: number;
-    };
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
     protected heatmapFramerBuffer: IFramebuffer;
@@ -33,14 +17,11 @@ export default class HeatMapModel extends BaseModel {
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
-    /**
-     * 热力图密度图
-     */
     private buildHeatMapIntensity;
     private buildHeatmap;
-    private build3dHeatMap;
     private drawIntensityMode;
     private drawHeatMap;
     private draw3DHeatMap;
+    private build3dHeatMap;
     private updateColorTexture;
 }