Reduce the number of clip operations

This commit is contained in:
Andreas Hocevar
2022-02-17 15:18:23 +01:00
parent f99c43db4d
commit c9ff07a695
+15 -1
View File
@@ -20,6 +20,7 @@ import {
equals, equals,
getIntersection, getIntersection,
getTopLeft, getTopLeft,
intersects,
} from '../../extent.js'; } from '../../extent.js';
import {cssOpacity} from '../../css.js'; import {cssOpacity} from '../../css.js';
import {fromUserExtent} from '../../proj.js'; import {fromUserExtent} from '../../proj.js';
@@ -463,14 +464,24 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
const inTransition = const inTransition =
transition && tile.getAlpha(getUid(this), frameState.time) !== 1; transition && tile.getAlpha(getUid(this), frameState.time) !== 1;
let contextSaved = false;
if (!inTransition) { if (!inTransition) {
if (clips) { if (clips) {
// Clip mask for regions in this tile that already filled by a higher z tile // Clip mask for regions in this tile that already filled by a higher z tile
context.save();
currentClip = [x, y, x + w, y, x + w, y + h, x, y + h]; currentClip = [x, y, x + w, y, x + w, y + h, x, y + h];
for (let i = 0, ii = clips.length; i < ii; ++i) { for (let i = 0, ii = clips.length; i < ii; ++i) {
if (z !== currentZ && currentZ < clipZs[i]) { if (z !== currentZ && currentZ < clipZs[i]) {
const clip = clips[i]; const clip = clips[i];
if (
intersects(
[x, y, x + w, y + h],
[clip[0], clip[3], clip[4], clip[7]]
)
) {
if (!contextSaved) {
context.save();
contextSaved = true;
}
context.beginPath(); context.beginPath();
// counter-clockwise (outer ring) for current tile // counter-clockwise (outer ring) for current tile
context.moveTo(currentClip[0], currentClip[1]); context.moveTo(currentClip[0], currentClip[1]);
@@ -485,6 +496,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
context.clip(); context.clip();
} }
} }
}
clips.push(currentClip); clips.push(currentClip);
clipZs.push(currentZ); clipZs.push(currentZ);
} else { } else {
@@ -502,7 +514,9 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
transition transition
); );
if (clips && !inTransition) { if (clips && !inTransition) {
if (contextSaved) {
context.restore(); context.restore();
}
this.renderedTiles.unshift(tile); this.renderedTiles.unshift(tile);
} else { } else {
this.renderedTiles.push(tile); this.renderedTiles.push(tile);