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

package/lib/geometry/shaders/billboard_vert.glsl

@@ -1,12 +1,12 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 11) in vec3 a_Extrude;
-layout(location = 14) in vec2 a_Uv;
+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(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,26 +15,29 @@ 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_v2(vec4(x , y, z , 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(x, y, z, 1.0));
 
-   setPickingColor(a_PickingColor);
+  setPickingColor(a_PickingColor);
 }

package/lib/geometry/shaders/plane_vert.glsl

@@ -1,7 +1,7 @@
 
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec3 a_Color;
-layout(location = 14) in vec2 a_Uv;
+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(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_v2(vec4(project_pos.xy, a_Position.z, 1.0));
+
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
 
    setPickingColor(a_PickingColor);
 }

package/lib/geometry/shaders/sprite_vert.glsl

@@ -1,5 +1,5 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec3 a_Color;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;
 
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -12,12 +12,10 @@ out float v_d;
 
 #pragma include "projection"
 void main() {
-   v_Color = a_Color.xyz;
-  
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  v_Color = a_Color.xyz;
+  v_d = a_Position.z;
 
-   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;
+  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;
 }

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

@@ -1,6 +1,20 @@
 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/lib/heatmap/models/grid.js

@@ -13,8 +13,14 @@ var _triangulation = require("../../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 = 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";
+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";
 class GridModel extends _BaseModel.default {
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      POS: 9
+    });
+  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -50,6 +56,7 @@ class GridModel extends _BaseModel.default {
         moduleName: 'heatmapGrid',
         vertexShader: grid_vert,
         fragmentShader: grid_frag,
+        defines: _this2.getDefines(),
         triangulation: _triangulation.HeatmapGridTriangulation,
         primitive: _l7Core.gl.TRIANGLES,
         depth: {
@@ -65,7 +72,7 @@ class GridModel extends _BaseModel.default {
       // 顶点经纬度位置
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
-        shaderLocation: 10,
+        shaderLocation: this.attributeLocation.POS,
         name: 'a_Pos',
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -74,7 +81,7 @@ class GridModel extends _BaseModel.default {
         },
         size: 3,
         update: feature => {
-          const coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
+          const coordinates = feature.coordinates;
           return [coordinates[0], coordinates[1], 0];
         }
       }

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

@@ -1,6 +1,22 @@
 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/lib/heatmap/models/grid3d.js

@@ -9,13 +9,20 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../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 = 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";
+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";
 class Grid3DModel extends _BaseModel.default {
+  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,6 +58,7 @@ class Grid3DModel extends _BaseModel.default {
         moduleName: 'heatmapGrid3d',
         vertexShader: grid_3d_vert,
         fragmentShader: grid_3d_frag,
+        defines: _this2.getDefines(),
         triangulation: _triangulation.PointExtrudeTriangulation,
         primitive: _l7Core.gl.TRIANGLES,
         depth: {
@@ -65,7 +73,7 @@ class Grid3DModel extends _BaseModel.default {
       name: 'size',
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        shaderLocation: this.attributeLocation.SIZE,
         name: 'a_Size',
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -86,7 +94,7 @@ class Grid3DModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Normal',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
+        shaderLocation: this.attributeLocation.NORMAL,
         buffer: {
           usage: _l7Core.gl.STATIC_DRAW,
           data: [],
@@ -104,7 +112,7 @@ class Grid3DModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Pos',
-        shaderLocation: 10,
+        shaderLocation: this.attributeLocation.POS,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],
@@ -112,7 +120,7 @@ class Grid3DModel extends _BaseModel.default {
         },
         size: 3,
         update: feature => {
-          const coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
+          const coordinates = feature.coordinates;
           return [coordinates[0], coordinates[1], 0];
         }
       }

package/lib/heatmap/models/heatmap.d.ts

@@ -1,6 +1,22 @@
 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;
@@ -17,11 +33,14 @@ 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;
 }

package/lib/heatmap/models/heatmap.js

@@ -13,20 +13,19 @@ var _l7Utils = require("@antv/l7-utils");
 var _glMatrix = require("gl-matrix");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
-var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation2 = require("../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 = 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
+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
 /* 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 = "\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";
+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";
 /* 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 = 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";
+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 {
   isEqual
 } = _l7Utils.lodashUtil;
@@ -44,6 +43,14 @@ class HeatMapModel extends _BaseModel.default {
     (0, _defineProperty2.default)(this, "colorModelUniformBuffer", []);
     (0, _defineProperty2.default)(this, "heat3DModelUniformBuffer", []);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      SIZE: 9,
+      UV: 10,
+      DIR: 11
+    });
+  }
   prerender() {
     const {
       clear,
@@ -127,7 +134,7 @@ class HeatMapModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Dir',
-        shaderLocation: 10,
+        shaderLocation: this.attributeLocation.DIR,
         buffer: {
           usage: _l7Core.gl.DYNAMIC_DRAW,
           data: [],
@@ -144,7 +151,7 @@ class HeatMapModel extends _BaseModel.default {
       type: _l7Core.AttributeType.Attribute,
       descriptor: {
         name: 'a_Size',
-        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        shaderLocation: this.attributeLocation.SIZE,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -161,6 +168,10 @@ class HeatMapModel extends _BaseModel.default {
       }
     });
   }
+
+  /**
+   * 热力图密度图
+   */
   buildHeatMapIntensity() {
     var _this3 = this;
     return (0, _asyncToGenerator2.default)(function* () {
@@ -176,12 +187,13 @@ class HeatMapModel extends _BaseModel.default {
         vertexShader: heatmap_framebuffer_vert,
         fragmentShader: heatmap_framebuffer_frag,
         triangulation: _triangulation.HeatmapTriangulation,
+        defines: _this3.getDefines(),
         depth: {
           enable: false
         },
         cull: {
           enable: true,
-          face: (0, _l7Utils.getCullFace)(_this3.mapService.version)
+          face: _l7Core.gl.FRONT
         }
       });
       return model;
@@ -215,7 +227,7 @@ class HeatMapModel extends _BaseModel.default {
       uniformBuffers: [...this.colorModelUniformBuffer, ...this.rendererService.uniformBuffers],
       attributes: {
         a_Position: createAttribute({
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.POSITION,
+          shaderLocation: this.attributeLocation.POSITION,
           buffer: createBuffer({
             data: [-1, 1, 0, 1, 1, 0, -1, -1, 0, 1, -1, 0],
             type: _l7Core.gl.FLOAT
@@ -223,7 +235,7 @@ class HeatMapModel extends _BaseModel.default {
           size: 3
         }),
         a_Uv: createAttribute({
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+          shaderLocation: this.attributeLocation.UV,
           buffer: createBuffer({
             data: [0, 1, 1, 1, 0, 0, 1, 0],
             type: _l7Core.gl.FLOAT
@@ -242,6 +254,80 @@ class HeatMapModel extends _BaseModel.default {
       })
     });
   }
+  build3dHeatMap() {
+    const {
+      getViewportSize
+    } = this.rendererService;
+    const {
+      width,
+      height
+    } = getViewportSize();
+    const triangulation = (0, _triangulation2.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: _l7Core.gl.FLOAT
+          }),
+          size: 3
+        }),
+        a_Uv: createAttribute({
+          shaderLocation: this.attributeLocation.UV,
+          buffer: createBuffer({
+            data: triangulation.uvs,
+            type: _l7Core.gl.FLOAT
+          }),
+          size: 2
+        })
+      },
+      primitive: _l7Core.gl.TRIANGLES,
+      uniformBuffers: [...this.heat3DModelUniformBuffer, ...this.rendererService.uniformBuffers],
+      uniforms: (0, _objectSpread2.default)({}, uniforms),
+      depth: {
+        enable: true
+      },
+      blend: {
+        enable: true,
+        func: {
+          srcRGB: _l7Core.gl.SRC_ALPHA,
+          srcAlpha: 1,
+          dstRGB: _l7Core.gl.ONE_MINUS_SRC_ALPHA,
+          dstAlpha: 1
+        }
+      },
+      elements: createElements({
+        data: triangulation.indices,
+        type: _l7Core.gl.UNSIGNED_INT,
+        count: triangulation.indices.length
+      })
+    });
+  }
+
   // 绘制密度图
   drawIntensityMode() {
     var _this$intensityModel;
@@ -341,79 +427,6 @@ class HeatMapModel extends _BaseModel.default {
       stencil: this.getStencil(options)
     });
   }
-  build3dHeatMap() {
-    const {
-      getViewportSize
-    } = this.rendererService;
-    const {
-      width,
-      height
-    } = getViewportSize();
-    const triangulation = (0, _triangulation2.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: _CommonStyleAttribute.ShaderLocation.POSITION,
-          buffer: createBuffer({
-            data: triangulation.vertices,
-            type: _l7Core.gl.FLOAT
-          }),
-          size: 3
-        }),
-        a_Uv: createAttribute({
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
-          buffer: createBuffer({
-            data: triangulation.uvs,
-            type: _l7Core.gl.FLOAT
-          }),
-          size: 2
-        })
-      },
-      primitive: _l7Core.gl.TRIANGLES,
-      uniformBuffers: [...this.heat3DModelUniformBuffer, ...this.rendererService.uniformBuffers],
-      uniforms: (0, _objectSpread2.default)({}, uniforms),
-      depth: {
-        enable: true
-      },
-      blend: {
-        enable: true,
-        func: {
-          srcRGB: _l7Core.gl.SRC_ALPHA,
-          srcAlpha: 1,
-          dstRGB: _l7Core.gl.ONE_MINUS_SRC_ALPHA,
-          dstAlpha: 1
-        }
-      },
-      elements: createElements({
-        data: triangulation.indices,
-        type: _l7Core.gl.UNSIGNED_INT,
-        count: triangulation.indices.length
-      })
-    });
-  }
   updateColorTexture() {
     const {
       createTexture2D

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

@@ -1,6 +1,20 @@
 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[];