@antv/l7-layers 2.22.5 → 2.22.7

package/es/raster/shaders/rgb/raster_rgb_frag.glsl

@@ -1,10 +1,10 @@
 uniform sampler2D u_texture;
 layout(std140) uniform commonUniforms {
- vec2 u_rminmax;
- vec2 u_gminmax;
- vec2 u_bminmax;
- float u_opacity;
- float u_noDataValue;
+  vec2 u_rminmax;
+  vec2 u_gminmax;
+  vec2 u_bminmax;
+  float u_opacity;
+  float u_noDataValue;
 };
 
 in vec2 v_texCoord;
@@ -12,16 +12,19 @@ in vec2 v_texCoord;
 out vec4 outputColor;
 
 void main() {
+  vec3 rgb = texture(SAMPLER_2D(u_texture), vec2(v_texCoord.x, v_texCoord.y)).rgb;
 
-  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;
-
-  if(rgb == vec3(u_noDataValue)) {
+  if (rgb == vec3(u_noDataValue)) {
     outputColor = vec4(0.0, 0, 0, 0.0);
   } else {
-    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);
+    outputColor = vec4(
+      rgb.r / (u_rminmax.y - u_rminmax.x),
+      rgb.g / (u_gminmax.y - u_gminmax.x),
+      rgb.b / (u_bminmax.y - u_bminmax.x),
+      u_opacity
+    );
   }
 
-  if(outputColor.a < 0.01)
-    discard;
- 
-}
+  if (outputColor.a < 0.01) discard;
+
+}

package/es/raster/shaders/terrain/terrain_rgb_frag.glsl

@@ -2,42 +2,39 @@ uniform sampler2D u_texture;
 uniform sampler2D u_colorTexture;
 
 layout(std140) uniform commonUniforms {
- vec4 u_unpack;
- vec2 u_domain;
- float u_opacity;
- float u_noDataValue;
- float u_clampLow;
- float u_clampHigh;
+  vec4 u_unpack;
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  float u_clampLow;
+  float u_clampHigh;
 };
 
 in vec2 v_texCoord;
 out vec4 outputColor;
 
-
 float getElevation(vec2 coord, float bias) {
-    // Convert encoded elevation value to meters
-    vec4 data =  texture(SAMPLER_2D(u_texture), coord,bias) * 255.0;
-    data.a = -1.0;
-    return dot(data, u_unpack);
+  // Convert encoded elevation value to meters
+  vec4 data = texture(SAMPLER_2D(u_texture), coord, bias) * 255.0;
+  data.a = -1.0;
+  return dot(data, u_unpack);
 }
 
 vec4 getColor(float value) {
-   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);
-    vec2 coord = vec2(normalisedValue, 0);
-    return  texture(SAMPLER_2D(u_colorTexture), coord);
+  float normalisedValue = (value - u_domain[0]) / (u_domain[1] - u_domain[0]);
+  vec2 coord = vec2(normalisedValue, 0);
+  return texture(SAMPLER_2D(u_colorTexture), coord);
 }
 
 void main() {
-  float value = getElevation(v_texCoord,0.0);
+  float value = getElevation(v_texCoord, 0.0);
   if (value == u_noDataValue) {
     outputColor = vec4(0.0, 0, 0, 0.0);
-  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {
-     outputColor = vec4(0.0, 0, 0, 0.0);
+  } else if (u_clampLow < 0.5 && value < u_domain[0] || u_clampHigh < 0.5 && value > u_domain[1]) {
+    outputColor = vec4(0.0, 0, 0, 0.0);
   } else {
-   
     outputColor = getColor(value);
-    outputColor.a =  outputColor.a * u_opacity ;
-      if(outputColor.a < 0.01)
-      discard;
+    outputColor.a = outputColor.a * u_opacity;
+    if (outputColor.a < 0.01) discard;
   }
 }

package/lib/core/BaseLayer.d.ts

@@ -78,6 +78,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     postProcessingPassFactory: (name: string) => IPostProcessingPass<unknown>;
     get normalPassFactory(): (name: string) => import("@antv/l7-core").IPass<unknown>;
     protected animateOptions: IAnimateOption;
+    protected relativeOrigin: [number, number];
+    protected originalExtent: [number, number, number, number];
+    protected absoluteDataArray: IParseDataItem[];
     /**
      * 图层容器
      */
@@ -235,6 +238,22 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     processData(filterData: IParseDataItem[]): IParseDataItem[];
     getModelType(): string;
     protected getDefaultConfig(): {};
+    /**
+     * 处理相对坐标转换
+     */
+    protected processRelativeCoordinates(): void;
+    /**
+     * 获取绝对坐标数据（用于交互计算）
+     */
+    getAbsoluteData(): IParseDataItem[];
+    /**
+     * 获取相对坐标原点
+     */
+    getRelativeOrigin(): [number, number];
+    /**
+     * 获取原始数据范围
+     */
+    getOriginalExtent(): [number, number, number, number];
     protected sourceEvent: () => void;
     protected initLayerModels(): Promise<void>;
     getPickingUniformBuffer(): IBuffer;

package/lib/core/BaseLayer.js

@@ -11,6 +11,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncHook = require("@antv/async-hook");
 var _l7Core = require("@antv/l7-core");
+var _l7Source = require("@antv/l7-source");
 var _l7Utils = require("@antv/l7-utils");
 var _eventemitter = require("eventemitter3");
 var _plugins = require("../plugins");
@@ -146,6 +147,11 @@ class BaseLayer extends _eventemitter.EventEmitter {
     (0, _defineProperty2.default)(this, "animateOptions", {
       enable: false
     });
+    // 相对坐标系支持
+    (0, _defineProperty2.default)(this, "relativeOrigin", [0, 0]);
+    (0, _defineProperty2.default)(this, "originalExtent", [0, 0, 0, 0]);
+    (0, _defineProperty2.default)(this, "absoluteDataArray", []);
+    // 保存绝对坐标数据用于交互
     /**
      * 图层容器
      */
@@ -172,6 +178,8 @@ class BaseLayer extends _eventemitter.EventEmitter {
     (0, _defineProperty2.default)(this, "encodeDataLength", 0);
     (0, _defineProperty2.default)(this, "sourceEvent", () => {
       this.dataState.dataSourceNeedUpdate = true;
+      // 处理相对坐标转换
+      this.processRelativeCoordinates();
       const layerConfig = this.getLayerConfig();
       if (layerConfig && layerConfig.autoFit) {
         this.fitBounds(layerConfig.fitBoundsOptions);
@@ -937,6 +945,9 @@ class BaseLayer extends _eventemitter.EventEmitter {
         // source 初始化不需要处理
         this.sourceEvent();
       }
+      if (type === 'inited') {
+        this.processRelativeCoordinates();
+      }
     });
   }
   getSource() {
@@ -1221,6 +1232,51 @@ class BaseLayer extends _eventemitter.EventEmitter {
   getDefaultConfig() {
     return {};
   }
+
+  /**
+   * 处理相对坐标转换
+   */
+  processRelativeCoordinates() {
+    const layerConfig = this.getLayerConfig();
+    const enableRelativeCoordinates = layerConfig.enableRelativeCoordinates;
+    if (!enableRelativeCoordinates || !this.layerSource || !this.layerSource.data) {
+      return;
+    }
+
+    // 保存原始绝对坐标数据用于交互
+    this.absoluteDataArray = [...this.layerSource.data.dataArray];
+
+    // 处理相对坐标转换
+    const result = (0, _l7Source.processRelativeCoordinates)(this.layerSource.data.dataArray, {
+      enableRelativeCoordinates: true
+    });
+
+    // 更新source数据为相对坐标
+    this.layerSource.data.dataArray = result.dataArray;
+    this.relativeOrigin = result.relativeOrigin;
+    this.originalExtent = result.originalExtent;
+  }
+
+  /**
+   * 获取绝对坐标数据（用于交互计算）
+   */
+  getAbsoluteData() {
+    return this.absoluteDataArray;
+  }
+
+  /**
+   * 获取相对坐标原点
+   */
+  getRelativeOrigin() {
+    return this.relativeOrigin;
+  }
+
+  /**
+   * 获取原始数据范围
+   */
+  getOriginalExtent() {
+    return this.originalExtent;
+  }
   initLayerModels() {
     var _this5 = this;
     return (0, _asyncToGenerator2.default)(function* () {

package/lib/core/interface.d.ts

@@ -26,11 +26,12 @@ export interface IBaseLayerStyleOptions {
     zIndex?: number;
     mask?: boolean;
     maskInside?: boolean;
+    enableRelativeCoordinates?: boolean;
     color?: string;
     size?: number;
 }
 export interface ILineLayerStyleOptions extends IBaseLayerStyleOptions {
-    tileOrigin?: number[];
+    relativeOrigin?: number[];
     coord?: string;
     lineType?: keyof typeof lineStyleType;
     dashArray?: [number, number];
@@ -63,7 +64,7 @@ export declare enum SizeUnitType {
     meter = 1
 }
 export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
-    tileOrigin?: number[];
+    relativeOrigin?: number[];
     coord?: string;
     strokeOpacity: number;
     strokeWidth: number;
@@ -95,7 +96,7 @@ export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
     sourceLayer?: string;
 }
 export interface IPolygonLayerStyleOptions extends IBaseLayerStyleOptions {
-    tileOrigin?: number[];
+    relativeOrigin?: number[];
     coord?: string;
     opacityLinear?: {
         enable: boolean;

package/lib/earth/models/atmosphere.js

@@ -11,7 +11,7 @@ var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_frag.glsl' */
-const atmoSphereFrag = "\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nin vec3 vVertexNormal;\nin float v_offset;\nin vec4 v_Color;\n\n#pragma include \"scene_uniforms\"\nout vec4 outputColor;\nvoid main() {\n    \n    \n    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+const atmoSphereFrag = "layout(std140) uniform commonUniforms {\n  float u_opacity;\n};\nin vec3 vVertexNormal;\nin float v_offset;\nin vec4 v_Color;\n\n#pragma include \"scene_uniforms\"\nout vec4 outputColor;\nvoid main() {\n  // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n  float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);\n  // \u53BB\u9664\u80CC\u9762\n  if (intensity > 1.0) intensity = 0.0;\n\n  outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 /* babel-plugin-inline-import '../shaders/atmosphere/atmosphere_vert.glsl' */
 const atmoSphereVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n\n#pragma include \"scene_uniforms\"\nout vec3 vVertexNormal;\nout vec4 v_Color;\nout float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n\n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 const {

package/lib/earth/models/base.js

@@ -11,7 +11,7 @@ var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../shaders/base/base_frag.glsl' */
-const baseFrag = "uniform sampler2D u_texture;\n\nin vec2 v_texCoord;\nin float v_lightWeight;\nout vec4 outputColor;\n\nvoid main() {\n    vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    outputColor = color;\n}\n";
+const baseFrag = "uniform sampler2D u_texture;\n\nin vec2 v_texCoord;\nin float v_lightWeight;\nout vec4 outputColor;\n\nvoid main() {\n  vec4 color = texture(SAMPLER_2D(u_texture), vec2(v_texCoord.x, v_texCoord.y));\n  color.xyz = color.xyz * v_lightWeight;\n  outputColor = color;\n}\n";
 /* babel-plugin-inline-import '../shaders/base/base_vert.glsl' */
 const baseVert = "// attribute vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nlayout(std140) uniform commonUniforms {\n\tvec4 u_sunLight: [1.0, -10.5, 12.0,0.0];\n\tfloat u_ambientRatio : 0.5;\n\tfloat u_diffuseRatio : 0.3;\n\tfloat u_specularRatio : 0.2;\n};\n\n#pragma include \"scene_uniforms\"\n\nout vec2 v_texCoord;\nout float v_lightWeight;\n\nfloat calc_lighting(vec4 pos) {\n\n\tvec3 worldPos = vec3(pos * u_ModelMatrix);\n\n\tvec3 worldNormal = a_Normal;\n\n\t// cal light weight\n\tvec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n\tvec3 lightDir = normalize(u_sunLight.xyz);\n\n\tvec3 halfDir = normalize(viewDir+lightDir);\n\t// lambert\n\tfloat lambert = dot(worldNormal, lightDir);\n\t// specular\n\tfloat specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n\t//sum to light weight\n\tfloat lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n\treturn lightWeight;\n}\n\nvoid main() {\n\n\tv_texCoord = a_Uv;\n\n\tfloat lightWeight = calc_lighting(vec4(a_Position, 1.0));\n\tv_lightWeight = lightWeight;\n\n\tgl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 class BaseEarthModel extends _BaseModel.default {

package/lib/earth/models/bloomsphere.js

@@ -11,7 +11,7 @@ var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 /* babel-plugin-inline-import '../shaders/bloomshpere/bloomsphere_frag.glsl' */
-const bloomSphereFrag = "\nin vec3 vVertexNormal;\nin vec4 v_Color;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\nout vec4 outputColor;\n#pragma include \"scene_uniforms\"\nvoid main() {\n    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n    // \u53BB\u9664\u80CC\u9762\n    if(intensity > 1.0) intensity = 0.0;\n\n    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
+const bloomSphereFrag = "in vec3 vVertexNormal;\nin vec4 v_Color;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n};\nout vec4 outputColor;\n#pragma include \"scene_uniforms\"\nvoid main() {\n  float intensity = -dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n  // \u53BB\u9664\u80CC\u9762\n  if (intensity > 1.0) intensity = 0.0;\n\n  outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
 /* babel-plugin-inline-import '../shaders/bloomshpere/bloomsphere_vert.glsl' */
 const bloomSphereVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n float u_opacity;\n};\n#pragma include \"scene_uniforms\"\n\nout vec3 vVertexNormal;\nout vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 const {

package/lib/earth/shaders/atmosphere/atmosphere_frag.glsl

@@ -1,6 +1,5 @@
-
 layout(std140) uniform commonUniforms {
- float u_opacity;
+  float u_opacity;
 };
 in vec3 vVertexNormal;
 in float v_offset;
@@ -9,12 +8,10 @@ in vec4 v_Color;
 #pragma include "scene_uniforms"
 out vec4 outputColor;
 void main() {
-    
-    
-    // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
-    float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
-    // 去除背面
-    if(intensity > 1.0) intensity = 0.0;
+  // float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
+  float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
+  // 去除背面
+  if (intensity > 1.0) intensity = 0.0;
 
-    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
+  outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
 }

package/lib/earth/shaders/base/base_frag.glsl

@@ -5,7 +5,7 @@ in float v_lightWeight;
 out vec4 outputColor;
 
 void main() {
-    vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));
-    color.xyz = color.xyz * v_lightWeight;
-    outputColor = color;
+  vec4 color = texture(SAMPLER_2D(u_texture), vec2(v_texCoord.x, v_texCoord.y));
+  color.xyz = color.xyz * v_lightWeight;
+  outputColor = color;
 }

package/lib/earth/shaders/bloomshpere/bloomsphere_frag.glsl

@@ -1,16 +1,15 @@
-
 in vec3 vVertexNormal;
 in vec4 v_Color;
 
 layout(std140) uniform commonUniforms {
- float u_opacity;
+  float u_opacity;
 };
 out vec4 outputColor;
 #pragma include "scene_uniforms"
 void main() {
-    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
-    // 去除背面
-    if(intensity > 1.0) intensity = 0.0;
+  float intensity = -dot(normalize(vVertexNormal), normalize(u_CameraPosition));
+  // 去除背面
+  if (intensity > 1.0) intensity = 0.0;
 
-    outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
+  outputColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
 }

package/lib/geometry/models/billboard.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 /* babel-plugin-inline-import '../shaders/billboard_frag.glsl' */
-const planeFrag = "layout(std140) uniform commonUniforms {\n vec2 u_size;\n float u_raisingHeight;\n float u_rotation;\n float u_opacity;\n};\n\nuniform sampler2D u_texture;\n\nin vec2 v_uv;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
+const planeFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_size;\n  float u_raisingHeight;\n  float u_rotation;\n  float u_opacity;\n};\n\nuniform sampler2D u_texture;\n\nin vec2 v_uv;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n  outputColor.a *= u_opacity;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
 const planeVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec3 a_Extrude;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_size;\n  float u_raisingHeight;\n  float u_rotation;\n  float u_opacity;\n};\n\nout vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\nvoid main() {\n  vec3 extrude = a_Extrude;\n  v_uv = a_Uv;\n  float raiseHeight = u_raisingHeight;\n  if (\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n  ) {\n    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n  // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n  vec2 offsetXY = project_pixel(rotate_matrix(vec2(extrude.x * u_size.x, 0.0), u_rotation));\n  // \u7ED5 z \u8F74\u65CB\u8F6C\n  float x = project_pos.x + offsetXY.x;\n  float y = project_pos.y + offsetXY.y;\n  // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n  float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n  gl_Position = project_common_position_to_clipspace(vec4(x, y, z, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 class BillBoardModel extends _BaseModel.default {

package/lib/geometry/models/sprite.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 /* babel-plugin-inline-import '../shaders/sprite_frag.glsl' */
-const spriteFrag = "\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\nuniform sampler2D u_texture;\n\nin vec3 v_Color;\nin float v_d;\nout vec4 outputColor;\n\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), gl_PointCoord);\n    outputColor.a *= u_opacity;\n  } else {\n    outputColor = vec4(v_Color, u_opacity);\n  }\n}\n";
+const spriteFrag = "layout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\nuniform sampler2D u_texture;\n\nin vec3 v_Color;\nin float v_d;\nout vec4 outputColor;\n\nvoid main() {\n  if (v_d < 0.0) {\n    discard;\n  }\n\n  if (u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), gl_PointCoord);\n    outputColor.a *= u_opacity;\n  } else {\n    outputColor = vec4(v_Color, u_opacity);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/sprite_vert.glsl' */
 const spriteVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_Scale;\n};\n\nout vec3 v_Color;\nout float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n  v_Color = a_Color.xyz;\n  v_d = a_Position.z;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n  gl_PointSize = pow(u_Zoom - 1.0, 2.0) * u_Scale;\n}\n";
 var SPRITE_ANIMATE_DIR = /*#__PURE__*/function (SPRITE_ANIMATE_DIR) {

package/lib/geometry/shaders/billboard_frag.glsl

@@ -1,8 +1,8 @@
 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;
 };
 
 uniform sampler2D u_texture;

package/lib/geometry/shaders/sprite_frag.glsl

@@ -1,4 +1,3 @@
-
 layout(std140) uniform commonUniforms {
   float u_opacity;
   float u_mapFlag;
@@ -11,12 +10,11 @@ in float v_d;
 out vec4 outputColor;
 
 void main() {
-
-  if(v_d < 0.0) {
+  if (v_d < 0.0) {
     discard;
   }
 
-  if(u_mapFlag > 0.0) {
+  if (u_mapFlag > 0.0) {
     outputColor = texture(SAMPLER_2D(u_texture), gl_PointCoord);
     outputColor.a *= u_opacity;
   } else {

package/lib/heatmap/models/heatmap.js

@@ -15,15 +15,15 @@ var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 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";
+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  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, 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
 /* 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";
+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 (i11 + i12 + i13 + i21 + i21 + i22 + i23 + i31 + i32 + i33) / 9.0;\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, 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";
 /* 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";
+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.0, 1.0, 1.0);\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 {

package/lib/heatmap/shaders/heatmap/heatmap_3d_frag.glsl

@@ -14,11 +14,10 @@ in vec2 v_texCoord;
 in float v_intensity;
 out vec4 outputColor;
 
-void main(){
-   
-    float intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;
-    vec4 color = texture(SAMPLER_2D(u_colorTexture),vec2(intensity, 0));
-    outputColor = color;
-    // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;
-   outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
+void main() {
+  float intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;
+  vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(intensity, 0));
+  outputColor = color;
+  // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;
+  outputColor.a = color.a * smoothstep(0.0, 0.1, intensity) * u_opacity;
 }

package/lib/heatmap/shaders/heatmap/heatmap_frag.glsl

@@ -1,5 +1,5 @@
-uniform sampler2D u_texture;        // 热力强度图
-uniform sampler2D u_colorTexture;   // 根据强度分布的色带
+uniform sampler2D u_texture; // 热力强度图
+uniform sampler2D u_colorTexture; // 根据强度分布的色带
 
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -13,40 +13,28 @@ out vec4 outputColor;
 #pragma include "scene_uniforms"
 
 float getBlurIndusty() {
-    float vW = 2.0/ u_ViewportSize.x;
-    float vH = 2.0/ u_ViewportSize.y;
-    vec2 vUv = v_texCoord;
-    float i11 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
-    float i12 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
-    float i13 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
-
-    float i21 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
-    float i22 = texture(SAMPLER_2D(u_texture), vec2( vUv.x , vUv.y) ).r;
-    float i23 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
-
-    float i31 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
-    float i32 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
-    float i33 = texture(SAMPLER_2D(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;
+  float vW = 2.0 / u_ViewportSize.x;
+  float vH = 2.0 / u_ViewportSize.y;
+  vec2 vUv = v_texCoord;
+  float i11 = texture(SAMPLER_2D(u_texture), vec2(vUv.x - 1.0 * vW, vUv.y + 1.0 * vH)).r;
+  float i12 = texture(SAMPLER_2D(u_texture), vec2(vUv.x - 0.0 * vW, vUv.y + 1.0 * vH)).r;
+  float i13 = texture(SAMPLER_2D(u_texture), vec2(vUv.x + 1.0 * vW, vUv.y + 1.0 * vH)).r;
+
+  float i21 = texture(SAMPLER_2D(u_texture), vec2(vUv.x - 1.0 * vW, vUv.y)).r;
+  float i22 = texture(SAMPLER_2D(u_texture), vec2(vUv.x, vUv.y)).r;
+  float i23 = texture(SAMPLER_2D(u_texture), vec2(vUv.x + 1.0 * vW, vUv.y)).r;
+
+  float i31 = texture(SAMPLER_2D(u_texture), vec2(vUv.x - 1.0 * vW, vUv.y - 1.0 * vH)).r;
+  float i32 = texture(SAMPLER_2D(u_texture), vec2(vUv.x - 0.0 * vW, vUv.y - 1.0 * vH)).r;
+  float i33 = texture(SAMPLER_2D(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 = texture(u_texture, v_texCoord).r;
-    float intensity = getBlurIndusty();
-    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(intensity, 0.0));
-    outputColor = color;
-    outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
+void main() {
+  // float intensity = texture(u_texture, v_texCoord).r;
+  float intensity = getBlurIndusty();
+  vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(intensity, 0.0));
+  outputColor = color;
+  outputColor.a = color.a * smoothstep(0.0, 0.1, intensity) * u_opacity;
 }

package/lib/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl

@@ -8,10 +8,10 @@ layout(std140) uniform commonUniforms {
 in vec2 v_extrude;
 in float v_weight;
 out vec4 outputColor;
-#define GAUSS_COEF  0.3989422804014327
+#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);
-    outputColor = vec4(val, 1., 1., 1.);
+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);
+  outputColor = vec4(val, 1.0, 1.0, 1.0);
 }

package/lib/line/models/flow.js

@@ -11,7 +11,7 @@ var _l7Utils = require("@antv/l7-utils");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _line_trangluation = require("../../core/line_trangluation");
 /* babel-plugin-inline-import '../shaders/flow/flow_line_frag.glsl' */
-const flow_line_frag = "// #extension GL_OES_standard_derivatives : enable\n\nin vec4 v_color;\nout vec4 outputColor;\n\n\n// line texture\n\n#pragma include \"picking\"\n\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
+const flow_line_frag = "// #extension GL_OES_standard_derivatives : enable\n\nin vec4 v_color;\nout vec4 outputColor;\n\n// line texture\n\n#pragma include \"picking\"\n\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/flow/flow_line_vert.glsl' */
 const flow_line_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 vec2 a_Size;\nlayout(location = ATTRIBUTE_LOCATION_INSTANCE) in vec4 a_Instance;\nlayout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniorm {\n  float u_gap_width: 1.0;\n  float u_stroke_width: 1.0;\n  float u_stroke_opacity: 1.0;\n};\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nout vec4 v_color;\n\nvec2 project_pixel_offset(vec2 offsets) {\n  vec2 data = project_pixel(offsets);\n\n  return vec2(data.x, -data.y);\n}\n\nvec2 line_dir(vec2 target, vec2 source) {\n  return normalize(ProjectFlat(target) - ProjectFlat(source));\n}\n\n\nvoid main() {\n  // \u900F\u660E\u5EA6\u8BA1\u7B97\n  vec2 source_world = a_Instance.rg; // \u8D77\u70B9\n  vec2 target_world = a_Instance.ba; // \u7EC8\u70B9\n  vec2 flowlineDir = line_dir(target_world, source_world);\n  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);\n\n  vec2 position = mix(source_world, target_world, a_Position.x);\n  vec2 position64Low = mix(a_Instance64Low.rg, a_Instance64Low.ba, a_Position.x);\n\n  float lengthCommon = length(\n    project_position(vec4(target_world, 0, 1)) - project_position(vec4(source_world, 0, 1))\n  );\n  vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || \u9AD8\u5FB7\n  vec2 limitedOffsetDistances = clamp(\n    offsetDistances,\n    project_pixel(-lengthCommon * 0.2),\n    project_pixel(lengthCommon * 0.2)\n  );\n\n  float startOffsetCommon = project_pixel(offsets[0]);\n  float endOffsetCommon = project_pixel(offsets[1]);\n  float endpointOffset = mix(\n    clamp(startOffsetCommon, 0.0, lengthCommon * 0.2),\n    -clamp(endOffsetCommon, 0.0, lengthCommon * 0.2),\n    a_Position.x\n  );\n\n  vec2 normalsCommon = u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y));\n\n  float gapCommon = -1. * project_pixel(u_gap_width);\n  vec3 offsetCommon = vec3(\n    flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -\n      perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),\n    0.0\n  );\n\n  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0), position64Low);\n\n  vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);\n  v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy +  offsetCommon.xy, 0., 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 class FlowLineModel extends _BaseModel.default {

package/lib/line/shaders/flow/flow_line_frag.glsl

@@ -3,7 +3,6 @@
 in vec4 v_color;
 out vec4 outputColor;
 
-
 // line texture
 
 #pragma include "picking"

package/lib/plugins/LayerMaskPlugin.js

@@ -17,7 +17,7 @@ class LayerStylePlugin {
       // mask 初始化
       if (!layer.tileLayer && maskLayers && maskLayers.length > 0) {
         layer.updateLayerConfig({
-          mask: true && enableMask
+          mask: enableMask
         });
       }
     });