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

package/es/heatmap/models/heatmap.js

@@ -2,22 +2,23 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, TextureUsage, gl } from '@antv/l7-core';
-import { generateColorRamp, lodashUtil } from '@antv/l7-utils';
+import { generateColorRamp, getCullFace, lodashUtil } from '@antv/l7-utils';
 import { mat4 } from 'gl-matrix';
 import BaseModel from "../../core/BaseModel";
 import { HeatmapTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_3d_frag.glsl' */
 const heatmap_3d_frag = "layout(std140) uniform commonUniforms {\n  mat4 u_ViewProjectionMatrixUncentered;\n  mat4 u_InverseViewProjectionMatrix;\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\nin float v_intensity;\nout vec4 outputColor;\n\nvoid main(){\n   \n    float intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;\n    vec4 color = texture(SAMPLER_2D(u_colorTexture),vec2(intensity, 0));\n    outputColor = color;\n    // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;\n   outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_3d_vert.glsl' */
-const heatmap_3d_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 10) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  mat4 u_ViewProjectionMatrixUncentered;\n  mat4 u_InverseViewProjectionMatrix;\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nout vec2 v_texCoord;\nout float v_intensity;\n\nvec2 toBezier(float t, vec2 P0, vec2 P1, vec2 P2, vec2 P3) {\n  float t2 = t * t;\n  float one_minus_t = 1.0 - t;\n  float one_minus_t2 = one_minus_t * one_minus_t;\n  return P0 * one_minus_t2 * one_minus_t +\n  P1 * 3.0 * t * one_minus_t2 +\n  P2 * 3.0 * t2 * one_minus_t +\n  P3 * t2 * t;\n}\nvec2 toBezier(float t, vec4 p) {\n  return toBezier(t, vec2(0.0, 0.0), vec2(p.x, p.y), vec2(p.z, p.w), vec2(1.0, 1.0));\n}\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_texCoord = a_Uv;\n\n  vec2 pos = a_Uv * vec2(2.0) - vec2(1.0); // \u5C06\u539F\u672C 0 -> 1 \u7684 uv \u8F6C\u6362\u4E3A -1 -> 1 \u7684\u6807\u51C6\u5750\u6807\u7A7A\u95F4\uFF08NDC\uFF09\n\n  vec4 p1 = vec4(pos, 0.0, 1.0); // x/y \u5E73\u9762\u4E0A\u7684\u70B9\uFF08z == 0\uFF09\u53EF\u4EE5\u8BA4\u4E3A\u662F\u4E09\u7EF4\u4E0A\u7684\u70B9\u88AB\u6295\u5F71\u5230\u5E73\u9762\u540E\u7684\u70B9\n  vec4 p2 = vec4(pos, 1.0, 1.0); // \u5E73\u884C\u4E8Ex/y\u5E73\u9762\u3001z==1 \u7684\u5E73\u9762\u4E0A\u7684\u70B9\n\n  vec4 inverseP1 = u_InverseViewProjectionMatrix * p1; // \u6839\u636E\u89C6\u56FE\u6295\u5F71\u77E9\u9635\u7684\u9006\u77E9\u9635\u5E73\u9762\u4E0A\u7684\u53CD\u7B97\u51FA\u4E09\u7EF4\u7A7A\u95F4\u4E2D\u7684\u70B9\uFF08p1\u5E73\u9762\u4E0A\u7684\u70B9\uFF09\n  vec4 inverseP2 = u_InverseViewProjectionMatrix * p2;\n\n  inverseP1 = inverseP1 / inverseP1.w; // \u5F52\u4E00\u5316\u64CD\u4F5C\uFF08\u5F52\u4E00\u5316\u540E\u4E3A\u4E16\u754C\u5750\u6807\uFF09\n  inverseP2 = inverseP2 / inverseP2.w;\n\n  float zPos = (0.0 - inverseP1.z) / (inverseP2.z - inverseP1.z); // ??\n  vec4 position = inverseP1 + zPos * (inverseP2 - inverseP1);\n\n  vec4 b = vec4(0.5, 0.0, 1.0, 0.5);\n  float fh;\n\n  v_intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;\n  fh = toBezier(v_intensity, b).y;\n  gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.0), 1.0);\n\n}\n"; // 绘制平面热力的 shader
+const heatmap_3d_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  mat4 u_ViewProjectionMatrixUncentered;\n  mat4 u_InverseViewProjectionMatrix;\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nout vec2 v_texCoord;\nout float v_intensity;\n\nvec2 toBezier(float t, vec2 P0, vec2 P1, vec2 P2, vec2 P3) {\n    float t2 = t * t;\n    float one_minus_t = 1.0 - t;\n    float one_minus_t2 = one_minus_t * one_minus_t;\n    return (P0 * one_minus_t2 * one_minus_t + P1 * 3.0 * t * one_minus_t2 + P2 * 3.0 * t2 * one_minus_t + P3 * t2 * t);\n}\nvec2 toBezier(float t, vec4 p){\n    return toBezier(t, vec2(0.0, 0.0), vec2(p.x, p.y), vec2(p.z, p.w), vec2(1.0, 1.0));\n}\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_texCoord = a_Uv;\n\n  vec2 pos = a_Uv * vec2(2.0) - vec2(1.0); // \u5C06\u539F\u672C 0 -> 1 \u7684 uv \u8F6C\u6362\u4E3A -1 -> 1 \u7684\u6807\u51C6\u5750\u6807\u7A7A\u95F4\uFF08NDC\uFF09\n\n  vec4 p1 = vec4(pos, 0.0, 1.0); // x/y \u5E73\u9762\u4E0A\u7684\u70B9\uFF08z == 0\uFF09\u53EF\u4EE5\u8BA4\u4E3A\u662F\u4E09\u7EF4\u4E0A\u7684\u70B9\u88AB\u6295\u5F71\u5230\u5E73\u9762\u540E\u7684\u70B9\n\tvec4 p2 = vec4(pos, 1.0, 1.0); // \u5E73\u884C\u4E8Ex/y\u5E73\u9762\u3001z==1 \u7684\u5E73\u9762\u4E0A\u7684\u70B9\n\n\tvec4 inverseP1 = u_InverseViewProjectionMatrix * p1; // \u6839\u636E\u89C6\u56FE\u6295\u5F71\u77E9\u9635\u7684\u9006\u77E9\u9635\u5E73\u9762\u4E0A\u7684\u53CD\u7B97\u51FA\u4E09\u7EF4\u7A7A\u95F4\u4E2D\u7684\u70B9\uFF08p1\u5E73\u9762\u4E0A\u7684\u70B9\uFF09\n\tvec4 inverseP2 = u_InverseViewProjectionMatrix * p2;\n\n  inverseP1 = inverseP1 / inverseP1.w; // \u5F52\u4E00\u5316\u64CD\u4F5C\uFF08\u5F52\u4E00\u5316\u540E\u4E3A\u4E16\u754C\u5750\u6807\uFF09\n\tinverseP2 = inverseP2 / inverseP2.w;\n\n\tfloat zPos = (0.0 - inverseP1.z) / (inverseP2.z - inverseP1.z); // ??\n\tvec4 position = inverseP1 + zPos * (inverseP2 - inverseP1);\n\n  vec4 b= vec4(0.5000, 0.0, 1.0, 0.5000);\n  float fh;\n\n  v_intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;\n  fh = toBezier(v_intensity, b).y;\n  gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.), 1.0);\n \n}\n"; // 绘制平面热力的 shader
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_frag.glsl' */
 const heatmap_frag = "uniform sampler2D u_texture;        // \u70ED\u529B\u5F3A\u5EA6\u56FE\nuniform sampler2D u_colorTexture;   // \u6839\u636E\u5F3A\u5EA6\u5206\u5E03\u7684\u8272\u5E26\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\nin vec2 v_texCoord;\nout vec4 outputColor;\n\n#pragma include \"scene_uniforms\"\n\nfloat getBlurIndusty() {\n    float vW = 2.0/ u_ViewportSize.x;\n    float vH = 2.0/ u_ViewportSize.y;\n    vec2 vUv = v_texCoord;\n    float i11 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n    float i12 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;\n    float i13 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n\n    float i21 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y) ).r;\n    float i22 = texture(SAMPLER_2D(u_texture), vec2( vUv.x , vUv.y) ).r;\n    float i23 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y) ).r;\n\n    float i31 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;\n    float i32 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;\n    float i33 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;\n\n    return(\n        i11 + \n        i12 + \n        i13 + \n        i21 + \n        i21 + \n        i22 + \n        i23 + \n        i31 + \n        i32 + \n        i33\n        )/9.0;\n}\n\n\nvoid main(){\n    // float intensity = texture(u_texture, v_texCoord).r;\n    float intensity = getBlurIndusty();\n    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(intensity, 0.0));\n    outputColor = color;\n    outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_vert.glsl' */
-const heatmap_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 10) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\n#pragma include \"scene_uniforms\"\n\nout vec2 v_texCoord;\nvoid main() {\n  v_texCoord = a_Uv;\n  #ifdef VIEWPORT_ORIGIN_TL\n  v_texCoord.y = 1.0 - v_texCoord.y;\n  #endif\n\n  gl_Position = vec4(a_Position.xy, 0, 1.0);\n}\n";
+const heatmap_vert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\n#pragma include \"scene_uniforms\"\n\nout vec2 v_texCoord;\nvoid main() {\n  v_texCoord = a_Uv;\n  #ifdef VIEWPORT_ORIGIN_TL\n    v_texCoord.y = 1.0 - v_texCoord.y;\n  #endif\n\n  gl_Position = vec4(a_Position.xy, 0, 1.);\n}\n";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_framebuffer_frag.glsl' */
 const heatmap_framebuffer_frag = "layout(std140) uniform commonUniforms {\n  float u_radius;\n  float u_intensity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n};\n\nin vec2 v_extrude;\nin float v_weight;\nout vec4 outputColor;\n#define GAUSS_COEF  0.3989422804014327\n\nvoid main(){\n    float d = -0.5 * 3.0 * 3.0 * dot(v_extrude, v_extrude);\n    float val = v_weight * u_intensity * GAUSS_COEF * exp(d);\n    outputColor = vec4(val, 1., 1., 1.);\n}\n";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_framebuffer_vert.glsl' */
-const heatmap_framebuffer_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;\nlayout(location = ATTRIBUTE_LOCATION_DIR) in vec2 a_Dir;\n\nlayout(std140) uniform commonUniforms {\n  float u_radius;\n  float u_intensity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n};\n\nout vec2 v_extrude;\nout float v_weight;\n\n#define GAUSS_COEF (0.3989422804014327)\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 picking_color_placeholder = u_PickingColor;\n\n  v_weight = a_Size;\n  float ZERO = 1.0 / 255.0 / 16.0;\n  float extrude_x = a_Dir.x * 2.0 - 1.0;\n  float extrude_y = a_Dir.y * 2.0 - 1.0;\n  vec2 extrude_dir = normalize(vec2(extrude_x, extrude_y));\n  float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;\n  v_extrude = extrude_dir * S;\n\n  vec2 offset = project_pixel(v_extrude * u_radius);\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n}\n";
+const heatmap_framebuffer_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_Dir;\n\n\nlayout(std140) uniform commonUniforms {\n  float u_radius;\n  float u_intensity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n};\n\nout vec2 v_extrude;\nout float v_weight;\n\n#define GAUSS_COEF  0.3989422804014327\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main(){\n    vec3 picking_color_placeholder = u_PickingColor;\n\n    v_weight = a_Size;\n    float ZERO = 1.0 / 255.0 / 16.0;\n    float extrude_x = a_Dir.x * 2.0 -1.0;\n    float extrude_y = a_Dir.y * 2.0 -1.0;\n    vec2 extrude_dir = normalize(vec2(extrude_x,extrude_y));\n    float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;\n    v_extrude = extrude_dir * S;\n\n    vec2 offset = project_pixel(v_extrude * u_radius);\n    vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n    // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n        gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));\n    } else {\n        gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n    }\n}\n";
 import { heatMap3DTriangulation } from "../triangulation";
 const {
   isEqual
@@ -36,14 +37,6 @@ export default class HeatMapModel extends BaseModel {
     _defineProperty(this, "colorModelUniformBuffer", []);
     _defineProperty(this, "heat3DModelUniformBuffer", []);
   }
-  get attributeLocation() {
-    return Object.assign(super.attributeLocation, {
-      MAX: super.attributeLocation.MAX,
-      SIZE: 9,
-      UV: 10,
-      DIR: 11
-    });
-  }
   prerender() {
     const {
       clear,
@@ -127,7 +120,7 @@ export default class HeatMapModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Dir',
-        shaderLocation: this.attributeLocation.DIR,
+        shaderLocation: 10,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],
@@ -144,7 +137,7 @@ export default class HeatMapModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: this.attributeLocation.SIZE,
+        shaderLocation: ShaderLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,
@@ -161,10 +154,6 @@ export default class HeatMapModel extends BaseModel {
       }
     });
   }
-
-  /**
-   * 热力图密度图
-   */
   buildHeatMapIntensity() {
     var _this3 = this;
     return _asyncToGenerator(function* () {
@@ -180,13 +169,12 @@ export default class HeatMapModel extends BaseModel {
         vertexShader: heatmap_framebuffer_vert,
         fragmentShader: heatmap_framebuffer_frag,
         triangulation: HeatmapTriangulation,
-        defines: _this3.getDefines(),
         depth: {
           enable: false
         },
         cull: {
           enable: true,
-          face: gl.FRONT
+          face: getCullFace(_this3.mapService.version)
         }
       });
       return model;
@@ -220,7 +208,7 @@ export default class HeatMapModel extends BaseModel {
       uniformBuffers: [...this.colorModelUniformBuffer, ...this.rendererService.uniformBuffers],
       attributes: {
         a_Position: createAttribute({
-          shaderLocation: this.attributeLocation.POSITION,
+          shaderLocation: ShaderLocation.POSITION,
           buffer: createBuffer({
             data: [-1, 1, 0, 1, 1, 0, -1, -1, 0, 1, -1, 0],
             type: gl.FLOAT
@@ -228,7 +216,7 @@ export default class HeatMapModel extends BaseModel {
           size: 3
         }),
         a_Uv: createAttribute({
-          shaderLocation: this.attributeLocation.UV,
+          shaderLocation: ShaderLocation.UV,
           buffer: createBuffer({
             data: [0, 1, 1, 1, 0, 0, 1, 0],
             type: gl.FLOAT
@@ -247,80 +235,6 @@ export default class HeatMapModel extends BaseModel {
       })
     });
   }
-  build3dHeatMap() {
-    const {
-      getViewportSize
-    } = this.rendererService;
-    const {
-      width,
-      height
-    } = getViewportSize();
-    const triangulation = heatMap3DTriangulation(width / 4.0, height / 4.0);
-    this.shaderModuleService.registerModule('heatmap3dColor', {
-      vs: heatmap_3d_vert,
-      fs: heatmap_3d_frag
-    });
-    this.heat3DModelUniformBuffer = [this.rendererService.createBuffer({
-      // opacity
-      data: new Float32Array(16 * 2 + 4).fill(0),
-      // 长度需要大于等于 4
-      isUBO: true
-    })];
-    const {
-      vs,
-      fs,
-      uniforms
-    } = this.shaderModuleService.getModule('heatmap3dColor');
-    const {
-      createAttribute,
-      createElements,
-      createBuffer,
-      createModel
-    } = this.rendererService;
-    return createModel({
-      vs,
-      fs,
-      attributes: {
-        a_Position: createAttribute({
-          shaderLocation: this.attributeLocation.POSITION,
-          buffer: createBuffer({
-            data: triangulation.vertices,
-            type: gl.FLOAT
-          }),
-          size: 3
-        }),
-        a_Uv: createAttribute({
-          shaderLocation: this.attributeLocation.UV,
-          buffer: createBuffer({
-            data: triangulation.uvs,
-            type: gl.FLOAT
-          }),
-          size: 2
-        })
-      },
-      primitive: gl.TRIANGLES,
-      uniformBuffers: [...this.heat3DModelUniformBuffer, ...this.rendererService.uniformBuffers],
-      uniforms: _objectSpread({}, uniforms),
-      depth: {
-        enable: true
-      },
-      blend: {
-        enable: true,
-        func: {
-          srcRGB: gl.SRC_ALPHA,
-          srcAlpha: 1,
-          dstRGB: gl.ONE_MINUS_SRC_ALPHA,
-          dstAlpha: 1
-        }
-      },
-      elements: createElements({
-        data: triangulation.indices,
-        type: gl.UNSIGNED_INT,
-        count: triangulation.indices.length
-      })
-    });
-  }
-
   // 绘制密度图
   drawIntensityMode() {
     var _this$intensityModel;
@@ -420,6 +334,79 @@ export default class HeatMapModel extends BaseModel {
       stencil: this.getStencil(options)
     });
   }
+  build3dHeatMap() {
+    const {
+      getViewportSize
+    } = this.rendererService;
+    const {
+      width,
+      height
+    } = getViewportSize();
+    const triangulation = heatMap3DTriangulation(width / 4.0, height / 4.0);
+    this.shaderModuleService.registerModule('heatmap3dColor', {
+      vs: heatmap_3d_vert,
+      fs: heatmap_3d_frag
+    });
+    this.heat3DModelUniformBuffer = [this.rendererService.createBuffer({
+      // opacity
+      data: new Float32Array(16 * 2 + 4).fill(0),
+      // 长度需要大于等于 4
+      isUBO: true
+    })];
+    const {
+      vs,
+      fs,
+      uniforms
+    } = this.shaderModuleService.getModule('heatmap3dColor');
+    const {
+      createAttribute,
+      createElements,
+      createBuffer,
+      createModel
+    } = this.rendererService;
+    return createModel({
+      vs,
+      fs,
+      attributes: {
+        a_Position: createAttribute({
+          shaderLocation: ShaderLocation.POSITION,
+          buffer: createBuffer({
+            data: triangulation.vertices,
+            type: gl.FLOAT
+          }),
+          size: 3
+        }),
+        a_Uv: createAttribute({
+          shaderLocation: ShaderLocation.UV,
+          buffer: createBuffer({
+            data: triangulation.uvs,
+            type: gl.FLOAT
+          }),
+          size: 2
+        })
+      },
+      primitive: gl.TRIANGLES,
+      uniformBuffers: [...this.heat3DModelUniformBuffer, ...this.rendererService.uniformBuffers],
+      uniforms: _objectSpread({}, uniforms),
+      depth: {
+        enable: true
+      },
+      blend: {
+        enable: true,
+        func: {
+          srcRGB: gl.SRC_ALPHA,
+          srcAlpha: 1,
+          dstRGB: gl.ONE_MINUS_SRC_ALPHA,
+          dstAlpha: 1
+        }
+      },
+      elements: createElements({
+        data: triangulation.indices,
+        type: gl.UNSIGNED_INT,
+        count: triangulation.indices.length
+      })
+    });
+  }
   updateColorTexture() {
     const {
       createTexture2D

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

@@ -1,20 +1,6 @@
 import type { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class HexagonModel 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/hexagon.js

@@ -6,14 +6,8 @@ import { HeatmapGridTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/hexagon/hexagon_frag.glsl' */
 const hexagon_frag = "in vec4 v_color;\n\n#pragma include \"picking\"\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/hexagon/hexagon_vert.glsl' */
-const hexagon_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 = vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage);\n  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n\n  vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+const hexagon_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 10) 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\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 =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n \n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xy, 0., 1.0));\n    // gl_Position = u_Mvp * (vec4(a_Pos.xy + offset, 0., 1.0));\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator;\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\n    gl_Position = u_Mvp * vec4(project_pos.xy, 0.0, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  }\n  setPickingColor(a_PickingColor);\n}\n";
 export default class HexagonModel 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());
@@ -65,7 +59,7 @@ export default class HexagonModel extends BaseModel {
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Pos',
-        shaderLocation: this.attributeLocation.POS,
+        shaderLocation: 10,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],
@@ -73,7 +67,7 @@ export default class HexagonModel 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/shaders/grid/grid_vert.glsl

@@ -1,30 +1,42 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
-layout(location =  ATTRIBUTE_LOCATION_POS) in vec3 a_Pos;
-
-layout(std140) uniform commonUniforms {
-    vec2 u_radius;
-    float u_opacity;
-    float u_coverage;
-    float u_angle;
-};
-
-out vec4 v_color;
-
-#pragma include "projection"
-#pragma include "project"
-#pragma include "picking"
-
-void main() {
-  v_color = a_Color;
-  v_color.a *= u_opacity;
-
-  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
-  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage;
-
-  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);
-  vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
-  gl_Position = project_common_position_to_clipspace(project_pos);
-
-  setPickingColor(a_PickingColor);
-}
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 10) in vec3 a_Pos;
+
+layout(std140) uniform commonUniforms {
+    vec2 u_radius;
+    float u_opacity;
+    float u_coverage;
+    float u_angle;
+};
+
+
+out vec4 v_color;
+
+
+#pragma include "projection"
+#pragma include "project"
+#pragma include "picking"
+
+void main() {
+  v_color = a_Color;
+  v_color.a *= u_opacity;
+
+  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
+  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage ;
+  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset);
+  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
+  // gl_Position = project_common_position_to_clipspace(project_pos);
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    vec2 lnglat = unProjectFlat(a_Pos.xy + offset);
+    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // 将经纬度转换为高德2.0需要的平面坐标
+    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));
+    gl_Position = u_Mvp * (project_pos);
+  } else {
+     vec2 lnglat = unProjectFlat(a_Pos.xy + offset);
+    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
+    gl_Position = project_common_position_to_clipspace(project_pos);
+  }
+
+  setPickingColor(a_PickingColor);
+}

package/es/heatmap/shaders/grid3d/grid_3d_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_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 float a_Size;
+layout(location = 10) in vec3 a_Pos;
+layout(location = 13) in vec3 a_Normal;
 
 layout(std140) uniform commonUniforms {
   vec2 u_radius;
@@ -20,15 +20,27 @@ out vec4 v_color;
 
 void main() {
   mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
-  vec2 offset = vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage);
-
-  vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 实际的经纬度
-  vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
-
-  float lightWeight = calc_lighting(project_pos);
-  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
-
-  gl_Position = project_common_position_to_clipspace(project_pos);
+  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+ 
+    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 经纬度
+    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // 将经纬度转换为高德2.0需要的平面坐标
+    vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));
+
+    float lightWeight = calc_lighting(project_pos);
+    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w * u_opacity);
+  
+    gl_Position = u_Mvp * vec4(customLnglat , a_Position.z * a_Size, 1.0);
+  } else {
+    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 实际的经纬度
+    vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
+    
+    float lightWeight = calc_lighting(project_pos);
+    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
+    
+    gl_Position = project_common_position_to_clipspace(project_pos);
+  }
 
   setPickingColor(a_PickingColor);
 }

package/es/heatmap/shaders/heatmap/heatmap_3d_vert.glsl

@@ -1,5 +1,5 @@
 layout(location = 0) in vec3 a_Position;
-layout(location = 10) in vec2 a_Uv;
+layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   mat4 u_ViewProjectionMatrixUncentered;
@@ -17,16 +17,13 @@ out vec2 v_texCoord;
 out float v_intensity;
 
 vec2 toBezier(float t, vec2 P0, vec2 P1, vec2 P2, vec2 P3) {
-  float t2 = t * t;
-  float one_minus_t = 1.0 - t;
-  float one_minus_t2 = one_minus_t * one_minus_t;
-  return P0 * one_minus_t2 * one_minus_t +
-  P1 * 3.0 * t * one_minus_t2 +
-  P2 * 3.0 * t2 * one_minus_t +
-  P3 * t2 * t;
+    float t2 = t * t;
+    float one_minus_t = 1.0 - t;
+    float one_minus_t2 = one_minus_t * one_minus_t;
+    return (P0 * one_minus_t2 * one_minus_t + P1 * 3.0 * t * one_minus_t2 + P2 * 3.0 * t2 * one_minus_t + P3 * t2 * t);
 }
-vec2 toBezier(float t, vec4 p) {
-  return toBezier(t, vec2(0.0, 0.0), vec2(p.x, p.y), vec2(p.z, p.w), vec2(1.0, 1.0));
+vec2 toBezier(float t, vec4 p){
+    return toBezier(t, vec2(0.0, 0.0), vec2(p.x, p.y), vec2(p.z, p.w), vec2(1.0, 1.0));
 }
 
 #pragma include "projection"
@@ -38,22 +35,22 @@ void main() {
   vec2 pos = a_Uv * vec2(2.0) - vec2(1.0); // 将原本 0 -> 1 的 uv 转换为 -1 -> 1 的标准坐标空间（NDC）
 
   vec4 p1 = vec4(pos, 0.0, 1.0); // x/y 平面上的点（z == 0）可以认为是三维上的点被投影到平面后的点
-  vec4 p2 = vec4(pos, 1.0, 1.0); // 平行于x/y平面、z==1 的平面上的点
+	vec4 p2 = vec4(pos, 1.0, 1.0); // 平行于x/y平面、z==1 的平面上的点
 
-  vec4 inverseP1 = u_InverseViewProjectionMatrix * p1; // 根据视图投影矩阵的逆矩阵平面上的反算出三维空间中的点（p1平面上的点）
-  vec4 inverseP2 = u_InverseViewProjectionMatrix * p2;
+	vec4 inverseP1 = u_InverseViewProjectionMatrix * p1; // 根据视图投影矩阵的逆矩阵平面上的反算出三维空间中的点（p1平面上的点）
+	vec4 inverseP2 = u_InverseViewProjectionMatrix * p2;
 
   inverseP1 = inverseP1 / inverseP1.w; // 归一化操作（归一化后为世界坐标）
-  inverseP2 = inverseP2 / inverseP2.w;
+	inverseP2 = inverseP2 / inverseP2.w;
 
-  float zPos = (0.0 - inverseP1.z) / (inverseP2.z - inverseP1.z); // ??
-  vec4 position = inverseP1 + zPos * (inverseP2 - inverseP1);
+	float zPos = (0.0 - inverseP1.z) / (inverseP2.z - inverseP1.z); // ??
+	vec4 position = inverseP1 + zPos * (inverseP2 - inverseP1);
 
-  vec4 b = vec4(0.5, 0.0, 1.0, 0.5);
+  vec4 b= vec4(0.5000, 0.0, 1.0, 0.5000);
   float fh;
 
   v_intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;
   fh = toBezier(v_intensity, b).y;
-  gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.0), 1.0);
-
+  gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.), 1.0);
+ 
 }

package/es/heatmap/shaders/heatmap/heatmap_framebuffer_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
-layout(location = ATTRIBUTE_LOCATION_DIR) in vec2 a_Dir;
+layout(location = 0) in vec3 a_Position;
+layout(location = 9) in float a_Size;
+layout(location = 10) in vec2 a_Dir;
+
 
 layout(std140) uniform commonUniforms {
   float u_radius;
@@ -12,25 +13,30 @@ layout(std140) uniform commonUniforms {
 out vec2 v_extrude;
 out float v_weight;
 
-#define GAUSS_COEF (0.3989422804014327)
+#define GAUSS_COEF  0.3989422804014327
 
 #pragma include "projection"
 #pragma include "picking"
 
-void main() {
-  vec3 picking_color_placeholder = u_PickingColor;
+void main(){
+    vec3 picking_color_placeholder = u_PickingColor;
 
-  v_weight = a_Size;
-  float ZERO = 1.0 / 255.0 / 16.0;
-  float extrude_x = a_Dir.x * 2.0 - 1.0;
-  float extrude_y = a_Dir.y * 2.0 - 1.0;
-  vec2 extrude_dir = normalize(vec2(extrude_x, extrude_y));
-  float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;
-  v_extrude = extrude_dir * S;
+    v_weight = a_Size;
+    float ZERO = 1.0 / 255.0 / 16.0;
+    float extrude_x = a_Dir.x * 2.0 -1.0;
+    float extrude_y = a_Dir.y * 2.0 -1.0;
+    vec2 extrude_dir = normalize(vec2(extrude_x,extrude_y));
+    float S = sqrt(-2.0 * log(ZERO / a_Size / u_intensity / GAUSS_COEF)) / 2.5;
+    v_extrude = extrude_dir * S;
 
-  vec2 offset = project_pixel(v_extrude * u_radius);
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
+    vec2 offset = project_pixel(v_extrude * u_radius);
+    vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
 
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
+    // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
 
+    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+        gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));
+    } else {
+        gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
+    }
 }

package/es/heatmap/shaders/heatmap/heatmap_vert.glsl

@@ -1,5 +1,6 @@
+
 layout(location = 0) in vec3 a_Position;
-layout(location = 10) in vec2 a_Uv;
+layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -14,8 +15,8 @@ out vec2 v_texCoord;
 void main() {
   v_texCoord = a_Uv;
   #ifdef VIEWPORT_ORIGIN_TL
-  v_texCoord.y = 1.0 - v_texCoord.y;
+    v_texCoord.y = 1.0 - v_texCoord.y;
   #endif
 
-  gl_Position = vec4(a_Position.xy, 0, 1.0);
+  gl_Position = vec4(a_Position.xy, 0, 1.);
 }

package/es/heatmap/shaders/hexagon/hexagon_vert.glsl

@@ -1,16 +1,17 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_POS) in vec3 a_Pos;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 10) in vec3 a_Pos;
 
 layout(std140) uniform commonUniforms {
-  vec2 u_radius;
-  float u_opacity;
-  float u_coverage;
-  float u_angle;
+    vec2 u_radius;
+    float u_opacity;
+    float u_coverage;
+    float u_angle;
 };
 
 out vec4 v_color;
 
+
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
@@ -18,13 +19,22 @@ out vec4 v_color;
 void main() {
   v_color = a_Color;
   v_color.a *= u_opacity;
-
+    
   mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
-  vec2 offset = vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage);
+  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));
   vec2 lnglat = unProjectFlat(a_Pos.xy + offset);
-
-  vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
-
+ 
+  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
+  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    // gl_Position = u_Mvp * (vec4(project_pos.xy, 0., 1.0));
+    // gl_Position = u_Mvp * (vec4(a_Pos.xy + offset, 0., 1.0));
+    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator;
+    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));
+    gl_Position = u_Mvp * vec4(project_pos.xy, 0.0, 1.0);
+  } else {
+    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));
+  }
   setPickingColor(a_PickingColor);
 }