fix: fix terrain tile mask clearing (#2778)

Author: fuzhenn

packages/gl/src/layer/terrain/TerrainLayerRenderer.js

@@ -365,19 +365,13 @@ class TerrainLayerRenderer extends MaskRendererMixin(TileLayerRendererable(Layer
             const { info, image } = terrainTiles[i];
             this._prepareMask(info, image);
             this._debugTile(info, 'renderChildTerrainSkin');
-            let cleared = false;
             if (this._prepareChildTerrainSkin(skinIndex, info, image, skinImagesToDel)) {
                 const skinImages = image.skinImages[skinIndex];
                 for (let j = 0; j < skinImages.length; j++) {
                     const tileId = skinImages[j].tile.info.id;
 
                     // 检查是否存在重复的瓦片，重复的瓦片只需要绘制一次
                     if (!visitedSkinTiles.has(tileId)) {
-                        if (!cleared && skinImages[j].layer.hasTerrainMask) {
-                            //FIXME 潜在bug： 如果skinLayers中有多个 hasTerrainMask 的图层，其中一个clearMask并更新mask后，其他的terrainMask图层并没有更新mask
-                            this._clearMask(image.mask);
-                            cleared = true;
-                        }
                         skinImages[j].terrainMaskFBO = image.mask;
                         layerSkinImages.push(skinImages[j]);
                         visitedSkinTiles.add(tileId);
@@ -749,6 +743,17 @@ class TerrainLayerRenderer extends MaskRendererMixin(TileLayerRendererable(Layer
         const texture = regl.framebuffer(fboInfo)
         texture.colorTex = color;
         this._clearMask(texture);
+        texture.clearTerrainMask = () => {
+            if (!texture._timestamp) {
+                texture._timestamp = 0;
+            }
+            const timestamp = this.getFrameTimestamp();
+            if (timestamp > texture._timestamp) {
+                TERRAIN_MASK_CLEAR.framebuffer = texture;
+                regl.clear(TERRAIN_MASK_CLEAR);
+                texture._timestamp = timestamp;
+            }
+        }
         // 单独创建的 color 必须要手动destroy回收，光destroy framebuffer，color是不会销毁的
         return texture;
     }

packages/vt/src/layer/layer/VectorTileLayer.ts

@@ -111,7 +111,6 @@ class VectorTileLayer extends maptalks.TileLayer {
     VERSION: string;
     ready: boolean;
     isVectorTileLayer: boolean = true;
-    hasTerrainMask: boolean = true;
 
     //@internal
     _polygonOffset: number;

packages/vt/src/layer/plugins/PainterPlugin.js

@@ -273,6 +273,7 @@ function createPainterPlugin(type, Painter) {
                 sr = layer.getSpatialReference ? layer.getSpatialReference() : map.getSpatialReference(),
                 tileResolution = sr.getResolution(tileInfo.z),
                 tileRatio = context.tileExtent / layer.getTileSize().width;
+            geometry.properties.tile = tileInfo;
             geometry.properties.tileResolution = tileResolution;
             geometry.properties.tileRatio = tileRatio;
             geometry.properties.z = tileInfo.z;

packages/vt/src/layer/renderer/VectorTileLayerRenderer.js

@@ -1514,8 +1514,10 @@ class VectorTileLayerRenderer extends CanvasCompatible(TileLayerRendererable(Lay
             isRenderingTerrain,
             isRenderingTerrainSkin: null,
             renderTarget: null
+        };
+        if (isRenderingTerrain && parentContext && parentContext.terrainMaskFBO) {
+            parentContext.terrainMaskFBO.clearTerrainMask();
         }
-
         for (let i = 0, len = plugins.length; i < len; i++) {
             const plugin = plugins[i];
             const idx = i;
@@ -1546,15 +1548,14 @@ class VectorTileLayerRenderer extends CanvasCompatible(TileLayerRendererable(Lay
             }
             const isRenderingTerrainSkin = isRenderingTerrain && terrainSkinFilter(plugin);
 
-            renderContext.sceneConfig = null;
-            renderContext.pluginIndex = null;
-            renderContext.tileData = null;
-            renderContext.tileCache = null;
-            renderContext.tileTransform = null;
-            renderContext.isRenderingTerrainSkin = null;
+            // renderContext.sceneConfig = null;
+            // renderContext.pluginIndex = null;
+            // renderContext.tileData = null;
+            // renderContext.tileCache = null;
+            // renderContext.tileTransform = null;
+            // renderContext.isRenderingTerrainSkin = null;
             renderContext.renderTarget = null;
 
-
             renderContext.sceneConfig = plugin.config.sceneConfig;
             renderContext.pluginIndex = idx;
             renderContext.tileCache = tileCache[idx];