@antv/l7-layers 2.9.20 → 2.9.22

package/lib/heatmap/models/hexagon.js

@@ -1,118 +1,96 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/heatmap/models/hexagon.ts
+var hexagon_exports = {};
+__export(hexagon_exports, {
+  default: () => HexagonModel
 });
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _l7Core = require("@antv/l7-core");
-
-var _l7Utils = require("@antv/l7-utils");
-
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-
-var _triangulation = require("../../core/triangulation");
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-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";
-var heatmapGridVert = "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;\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;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform vec2 u_SceneCenterMKT;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\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_SceneCenterMKT;\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";
-
-var HexagonModel = function (_BaseModel) {
-  (0, _inherits2.default)(HexagonModel, _BaseModel);
-
-  var _super = _createSuper(HexagonModel);
-
-  function HexagonModel() {
-    (0, _classCallCheck2.default)(this, HexagonModel);
-    return _super.apply(this, arguments);
+module.exports = __toCommonJS(hexagon_exports);
+var import_l7_core = require("@antv/l7-core");
+var import_l7_utils = require("@antv/l7-utils");
+var import_BaseModel = __toESM(require("../../core/BaseModel"));
+var import_triangulation = require("../../core/triangulation");
+var import_hexagon_frag = __toESM(require("../shaders/hexagon_frag.glsl"));
+var import_hexagon_vert = __toESM(require("../shaders/hexagon_vert.glsl"));
+var HexagonModel = class extends import_BaseModel.default {
+  getUninforms() {
+    const {
+      opacity,
+      coverage,
+      angle
+    } = this.layer.getLayerConfig();
+    return {
+      u_opacity: opacity || 1,
+      u_coverage: coverage || 0.9,
+      u_angle: angle || 0,
+      u_radius: [
+        this.layer.getSource().data.xOffset,
+        this.layer.getSource().data.yOffset
+      ]
+    };
   }
-
-  (0, _createClass2.default)(HexagonModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          opacity = _ref.opacity,
-          coverage = _ref.coverage,
-          angle = _ref.angle;
-
-      return {
-        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]
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      this.layer.buildLayerModel({
-        moduleName: 'heatmapHexagon',
-        vertexShader: heatmapGridVert,
-        fragmentShader: heatmapGridFrag,
-        triangulation: _triangulation.HeatmapGridTriangulation,
-        depth: {
-          enable: false
+  initModels(callbackModel) {
+    this.buildModels(callbackModel);
+  }
+  buildModels(callbackModel) {
+    const {
+      mask = false,
+      maskInside = true
+    } = this.layer.getLayerConfig();
+    this.layer.buildLayerModel({
+      moduleName: "heatmapHexagon",
+      vertexShader: import_hexagon_vert.default,
+      fragmentShader: import_hexagon_frag.default,
+      triangulation: import_triangulation.HeatmapGridTriangulation,
+      depth: { enable: false },
+      primitive: import_l7_core.gl.TRIANGLES,
+      blend: this.getBlend(),
+      stencil: (0, import_l7_utils.getMask)(mask, maskInside)
+    }).then((model) => {
+      callbackModel([model]);
+    }).catch((err) => {
+      console.warn(err);
+      callbackModel([]);
+    });
+  }
+  registerBuiltinAttributes() {
+    this.styleAttributeService.registerStyleAttribute({
+      name: "pos",
+      type: import_l7_core.AttributeType.Attribute,
+      descriptor: {
+        name: "a_Pos",
+        buffer: {
+          usage: import_l7_core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: import_l7_core.gl.FLOAT
         },
-        primitive: _l7Core.gl.TRIANGLES,
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'pos',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Pos',
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx) {
-            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
-            return [coordinates[0], coordinates[1], 0];
-          }
+        size: 3,
+        update: (feature, featureIdx) => {
+          const coordinates = feature.version === "GAODE2.x" ? feature.originCoordinates : feature.coordinates;
+          return [coordinates[0], coordinates[1], 0];
         }
-      });
-    }
-  }]);
-  return HexagonModel;
-}(_BaseModel2.default);
-
-exports.default = HexagonModel;
-//# sourceMappingURL=hexagon.js.map
+      }
+    });
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/lib/heatmap/models/index.js

@@ -1,27 +1,41 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/heatmap/models/index.ts
+var models_exports = {};
+__export(models_exports, {
+  default: () => models_default
 });
-exports.default = void 0;
-
-var _grid = _interopRequireDefault(require("./grid"));
-
-var _grid3d = _interopRequireDefault(require("./grid3d"));
-
-var _heatmap = _interopRequireDefault(require("./heatmap"));
-
-var _hexagon = _interopRequireDefault(require("./hexagon"));
-
+module.exports = __toCommonJS(models_exports);
+var import_grid = __toESM(require("./grid"));
+var import_grid3d = __toESM(require("./grid3d"));
+var import_heatmap = __toESM(require("./heatmap"));
+var import_hexagon = __toESM(require("./hexagon"));
 var HeatMapModels = {
-  heatmap: _heatmap.default,
-  heatmap3d: _heatmap.default,
-  grid: _grid.default,
-  grid3d: _grid3d.default,
-  hexagon: _hexagon.default
+  heatmap: import_heatmap.default,
+  heatmap3d: import_heatmap.default,
+  grid: import_grid.default,
+  grid3d: import_grid3d.default,
+  hexagon: import_hexagon.default
 };
-var _default = HeatMapModels;
-exports.default = _default;
-//# sourceMappingURL=index.js.map
+var models_default = HeatMapModels;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/lib/heatmap/shaders/grid_vert.glsl

@@ -0,0 +1,42 @@
+precision highp float;
+// 多边形顶点坐标
+attribute vec3 a_Position;
+// 多边形经纬度坐标
+attribute vec3 a_Pos;
+attribute float a_Size;
+attribute vec4 a_Color;
+uniform vec2 u_radius;
+uniform float u_coverage: 0.9;
+uniform float u_angle: 0;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+varying vec4 v_color;
+
+uniform vec2 u_SceneCenterMKT;
+
+#pragma include "projection"
+#pragma include "project"
+#pragma include "picking"
+
+void main() {
+  v_color = a_Color;
+
+  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_SceneCenterMKT; // 将经纬度转换为高德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/lib/heatmap/shaders/heatmap_3d_frag.glsl

@@ -0,0 +1,14 @@
+uniform sampler2D u_texture;
+uniform sampler2D u_colorTexture;
+uniform float u_opacity;
+varying vec2 v_texCoord;
+varying float v_intensity;
+
+void main(){
+   
+     float intensity = texture2D(u_texture, v_texCoord).r;
+    vec4 color = texture2D(u_colorTexture,vec2(intensity, 0));
+    gl_FragColor = color;
+    // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;
+     gl_FragColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
+}

package/lib/heatmap/shaders/heatmap_3d_vert.glsl

@@ -0,0 +1,46 @@
+precision highp float;
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
+uniform sampler2D u_texture;
+varying vec2 v_texCoord;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_InverseViewProjectionMatrix;
+uniform mat4 u_ViewProjectionMatrixUncentered;
+varying 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);
+}
+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"
+void main() {
+  v_texCoord = a_Uv;
+
+  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 inverseP1 = u_InverseViewProjectionMatrix * p1; // 根据视图投影矩阵的逆矩阵平面上的反算出三维空间中的点（p1平面上的点）
+	vec4 inverseP2 = u_InverseViewProjectionMatrix * p2;
+
+  inverseP1 = inverseP1 / inverseP1.w; // 归一化操作（归一化后为世界坐标）
+	inverseP2 = inverseP2 / inverseP2.w;
+
+	float zPos = (0.0 - inverseP1.z) / (inverseP2.z - inverseP1.z); // ??
+	vec4 position = inverseP1 + zPos * (inverseP2 - inverseP1);
+
+  vec4 b= vec4(0.5000, 0.0, 1.0, 0.5000);
+  float fh;
+
+  v_intensity = texture2D(u_texture, v_texCoord).r;
+  fh = toBezier(v_intensity, b).y;
+  gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.), 1.0);
+ 
+}

package/lib/heatmap/shaders/heatmap_frag.glsl

@@ -0,0 +1,47 @@
+uniform sampler2D u_texture;        // 热力强度图
+uniform sampler2D u_colorTexture;   // 根据强度分布的色带
+uniform float u_opacity;
+varying vec2 v_texCoord;
+
+uniform vec2 u_ViewportSize;
+
+float getBlurIndusty() {
+    float vW = 2.0/u_ViewportSize.x;
+    float vH = 2.0/u_ViewportSize.y;
+    vec2 vUv = v_texCoord;
+    float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+    float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
+    float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+
+    float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
+    float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;
+    float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
+
+    float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
+    float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
+    float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;
+
+    return(
+        i11 + 
+        i12 + 
+        i13 + 
+        i21 + 
+        i21 + 
+        i22 + 
+        i23 + 
+        i31 + 
+        i32 + 
+        i33
+        )/9.0;
+}
+
+
+void main(){
+    // float intensity = texture2D(u_texture, v_texCoord).r;
+    float intensity = getBlurIndusty();
+    vec4 color = texture2D(u_colorTexture, vec2(intensity, 0.0));
+
+    gl_FragColor =color;
+    gl_FragColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
+
+}

package/lib/heatmap/shaders/heatmap_framebuffer_frag.glsl

@@ -0,0 +1,10 @@
+precision highp float;
+uniform float u_intensity;
+varying float v_weight;
+varying vec2 v_extrude;
+#define GAUSS_COEF  0.3989422804014327
+void main(){
+    float d = -0.5 * 3.0 * 3.0 * dot(v_extrude, v_extrude);
+    float val = v_weight * u_intensity * GAUSS_COEF * exp(d);
+    gl_FragColor = vec4(val, 1., 1., 1.);
+}

package/lib/heatmap/shaders/heatmap_framebuffer_vert.glsl

@@ -0,0 +1,35 @@
+precision highp float;
+attribute vec3 a_Position;
+attribute float a_Size;
+attribute vec2 a_Dir;
+uniform float u_intensity;
+uniform float u_radius;
+varying vec2 v_extrude;
+varying float v_weight;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+#define GAUSS_COEF  0.3989422804014327
+
+#pragma include "projection"
+
+void main(){
+    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));
+
+    // 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/lib/heatmap/shaders/heatmap_vert.glsl

@@ -0,0 +1,10 @@
+precision highp float;
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
+varying vec2 v_texCoord;
+
+void main() {
+  v_texCoord = a_Uv;
+
+  gl_Position = vec4(a_Position.xy, 0, 1.);
+}

package/lib/heatmap/shaders/hexagon_3d_vert.glsl

@@ -0,0 +1,64 @@
+precision highp float;
+// 多边形顶点坐标
+attribute vec3 a_Position;
+// 多边形经纬度坐标
+attribute vec3 a_Pos;
+
+attribute vec3 a_Normal;
+attribute float a_Size;
+attribute vec4 a_Color;
+uniform vec2 u_radius;
+uniform float u_coverage: 0.9;
+uniform float u_angle: 0;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+varying vec4 v_color;
+
+uniform vec2 u_SceneCenterMKT;
+
+#pragma include "projection"
+#pragma include "project"
+#pragma include "light"
+#pragma include "picking"
+
+
+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); // 实际的经纬度
+  // vec2 lnglat = (a_Pos.xy + offset); 
+  // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
+  // gl_Position = project_common_position_to_clipspace(project_pos);
+  // float lightWeight = calc_lighting(project_pos);
+  // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    // vec2 lnglat = (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 = u_Mvp * vec4(lnglat , a_Position.z * a_Size, 1.0);
+    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 经纬度
+    vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // 将经纬度转换为高德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);
+  
+    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/lib/heatmap/shaders/hexagon_frag.glsl

@@ -0,0 +1,12 @@
+precision highp float;
+varying vec4 v_color;
+uniform float u_opacity: 1;
+
+#pragma include "picking"
+
+void main() {
+  gl_FragColor = v_color;
+  gl_FragColor.a *= u_opacity;
+
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/lib/heatmap/shaders/hexagon_vert.glsl

@@ -0,0 +1,41 @@
+precision highp float;
+// 多边形顶点坐标
+attribute vec3 a_Position;
+// 多边形经纬度坐标
+attribute vec3 a_Pos;
+attribute float a_Size;
+attribute vec4 a_Color;
+uniform vec2 u_radius;
+uniform float u_coverage: 0.9;
+uniform float u_angle: 0;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+varying vec4 v_color;
+
+uniform vec2 u_SceneCenterMKT;
+
+#pragma include "projection"
+#pragma include "project"
+#pragma include "picking"
+
+void main() {
+  v_color = a_Color;
+    
+  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, 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_SceneCenterMKT;
+    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);
+}