Skip to content

Commit 1a621a8

Browse files
authored
fix: reduce terrain mask texture's size to tileSize / 4 to save some memory
* fix: reduce terrain mask texture's size to tileSize / 4 to save some memory * fixing specs
1 parent cd80c89 commit 1a621a8

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,8 @@ class TerrainLayerRenderer extends MaskRendererMixin(TileLayerRendererable(Layer
715715
_createTerrainMaskTexture() {
716716
const regl = this.device;
717717
const tileSize = this.layer.getTileSize().width;
718-
const width = tileSize * 2;
719-
const height = tileSize * 2;
718+
const width = tileSize / 2;
719+
const height = tileSize / 2;
720720
const color = regl.texture({
721721
// min 和 mag 必须用nearest,选择别的值会造成mask的高程值发生错误
722722
min: 'nearest',

packages/maptalks-gl/rollup.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const { nodeResolve } = require('@rollup/plugin-node-resolve');
22
const commonjs = require('@rollup/plugin-commonjs');
33
const pkg = require('./package.json');
44
const terser = require('@rollup/plugin-terser');
5-
const sourcemaps = require('rollup-plugin-sourcemaps');
65
const copy = require('rollup-plugin-copy');
76

87
const outputFile = pkg.main;
@@ -28,7 +27,6 @@ module.exports = [
2827
main: true
2928
}),
3029
commonjs(),
31-
sourcemaps(),
3230
terser({
3331
mangle: true,
3432
compress: {

packages/vt/src/layer/plugins/painters/FillPainter.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,7 @@ class FillPainter extends BasicPainter {
676676
projViewMatrix,
677677
glScale,
678678
viewport: isRenderingTerrainSkin && context && context.viewport,
679+
maskViewport: isRenderingTerrainSkin && context && context.maskViewport,
679680
hasSSRGround: context && context.hasSSRGround
680681
// blendSrcIsOne: +(!!(blendSrc === 'one' || blendSrc === 1))
681682
};

packages/vt/src/layer/plugins/painters/TerrainFlatMaskPainter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class TerrainFlatMaskPainter extends BasicPainter {
112112
// const blendSrc = this.sceneConfig.blendSrc;
113113
const uniforms = {
114114
projViewMatrix,
115-
viewport: context && context.viewport
115+
viewport: context && context.maskViewport,
116116
};
117117
return uniforms;
118118
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,7 @@ class VectorTileLayerRenderer extends CanvasCompatible(TileLayerRendererable(Lay
13151315
};
13161316
TERRAIN_CLEAR.framebuffer = texture;
13171317
terrainRegl.clear(TERRAIN_CLEAR);
1318+
this._parentContext.maskViewport = getTileViewport(tileSize / 4);
13181319
this._parentContext.viewport = getTileViewport(tileSize);
13191320
// 如果矢量瓦片的目标绘制尺寸过大,拉伸后会过于失真,还不如不去绘制
13201321
this._drawTerrainTile(skinImage.tile);

packages/vt/test/specs/update.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2395,7 +2395,7 @@ describe('update style specs', () => {
23952395
}, 300);
23962396
}, 300);
23972397

2398-
}, 1500);
2398+
}, 2000);
23992399

24002400
});
24012401

0 commit comments

Comments
 (0)