@antv/l7-layers 2.22.5 → 2.22.7

package/es/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/es/core/BaseLayer.js

@@ -7,6 +7,7 @@ const _excluded = ["passes"],
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
 import { BlendType, IDebugLog, ILayerStage, globalConfigService } from '@antv/l7-core';
+import { processRelativeCoordinates } from '@antv/l7-source';
 import { encodePickingColor, lodashUtil } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
 import { createPlugins } from "../plugins";
@@ -140,6 +141,11 @@ export default class BaseLayer extends EventEmitter {
     _defineProperty(this, "animateOptions", {
       enable: false
     });
+    // 相对坐标系支持
+    _defineProperty(this, "relativeOrigin", [0, 0]);
+    _defineProperty(this, "originalExtent", [0, 0, 0, 0]);
+    _defineProperty(this, "absoluteDataArray", []);
+    // 保存绝对坐标数据用于交互
     /**
      * 图层容器
      */
@@ -166,6 +172,8 @@ export default class BaseLayer extends EventEmitter {
     _defineProperty(this, "encodeDataLength", 0);
     _defineProperty(this, "sourceEvent", () => {
       this.dataState.dataSourceNeedUpdate = true;
+      // 处理相对坐标转换
+      this.processRelativeCoordinates();
       const layerConfig = this.getLayerConfig();
       if (layerConfig && layerConfig.autoFit) {
         this.fitBounds(layerConfig.fitBoundsOptions);
@@ -931,6 +939,9 @@ export default class BaseLayer extends EventEmitter {
         // source 初始化不需要处理
         this.sourceEvent();
       }
+      if (type === 'inited') {
+        this.processRelativeCoordinates();
+      }
     });
   }
   getSource() {
@@ -1215,6 +1226,51 @@ export default class BaseLayer extends 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 = 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 _asyncToGenerator(function* () {

package/es/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/es/earth/models/atmosphere.js

@@ -4,7 +4,7 @@ import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../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/es/earth/models/base.js

@@ -4,7 +4,7 @@ import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { earthTriangulation } from "../../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";
 export default class BaseEarthModel extends BaseModel {

package/es/earth/models/bloomsphere.js

@@ -4,7 +4,7 @@ import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { earthOuterTriangulation } from "../../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/es/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/es/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/es/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/es/geometry/models/billboard.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../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";
 export default class BillBoardModel extends BaseModel {

package/es/geometry/models/sprite.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { gl } from '@antv/l7-core';
 import BaseModel from "../../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/es/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/es/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/es/heatmap/models/heatmap.js

@@ -7,15 +7,15 @@ import { mat4 } from 'gl-matrix';
 import BaseModel from "../../core/BaseModel";
 import { HeatmapTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/heatmap/heatmap_3d_frag.glsl' */
-const heatmap_3d_frag = "layout(std140) uniform commonUniforms {\n  mat4 u_ViewProjectionMatrixUncentered;\n  mat4 u_InverseViewProjectionMatrix;\n  float u_opacity;\n  float u_common_uniforms_padding1;\n  float u_common_uniforms_padding2;\n  float u_common_uniforms_padding3;\n};\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\nin float v_intensity;\nout vec4 outputColor;\n\nvoid main(){\n   \n    float intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;\n    vec4 color = texture(SAMPLER_2D(u_colorTexture),vec2(intensity, 0));\n    outputColor = color;\n    // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;\n   outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;\n}\n";
+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";
 import { heatMap3DTriangulation } from "../triangulation";

package/es/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/es/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/es/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/es/line/models/flow.js

@@ -4,7 +4,7 @@ import { fp64LowPart } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { FlowLineTriangulation } from "../../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";
 export default class FlowLineModel extends BaseModel {

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

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

package/es/plugins/LayerMaskPlugin.js

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

package/es/plugins/ShaderUniformPlugin.js

@@ -32,18 +32,30 @@ export default class ShaderUniformPlugin {
     let uniformBuffer;
     if (!this.rendererService.uniformBuffers[0]) {
       // Create a Uniform Buffer Object(UBO).
+      // Size calculation: 4 mat4 (64) + 1 vec4 (4) + 4 vec3->vec4 (16) + 3 vec4 packed (12) = 96 floats
       uniformBuffer = this.rendererService.createBuffer({
-        data: new Float32Array(16 * 4 + 4 * 7),
+        data: new Float32Array(96),
         isUBO: true,
         label: 'renderUniformBuffer'
       });
       this.rendererService.uniformBuffers[0] = uniformBuffer;
     }
     layer.hooks.beforeRender.tap('ShaderUniformPlugin', () => {
-      // @ts-ignore
-      const offset = layer.getLayerConfig().tileOrigin;
+      // 获取图层的相对坐标原点
+      const layerRelativeOrigin = layer.getRelativeOrigin && layer.getRelativeOrigin();
+      const relativeOrigin = layerRelativeOrigin || [0, 0];
+
       // 重新计算坐标系参数
-      this.coordinateSystemService.refresh(offset);
+      this.coordinateSystemService.refresh();
+
+      // 特殊处理：如果图层启用了相对坐标，强制设置ViewportCenter为RelativeOrigin
+      // 这样可以避免shader中的精度问题
+      const isUsingRelativeCoords = relativeOrigin && (Math.abs(relativeOrigin[0]) > 0.0001 || Math.abs(relativeOrigin[1]) > 0.0001);
+      if (isUsingRelativeCoords && this.coordinateSystemService.getCoordinateSystem() === 2) {
+        // COORDINATE_SYSTEM_LNGLAT_OFFSET
+        // 强制设置ViewportCenter为RelativeOrigin，避免shader中的大数计算
+        this.coordinateSystemService.setViewportCenter(relativeOrigin);
+      }
       const {
         width,
         height
@@ -51,7 +63,7 @@ export default class ShaderUniformPlugin {
       const {
         data,
         uniforms
-      } = this.generateUBO(width, height);
+      } = this.generateUBO(width, height, relativeOrigin);
       if (this.layerService.alreadyInRendering && this.rendererService.uniformBuffers[0]) {
         const renderUniformBuffer = this.rendererService.uniformBuffers[0];
         // Update only once since all models can share one UBO.
@@ -75,7 +87,7 @@ export default class ShaderUniformPlugin {
       }
     });
   }
-  generateUBO(width, height) {
+  generateUBO(width, height, offset) {
     const u_ProjectionMatrix = this.cameraService.getProjectionMatrix();
     const u_ViewMatrix = this.cameraService.getViewMatrix();
     const u_ViewProjectionMatrix = this.cameraService.getViewProjectionMatrix();
@@ -92,6 +104,7 @@ export default class ShaderUniformPlugin {
     const u_ViewportCenter = this.coordinateSystemService.getViewportCenter();
     const u_ViewportSize = [width, height];
     const u_FocalDistance = this.cameraService.getFocalDistance();
+    const u_RelativeOrigin = offset && offset.length >= 2 ? [offset[0], offset[1]] : [0, 0];
     const data = [...u_ViewMatrix,
     // 16
     ...u_ProjectionMatrix,
@@ -116,7 +129,10 @@ export default class ShaderUniformPlugin {
     // 4
     u_FocalDistance,
     // 1
-    0, 0, 0];
+    ...u_RelativeOrigin,
+    // 2
+    0 // padding
+    ];
     return {
       data,
       uniforms: {
@@ -138,7 +154,9 @@ export default class ShaderUniformPlugin {
         // 其他参数，例如视口大小、DPR 等
         u_ViewportSize: u_ViewportSize,
         u_ModelMatrix,
-        u_DevicePixelRatio: u_DevicePixelRatio
+        u_DevicePixelRatio: u_DevicePixelRatio,
+        // 相对原点坐标
+        u_RelativeOrigin: u_RelativeOrigin
       }
     };
   }

package/es/point/models/billboard_point.js

@@ -3,7 +3,7 @@ import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { rgb2arr } from '@antv/l7-utils';
 /* babel-plugin-inline-import '../shaders/billboard/billboard_point_frag.glsl' */
-const simplePointFrag = "\nlayout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nin vec4 v_color;\nin float v_blur;\nin float v_innerRadius;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  vec2 center = vec2(0.5);\n\n  // Tip: \u7247\u5143\u5230\u4E2D\u5FC3\u70B9\u7684\u8DDD\u79BB 0 - 1\n  float fragmengTocenter = distance(center, gl_PointCoord) * 2.0;\n  // Tip: \u7247\u5143\u7684\u526A\u5207\u6210\u5706\u5F62\n  float circleClipOpacity = 1.0 - smoothstep(v_blur, 1.0, fragmengTocenter);\n\n\n  if(v_innerRadius < 0.99) {\n    // \u5F53\u5B58\u5728 stroke \u4E14 stroke > 0.01\n    float blurWidth = (1.0 - v_blur)/2.0;\n    vec4 stroke = vec4(u_stroke_color.rgb, u_stroke_opacity);\n    if(fragmengTocenter > v_innerRadius + blurWidth) {\n      outputColor = stroke;\n    } else if(fragmengTocenter > v_innerRadius - blurWidth){\n      float mixR = (fragmengTocenter - (v_innerRadius - blurWidth)) / (blurWidth * 2.0);\n      outputColor = mix(v_color, stroke, mixR);\n    } else {\n      outputColor = v_color;\n    }\n  } else {\n    // \u5F53\u4E0D\u5B58\u5728 stroke \u6216 stroke <= 0.01\n    outputColor = v_color;\n  }\n\n  outputColor = filterColor(outputColor);\n  \n  if(u_additive > 0.0) {\n    outputColor *= circleClipOpacity;\n  } else {\n    outputColor.a *= circleClipOpacity;\n  }\n\n}\n";
+const simplePointFrag = "layout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nin vec4 v_color;\nin float v_blur;\nin float v_innerRadius;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  vec2 center = vec2(0.5);\n\n  // Tip: \u7247\u5143\u5230\u4E2D\u5FC3\u70B9\u7684\u8DDD\u79BB 0 - 1\n  float fragmengTocenter = distance(center, gl_PointCoord) * 2.0;\n  // Tip: \u7247\u5143\u7684\u526A\u5207\u6210\u5706\u5F62\n  float circleClipOpacity = 1.0 - smoothstep(v_blur, 1.0, fragmengTocenter);\n\n  if (v_innerRadius < 0.99) {\n    // \u5F53\u5B58\u5728 stroke \u4E14 stroke > 0.01\n    float blurWidth = (1.0 - v_blur) / 2.0;\n    vec4 stroke = vec4(u_stroke_color.rgb, u_stroke_opacity);\n    if (fragmengTocenter > v_innerRadius + blurWidth) {\n      outputColor = stroke;\n    } else if (fragmengTocenter > v_innerRadius - blurWidth) {\n      float mixR = (fragmengTocenter - (v_innerRadius - blurWidth)) / (blurWidth * 2.0);\n      outputColor = mix(v_color, stroke, mixR);\n    } else {\n      outputColor = v_color;\n    }\n  } else {\n    // \u5F53\u4E0D\u5B58\u5728 stroke \u6216 stroke <= 0.01\n    outputColor = v_color;\n  }\n\n  outputColor = filterColor(outputColor);\n\n  if (u_additive > 0.0) {\n    outputColor *= circleClipOpacity;\n  } else {\n    outputColor.a *= circleClipOpacity;\n  }\n\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard/billboard_point_vert.glsl' */
 const simplePointVert = "\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_stroke_color;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_stroke_width;\n};\n\nout vec4 v_color;\nout float v_blur;\nout float v_innerRadius;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"project\"\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_blur = 1.0 - max(2.0 / a_Size, 0.05);\n  v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);\n\n  vec2 offset = project_pixel(u_offsets);\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n  setPickingColor(a_PickingColor);\n}\n";
 export function PointTriangulation(feature) {

package/es/point/models/extrude.js

@@ -5,7 +5,7 @@ import { calculateCentroid, fp64LowPart, rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/extrude/extrude_frag.glsl' */
-const pointExtrudeFrag = "\nin vec4 v_color;\nin float v_lightWeight;\nout vec4 outputColor;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\n\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\n\nvoid main() {\n\n  outputColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if(u_pickLight > 0.0) {\n    outputColor = filterColorAlpha(outputColor, v_lightWeight);\n  } else {\n    outputColor = filterColor(outputColor);\n  }\n}\n";
+const pointExtrudeFrag = "in vec4 v_color;\nin float v_lightWeight;\nout vec4 outputColor;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\n\n#pragma include \"scene_uniforms\"\n#pragma include \"picking\"\n\nvoid main() {\n  outputColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if (u_pickLight > 0.0) {\n    outputColor = filterColorAlpha(outputColor, v_lightWeight);\n  } else {\n    outputColor = filterColor(outputColor);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/extrude/extrude_vert.glsl' */
 const pointExtrudeVert = "#define pi (3.1415926535)\n\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_SIZE) in vec3 a_Size;\nlayout(location = ATTRIBUTE_LOCATION_EXTRUDE) in vec4 a_Extrude;\nlayout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\nout vec4 v_color;\nout float v_lightWeight;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if (x > 0.0 && z > 0.0) {\n    return atan(x / z);\n  } else if (x > 0.0 && z <= 0.0) {\n    return atan(-z / x) + pi / 2.0;\n  } else if (x <= 0.0 && z <= 0.0) {\n    return pi + atan(x / z); //atan(x/z) +\n  } else {\n    return atan(z / -x) + pi * 3.0 / 2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y / r);\n}\n\nvoid main() {\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if (u_heightfixed < 1.0) {\n    // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n  } else {\n    // \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if (\n      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||\n      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET\n    ) {\n      offset *= 4.0 / pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n  vec2 positions = a_Extrude.xy;\n  vec2 positions64Low = a_Extrude.zw;\n  vec4 project_pos = project_position(vec4(positions, 0.0, 1.0), positions64Low);\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if (u_lightEnable > 0.0) {\n    // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if (u_linearColor == 1.0) {\n    // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a = v_color.a * opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n  }\n\n  if (u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? 1.0 - a_Position.z : a_Position.z;\n  }\n\n  gl_Position = project_common_position_to_clipspace(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
 export default class ExtrudeModel extends BaseModel {