@antv/l7-layers 2.20.3 → 2.20.6

package/es/geometry/shaders/billboard_frag.glsl

@@ -1,13 +1,18 @@
+layout(std140) uniform commonUniforms {
+ vec2 u_size;
+ float u_raisingHeight;
+ float u_rotation;
+ float u_opacity;
+};
 
 uniform sampler2D u_texture;
-uniform float u_opacity;
 
-varying vec3 v_Color;
-varying vec2 v_uv;
+in vec2 v_uv;
+out vec4 outputColor;
 
 #pragma include "picking"
 void main() {
-  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));
-  gl_FragColor.a *= u_opacity;
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));
+  outputColor.a *= u_opacity;
+  outputColor = filterColor(outputColor);
 }

package/es/geometry/shaders/billboard_vert.glsl

@@ -1,25 +1,22 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
-uniform float u_raisingHeight: 0.0;
-uniform float u_opacity;
-uniform vec2 u_size: [1.0, 1.0];
-uniform mat2 u_RotateMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 14) in vec2 a_Uv;
 
-attribute vec3 a_Extrude;
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-attribute vec3 a_Color;
+layout(std140) uniform commonUniforms {
+ vec2 u_size;
+ float u_raisingHeight;
+ float u_rotation;
+ float u_opacity;
+};
 
-varying vec3 v_Color;
-varying vec2 v_uv;
+out vec2 v_uv;
 
 #pragma include "projection"
 #pragma include "picking"
+#pragma include "rotation_2d"
 void main() {
    vec3 extrude = a_Extrude;
-   v_Color = a_Color;
    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);
@@ -30,7 +27,7 @@ void main() {
    vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
 
    // 计算绕 z 轴旋转后的偏移
-   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));
+   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;

package/es/geometry/shaders/plane_frag.glsl

@@ -1,22 +1,26 @@
 
 uniform sampler2D u_texture;
-uniform float u_mapFlag;
-uniform float u_opacity;
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_mapFlag;
+  float u_terrainClipHeight;
+};
 
-varying vec3 v_Color;
-varying vec2 v_uv;
-varying float v_clip;
+in vec3 v_Color;
+in vec2 v_uv;
+in float v_clip;
+out vec4 outputColor;
 
 #pragma include "picking"
 void main() {
   // gl_FragColor = vec4(v_Color, u_opacity);
   if(u_mapFlag > 0.0) {
-    gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));
-    gl_FragColor.a *= u_opacity;
+    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));
+    outputColor.a *= u_opacity;
   } else {
     // gl_FragColor = vec4(v_uv, 0.0, u_opacity);
-    gl_FragColor = vec4(v_Color, u_opacity);
+    outputColor = vec4(v_Color, u_opacity);
   }
-  gl_FragColor.a *= v_clip;
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor.a *= v_clip;
+  outputColor = filterColor(outputColor);
 }

package/es/geometry/shaders/plane_vert.glsl

@@ -1,16 +1,17 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
 
-uniform float u_opacity;
-uniform float u_terrainClipHeight;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec3 a_Color;
+layout(location = 14) in vec2 a_Uv;
 
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-attribute vec3 a_Color;
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_mapFlag;
+  float u_terrainClipHeight;
+};
 
-varying vec3 v_Color;
-varying vec2 v_uv;
-varying float v_clip;
+out vec3 v_Color;
+out vec2 v_uv;
+out float v_clip;
 
 #pragma include "projection"
 #pragma include "picking"

package/es/geometry/shaders/sprite_frag.glsl

@@ -1,10 +1,14 @@
 
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_mapFlag;
+  float u_Scale;
+};
 uniform sampler2D u_texture;
-uniform float u_mapFlag;
-uniform float u_opacity;
 
-varying vec3 v_Color;
-varying float v_d;
+in vec3 v_Color;
+in float v_d;
+out vec4 outputColor;
 
 void main() {
 
@@ -13,9 +17,9 @@ void main() {
   }
 
   if(u_mapFlag > 0.0) {
-    gl_FragColor = texture2D(u_texture, gl_PointCoord);
-    gl_FragColor.a *= u_opacity;
+    outputColor = texture(SAMPLER_2D(u_texture), gl_PointCoord);
+    outputColor.a *= u_opacity;
   } else {
-    gl_FragColor = vec4(v_Color, u_opacity);
+    outputColor = vec4(v_Color, u_opacity);
   }
 }

package/es/geometry/shaders/sprite_vert.glsl

@@ -1,17 +1,18 @@
-precision highp float;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec3 a_Color;
 
-attribute vec3 a_Position;
-attribute vec3 a_Color;
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_mapFlag;
+  float u_Scale;
+};
 
-uniform mat4 u_ModelMatrix;
-uniform float u_opacity;
-uniform float u_Scale;
-varying vec3 v_Color;
-varying float v_d;
+out vec3 v_Color;
+out float v_d;
 
 #pragma include "projection"
 void main() {
-   v_Color = a_Color;
+   v_Color = a_Color.xyz;
   
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
 

package/es/heatmap/index.d.ts

@@ -1,7 +1,7 @@
-import { IAttributeAndElements, IRenderOptions } from '@antv/l7-core';
+import type { IAttributeAndElements, IRenderOptions } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
-import { IHeatMapLayerStyleOptions } from '../core/interface';
-import { HeatMapModelType } from './models';
+import type { IHeatMapLayerStyleOptions } from '../core/interface';
+import type { HeatMapModelType } from './models';
 export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     type: string;
     buildModels(): Promise<void>;

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

@@ -1,7 +1,14 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
+import type { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class GridModel extends BaseModel {
     getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;

package/es/heatmap/models/grid.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -10,10 +11,10 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { HeatmapGridTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/grid_vert.glsl' */
-var heatmapGridVert = "precision highp float;\r\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\r\nattribute vec3 a_Position;\r\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\r\nattribute vec3 a_Pos;\r\nattribute float a_Size;\r\nattribute vec4 a_Color;\r\nuniform vec2 u_radius;\r\nuniform float u_coverage: 0.9;\r\nuniform float u_angle: 0;\r\nuniform mat4 u_ModelMatrix;\r\n\r\nvarying vec4 v_color;\r\n\r\nuniform vec2 u_sceneCenterMercator;\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\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";
-/* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
-var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/grid/grid_vert.glsl' */
+var 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";
+/* babel-plugin-inline-import '../shaders/grid/grid_frag.glsl' */
+var grid_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";
 var GridModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(GridModel, _BaseModel);
   var _super = _createSuper(GridModel);
@@ -24,16 +25,26 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(GridModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         opacity = _ref.opacity,
         coverage = _ref.coverage,
         angle = _ref.angle;
-      return {
+      var commonOptions = {
+        u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset],
         u_opacity: opacity || 1.0,
         u_coverage: coverage || 0.9,
-        u_angle: angle || 0,
-        u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset]
+        u_angle: angle || 0
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -62,21 +73,22 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'heatmapGrid',
-                vertexShader: heatmapGridVert,
-                fragmentShader: heatmapGridFrag,
+                vertexShader: grid_vert,
+                fragmentShader: grid_frag,
                 triangulation: HeatmapGridTriangulation,
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: false
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -95,6 +107,7 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
         // 顶点经纬度位置
         type: AttributeType.Attribute,
         descriptor: {
+          shaderLocation: 10,
           name: 'a_Pos',
           buffer: {
             usage: gl.DYNAMIC_DRAW,

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

@@ -1,7 +1,14 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
+import type { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class Grid3DModel extends BaseModel {
     getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;

package/es/heatmap/models/grid3d.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -10,10 +11,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
-/* babel-plugin-inline-import '../shaders/hexagon_3d_vert.glsl' */
-var heatmapGrid3dVert = "precision highp float;\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\nattribute vec3 a_Position;\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\nattribute vec3 a_Pos;\n\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec4 a_Color;\nuniform vec2 u_radius;\nuniform float u_coverage: 0.9;\nuniform float u_angle: 0;\nuniform mat4 u_ModelMatrix;\n\nvarying vec4 v_color;\n\nuniform vec2 u_sceneCenterMercator;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\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\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);\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\n\n  setPickingColor(a_PickingColor);\n}\n";
-/* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
-var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/grid3d/grid_3d_vert.glsl' */
+var 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\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\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\n\n  setPickingColor(a_PickingColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/grid3d/grid_3d_frag.glsl' */
+var grid_3d_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";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(Grid3DModel, _BaseModel);
   var _super = _createSuper(Grid3DModel);
@@ -24,16 +26,26 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(Grid3DModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         opacity = _ref.opacity,
         coverage = _ref.coverage,
         angle = _ref.angle;
-      return {
+      var commonOptions = {
+        u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset],
         u_opacity: opacity || 1.0,
-        u_coverage: coverage || 1.0,
-        u_angle: angle || 0,
-        u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset]
+        u_coverage: coverage || 0.9,
+        u_angle: angle || 0
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -62,21 +74,22 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'heatmapGrid3d',
-                vertexShader: heatmapGrid3dVert,
-                fragmentShader: heatmapGridFrag,
+                vertexShader: grid_3d_vert,
+                fragmentShader: grid_3d_frag,
                 triangulation: PointExtrudeTriangulation,
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: true
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -94,6 +107,7 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         name: 'size',
         type: AttributeType.Attribute,
         descriptor: {
+          shaderLocation: ShaderLocation.SIZE,
           name: 'a_Size',
           buffer: {
             usage: gl.DYNAMIC_DRAW,
@@ -112,6 +126,7 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: ShaderLocation.NORMAL,
           buffer: {
             usage: gl.STATIC_DRAW,
             data: [],
@@ -129,6 +144,7 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Pos',
+          shaderLocation: 10,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],

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

@@ -1,25 +1,27 @@
-import { IFramebuffer, IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
+import type { IFramebuffer, IModel, IModelUniform, IRenderOptions, ITexture2D } from '@antv/l7-core';
 import 'reflect-metadata';
 import BaseModel from '../../core/BaseModel';
 export default class HeatMapModel extends BaseModel {
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
     protected heatmapFramerBuffer: IFramebuffer;
+    protected heatmapTexture: ITexture2D;
     private intensityModel;
     private colorModel;
     private shapeType;
     private preRampColors;
+    private colorModelUniformBuffer;
+    private heat3DModelUniformBuffer;
     render(options: Partial<IRenderOptions>): void;
     getUninforms(): IModelUniform;
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private buildHeatMapIntensity;
-    private buildHeatmapColor;
+    private buildHeatmap;
     private drawIntensityMode;
-    private drawColorMode;
+    private drawHeatMap;
     private draw3DHeatMap;
     private build3dHeatMap;
-    private updateStyle;
     private updateColorTexture;
 }