@antv/l7-layers 2.21.11-beta.4 → 2.21.11-beta.6

package/es/geometry/models/plane.d.ts

@@ -48,10 +48,11 @@ export default class PlaneModel extends BaseModel {
     };
     updateTexture(mapTexture: string | undefined): void;
     protected getImageData(img: HTMLImageElement): ImageData;
-    protected translateVertex(positions: number[], indices: number[], image: HTMLImageElement, widthSegments: number, heightSegments: number, rgb2height: (r: number, g: number, b: number) => number): void;
-    /**
-     * load terrain texture & offset attribute z
-     */
-    protected loadTerrainTexture(positions: number[], indices: number[]): void;
+    protected translateVertex(positions: number[], indices: number[], image: HTMLImageElement, widthSegments: number, heightSegments: number, rgb2height: (r: number, g: number, b: number) => number): {
+        vertices: number[];
+        indices: number[];
+        size: number;
+    };
+    private loadTerrainImage;
     protected registerBuiltinAttributes(): void;
 }

package/es/geometry/models/plane.js

@@ -2,12 +2,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
-// import { mat4, vec3 } from 'gl-matrix';
 import BaseModel from "../../core/BaseModel";
 /* babel-plugin-inline-import '../shaders/plane_frag.glsl' */
-const planeFrag = "\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nin vec3 v_Color;\nin vec2 v_uv;\nin float v_clip;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n    outputColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    outputColor = vec4(v_Color, u_opacity);\n  }\n  outputColor.a *= v_clip;\n  outputColor = filterColor(outputColor);\n}\n";
+const planeFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nin vec3 v_Color;\nin vec2 v_uv;\nin float v_clip;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  if (u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n    outputColor.a *= u_opacity;\n  } else {\n    outputColor = vec4(v_Color, u_opacity);\n  }\n  outputColor.a *= v_clip;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
-const planeVert = "\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
+const planeVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n  v_Color = a_Color;\n  v_uv = a_Uv;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  v_clip = 1.0;\n  if (a_Position.z < u_terrainClipHeight) {\n    v_clip = 0.0;\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 export default class PlaneModel extends BaseModel {
   constructor(...args) {
     super(...args);
@@ -22,7 +21,8 @@ export default class PlaneModel extends BaseModel {
         widthSegments = 1,
         heightSegments = 1,
         center = [120, 30],
-        terrainTexture
+        terrainTexture,
+        rgb2height = (r, g, b) => r + g + b
       } = this.layer.getLayerConfig();
       const {
         indices,
@@ -30,7 +30,7 @@ export default class PlaneModel extends BaseModel {
       } = this.initPlane(width, height, widthSegments, heightSegments, ...center);
       if (terrainTexture) {
         // 存在地形贴图的时候会根据地形贴图对顶点进行偏移
-        this.loadTerrainTexture(positions, indices);
+        return this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
       }
       return {
         vertices: positions,
@@ -121,7 +121,8 @@ export default class PlaneModel extends BaseModel {
     var _this = this;
     return _asyncToGenerator(function* () {
       const {
-        mapTexture
+        mapTexture,
+        terrainTexture
       } = _this.layer.getLayerConfig();
       _this.mapTexture = mapTexture;
       const {
@@ -133,6 +134,9 @@ export default class PlaneModel extends BaseModel {
       });
       _this.updateTexture(mapTexture);
       _this.initUniformsBuffer();
+      if (terrainTexture) {
+        _this.terrainImage = yield _this.loadTerrainImage(terrainTexture);
+      }
       const model = yield _this.layer.buildLayerModel({
         moduleName: 'geometryPlane',
         vertexShader: planeVert,
@@ -244,50 +248,41 @@ export default class PlaneModel extends BaseModel {
         positions[z] = rgb2height(r, g, b);
       }
     }
-    const oldFeatures = this.layer.getEncodedData();
-    const modelData = this.styleAttributeService.createAttributesAndIndices(oldFeatures, () => {
-      return {
-        vertices: positions,
-        indices,
-        size: 5
-      };
-    });
-    this.layer.updateModelData(modelData);
-    this.layerService.throttleRenderLayers();
+    return {
+      vertices: positions,
+      indices,
+      size: 5
+    };
   }
-
-  /**
-   * load terrain texture & offset attribute z
-   */
-  loadTerrainTexture(positions, indices) {
-    const {
-      widthSegments = 1,
-      heightSegments = 1,
-      terrainTexture,
-      rgb2height = (r, g, b) => r + g + b
-    } = this.layer.getLayerConfig();
-    if (this.terrainImage) {
-      // 若当前已经存在 image，直接进行偏移计算（LOD）
-      if (this.terrainImageLoaded) {
-        this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
+  loadTerrainImage(terrainTexture) {
+    var _this3 = this;
+    return _asyncToGenerator(function* () {
+      if (_this3.terrainImage) {
+        // 若当前已经存在 image，直接进行偏移计算（LOD）
+        if (_this3.terrainImageLoaded) {
+          return _this3.terrainImage;
+        } else {
+          return new Promise(resolve => {
+            _this3.terrainImage.onload = () => {
+              resolve(_this3.terrainImage);
+            };
+          });
+        }
       } else {
-        this.terrainImage.onload = () => {
-          this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
-        };
+        // 加载地形贴图、根据地形贴图对 planeGeometry 进行偏移
+        const terrainImage = new Image();
+        terrainImage.crossOrigin = 'anonymous';
+        return new Promise(resolve => {
+          terrainImage.onload = () => {
+            _this3.terrainImageLoaded = true;
+            resolve(terrainImage);
+            // 图片加载完，触发事件，可以进行地形图的顶点计算存储
+            setTimeout(() => _this3.layer.emit('terrainImageLoaded', null));
+          };
+          terrainImage.src = terrainTexture;
+        });
       }
-    } else {
-      // 加载地形贴图、根据地形贴图对 planeGeometry 进行偏移
-      const terrainImage = new Image();
-      this.terrainImage = terrainImage;
-      terrainImage.crossOrigin = 'anonymous';
-      terrainImage.onload = () => {
-        this.terrainImageLoaded = true;
-        // 图片加载完，触发事件，可以进行地形图的顶点计算存储
-        setTimeout(() => this.layer.emit('terrainImageLoaded', null));
-        this.translateVertex(positions, indices, terrainImage, widthSegments, heightSegments, rgb2height);
-      };
-      terrainImage.src = terrainTexture;
-    }
+    })();
   }
   registerBuiltinAttributes() {
     // point layer size;

package/es/geometry/models/sprite.js

@@ -25,7 +25,7 @@ export default class SpriteModel extends BaseModel {
     _defineProperty(this, "spriteAnimate", void 0);
     _defineProperty(this, "planeGeometryUpdateTriangulation", () => {
       const {
-        spriteBottom = -100000
+        spriteBottom = -10
       } = this.layer.getLayerConfig();
       const updateZ = this.spriteUpdate;
       const bottomZ = spriteBottom;
@@ -152,8 +152,8 @@ export default class SpriteModel extends BaseModel {
     return _asyncToGenerator(function* () {
       const {
         mapTexture,
-        spriteTop = 5000000,
-        spriteUpdate = 10000,
+        spriteTop = 300,
+        spriteUpdate = 10,
         spriteAnimate = SPRITE_ANIMATE_DIR.DOWN
       } = _this.layer.getLayerConfig();
       _this.initUniformsBuffer();

package/es/geometry/shaders/plane_frag.glsl

@@ -1,4 +1,3 @@
-
 uniform sampler2D u_texture;
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -13,12 +12,10 @@ out vec4 outputColor;
 
 #pragma include "picking"
 void main() {
-  // gl_FragColor = vec4(v_Color, u_opacity);
-  if(u_mapFlag > 0.0) {
+  if (u_mapFlag > 0.0) {
     outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));
     outputColor.a *= u_opacity;
   } else {
-    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);
     outputColor = vec4(v_Color, u_opacity);
   }
   outputColor.a *= v_clip;

package/es/geometry/shaders/plane_vert.glsl

@@ -1,4 +1,3 @@
-
 layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
 layout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;
 layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
@@ -16,17 +15,17 @@ out float v_clip;
 #pragma include "projection"
 #pragma include "picking"
 void main() {
-   v_Color = a_Color;
-   v_uv = a_Uv;
+  v_Color = a_Color;
+  v_uv = a_Uv;
 
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-   v_clip = 1.0;
-   if(a_Position.z < u_terrainClipHeight) {
-      v_clip = 0.0;
-   }
+  v_clip = 1.0;
+  if (a_Position.z < u_terrainClipHeight) {
+    v_clip = 0.0;
+  }
 
   gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
 
-   setPickingColor(a_PickingColor);
+  setPickingColor(a_PickingColor);
 }

package/lib/geometry/models/plane.d.ts

@@ -48,10 +48,11 @@ export default class PlaneModel extends BaseModel {
     };
     updateTexture(mapTexture: string | undefined): void;
     protected getImageData(img: HTMLImageElement): ImageData;
-    protected translateVertex(positions: number[], indices: number[], image: HTMLImageElement, widthSegments: number, heightSegments: number, rgb2height: (r: number, g: number, b: number) => number): void;
-    /**
-     * load terrain texture & offset attribute z
-     */
-    protected loadTerrainTexture(positions: number[], indices: number[]): void;
+    protected translateVertex(positions: number[], indices: number[], image: HTMLImageElement, widthSegments: number, heightSegments: number, rgb2height: (r: number, g: number, b: number) => number): {
+        vertices: number[];
+        indices: number[];
+        size: number;
+    };
+    private loadTerrainImage;
     protected registerBuiltinAttributes(): void;
 }

package/lib/geometry/models/plane.js

@@ -10,11 +10,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
-// import { mat4, vec3 } from 'gl-matrix';
 /* babel-plugin-inline-import '../shaders/plane_frag.glsl' */
-const planeFrag = "\nuniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nin vec3 v_Color;\nin vec2 v_uv;\nin float v_clip;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n    outputColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    outputColor = vec4(v_Color, u_opacity);\n  }\n  outputColor.a *= v_clip;\n  outputColor = filterColor(outputColor);\n}\n";
+const planeFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nin vec3 v_Color;\nin vec2 v_uv;\nin float v_clip;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  if (u_mapFlag > 0.0) {\n    outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));\n    outputColor.a *= u_opacity;\n  } else {\n    outputColor = vec4(v_Color, u_opacity);\n  }\n  outputColor.a *= v_clip;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
-const planeVert = "\nlayout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
+const planeVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;\nlayout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  float u_opacity;\n  float u_mapFlag;\n  float u_terrainClipHeight;\n};\n\nout vec3 v_Color;\nout vec2 v_uv;\nout float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n  v_Color = a_Color;\n  v_uv = a_Uv;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  v_clip = 1.0;\n  if (a_Position.z < u_terrainClipHeight) {\n    v_clip = 0.0;\n  }\n\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 class PlaneModel extends _BaseModel.default {
   constructor(...args) {
     super(...args);
@@ -29,7 +28,8 @@ class PlaneModel extends _BaseModel.default {
         widthSegments = 1,
         heightSegments = 1,
         center = [120, 30],
-        terrainTexture
+        terrainTexture,
+        rgb2height = (r, g, b) => r + g + b
       } = this.layer.getLayerConfig();
       const {
         indices,
@@ -37,7 +37,7 @@ class PlaneModel extends _BaseModel.default {
       } = this.initPlane(width, height, widthSegments, heightSegments, ...center);
       if (terrainTexture) {
         // 存在地形贴图的时候会根据地形贴图对顶点进行偏移
-        this.loadTerrainTexture(positions, indices);
+        return this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
       }
       return {
         vertices: positions,
@@ -128,7 +128,8 @@ class PlaneModel extends _BaseModel.default {
     var _this = this;
     return (0, _asyncToGenerator2.default)(function* () {
       const {
-        mapTexture
+        mapTexture,
+        terrainTexture
       } = _this.layer.getLayerConfig();
       _this.mapTexture = mapTexture;
       const {
@@ -140,6 +141,9 @@ class PlaneModel extends _BaseModel.default {
       });
       _this.updateTexture(mapTexture);
       _this.initUniformsBuffer();
+      if (terrainTexture) {
+        _this.terrainImage = yield _this.loadTerrainImage(terrainTexture);
+      }
       const model = yield _this.layer.buildLayerModel({
         moduleName: 'geometryPlane',
         vertexShader: planeVert,
@@ -251,50 +255,41 @@ class PlaneModel extends _BaseModel.default {
         positions[z] = rgb2height(r, g, b);
       }
     }
-    const oldFeatures = this.layer.getEncodedData();
-    const modelData = this.styleAttributeService.createAttributesAndIndices(oldFeatures, () => {
-      return {
-        vertices: positions,
-        indices,
-        size: 5
-      };
-    });
-    this.layer.updateModelData(modelData);
-    this.layerService.throttleRenderLayers();
+    return {
+      vertices: positions,
+      indices,
+      size: 5
+    };
   }
-
-  /**
-   * load terrain texture & offset attribute z
-   */
-  loadTerrainTexture(positions, indices) {
-    const {
-      widthSegments = 1,
-      heightSegments = 1,
-      terrainTexture,
-      rgb2height = (r, g, b) => r + g + b
-    } = this.layer.getLayerConfig();
-    if (this.terrainImage) {
-      // 若当前已经存在 image，直接进行偏移计算（LOD）
-      if (this.terrainImageLoaded) {
-        this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
+  loadTerrainImage(terrainTexture) {
+    var _this3 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      if (_this3.terrainImage) {
+        // 若当前已经存在 image，直接进行偏移计算（LOD）
+        if (_this3.terrainImageLoaded) {
+          return _this3.terrainImage;
+        } else {
+          return new Promise(resolve => {
+            _this3.terrainImage.onload = () => {
+              resolve(_this3.terrainImage);
+            };
+          });
+        }
       } else {
-        this.terrainImage.onload = () => {
-          this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
-        };
+        // 加载地形贴图、根据地形贴图对 planeGeometry 进行偏移
+        const terrainImage = new Image();
+        terrainImage.crossOrigin = 'anonymous';
+        return new Promise(resolve => {
+          terrainImage.onload = () => {
+            _this3.terrainImageLoaded = true;
+            resolve(terrainImage);
+            // 图片加载完，触发事件，可以进行地形图的顶点计算存储
+            setTimeout(() => _this3.layer.emit('terrainImageLoaded', null));
+          };
+          terrainImage.src = terrainTexture;
+        });
       }
-    } else {
-      // 加载地形贴图、根据地形贴图对 planeGeometry 进行偏移
-      const terrainImage = new Image();
-      this.terrainImage = terrainImage;
-      terrainImage.crossOrigin = 'anonymous';
-      terrainImage.onload = () => {
-        this.terrainImageLoaded = true;
-        // 图片加载完，触发事件，可以进行地形图的顶点计算存储
-        setTimeout(() => this.layer.emit('terrainImageLoaded', null));
-        this.translateVertex(positions, indices, terrainImage, widthSegments, heightSegments, rgb2height);
-      };
-      terrainImage.src = terrainTexture;
-    }
+    })();
   }
   registerBuiltinAttributes() {
     // point layer size;

package/lib/geometry/models/sprite.js

@@ -32,7 +32,7 @@ class SpriteModel extends _BaseModel.default {
     (0, _defineProperty2.default)(this, "spriteAnimate", void 0);
     (0, _defineProperty2.default)(this, "planeGeometryUpdateTriangulation", () => {
       const {
-        spriteBottom = -100000
+        spriteBottom = -10
       } = this.layer.getLayerConfig();
       const updateZ = this.spriteUpdate;
       const bottomZ = spriteBottom;
@@ -159,8 +159,8 @@ class SpriteModel extends _BaseModel.default {
     return (0, _asyncToGenerator2.default)(function* () {
       const {
         mapTexture,
-        spriteTop = 5000000,
-        spriteUpdate = 10000,
+        spriteTop = 300,
+        spriteUpdate = 10,
         spriteAnimate = SPRITE_ANIMATE_DIR.DOWN
       } = _this.layer.getLayerConfig();
       _this.initUniformsBuffer();

package/lib/geometry/shaders/plane_frag.glsl

@@ -1,4 +1,3 @@
-
 uniform sampler2D u_texture;
 layout(std140) uniform commonUniforms {
   float u_opacity;
@@ -13,12 +12,10 @@ out vec4 outputColor;
 
 #pragma include "picking"
 void main() {
-  // gl_FragColor = vec4(v_Color, u_opacity);
-  if(u_mapFlag > 0.0) {
+  if (u_mapFlag > 0.0) {
     outputColor = texture(SAMPLER_2D(u_texture), vec2(v_uv.x, 1.0 - v_uv.y));
     outputColor.a *= u_opacity;
   } else {
-    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);
     outputColor = vec4(v_Color, u_opacity);
   }
   outputColor.a *= v_clip;

package/lib/geometry/shaders/plane_vert.glsl

@@ -1,4 +1,3 @@
-
 layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
 layout(location = ATTRIBUTE_LOCATION_COLOR) in vec3 a_Color;
 layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
@@ -16,17 +15,17 @@ out float v_clip;
 #pragma include "projection"
 #pragma include "picking"
 void main() {
-   v_Color = a_Color;
-   v_uv = a_Uv;
+  v_Color = a_Color;
+  v_uv = a_Uv;
 
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-   v_clip = 1.0;
-   if(a_Position.z < u_terrainClipHeight) {
-      v_clip = 0.0;
-   }
+  v_clip = 1.0;
+  if (a_Position.z < u_terrainClipHeight) {
+    v_clip = 0.0;
+  }
 
   gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
 
-   setPickingColor(a_PickingColor);
+  setPickingColor(a_PickingColor);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.21.11-beta.4",
+  "version": "2.21.11-beta.6",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -33,10 +33,10 @@
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
     "polyline-miter-util": "^1.0.1",
-    "@antv/l7-core": "2.21.11-beta.4",
-    "@antv/l7-maps": "2.21.11-beta.4",
-    "@antv/l7-source": "2.21.11-beta.4",
-    "@antv/l7-utils": "2.21.11-beta.4"
+    "@antv/l7-core": "2.21.11-beta.6",
+    "@antv/l7-maps": "2.21.11-beta.6",
+    "@antv/l7-source": "2.21.11-beta.6",
+    "@antv/l7-utils": "2.21.11-beta.6"
   },
   "devDependencies": {
     "@types/d3-array": "^2",
@@ -45,7 +45,7 @@
     "@types/d3-scale": "^2.1.1",
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.21.11-beta.4"
+    "@antv/l7-test-utils": "^2.21.11-beta.6"
   },
   "publishConfig": {
     "access": "public",