Skip to content

Commit 1520d3e

Browse files
author
Andrey Kuznecov
committed
fix depth msaa
1 parent 70ffb67 commit 1520d3e

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

demo/index.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,23 @@ map.once('idle', () => {
2121
initDeckGL();
2222
});
2323

24+
const buildingLayer = {
25+
id: 'house private',
26+
name: 'Частные дома',
27+
type: 'polygonExtrusion',
28+
style: {
29+
topColor: '#00ff00',
30+
sideColor: 'rgba(255,62,54,0.82)',
31+
},
32+
filter: ['match', ['get', 'sublayer'], ['Technical_house'], true, false],
33+
minzoom: 16,
34+
metadata: {
35+
group: {
36+
id: '746776',
37+
},
38+
},
39+
};
40+
2441
function initDeckGL() {
2542
const deckLayer1 = createHeatmapLayer(data);
2643
map.addLayer(deckLayer1);
@@ -32,6 +49,7 @@ function initDeckGL() {
3249
map.addLayer(deckLayer4);
3350
map.removeLayer('deckgl-HexagonLayer');
3451
map.addLayer(deckLayer2);
52+
map.addLayer(buildingLayer);
3553
}
3654

3755
const COLOR_RANGE: Color[] = [

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@2gis/deck2gis-layer",
3-
"version": "2.0.8",
3+
"version": "2.0.9",
44
"description": "",
55
"main": "dist/deck2gislayer.js",
66
"typings": "dist/types/index.d.ts",

src/deckgl2gisLayer.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,10 @@ export class Deck2gisLayer<LayerT extends Layer> implements DeckCustomLayer {
218218

219219
this.programmBinder();
220220

221+
gl.depthMask(false);
221222
gl.drawArrays(gl.TRIANGLES, 0, 6);
223+
gl.depthMask(true);
224+
222225
(this.props.deck as any).glStateStore.useMapglWebglState();
223226
};
224227

src/utils.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ export function drawLayer(deck: Deck, map: Map, layer: Deck2gisLayer<any>): bool
123123
if (!isIncludeLayer(deck, layer)) {
124124
return false;
125125
}
126-
stateBinder(map.getWebGLContext());
127126

128127
deck._drawLayers('2gis-repaint', {
129128
viewports: [currentViewport],
@@ -486,16 +485,6 @@ function initDeck2gisProps(map: Map, deckProps?: CustomRenderProps): DeckProps {
486485
return deck2gisProps;
487486
}
488487

489-
// Fix heatmap layer render: need reset gl state after each draw layers
490-
/**
491-
* @hidden
492-
* @internal
493-
*/
494-
function stateBinder(gl: WebGLRenderingContext | WebGL2RenderingContext) {
495-
gl.clearDepth(1);
496-
gl.clear(gl.DEPTH_BUFFER_BIT);
497-
}
498-
499488
/**
500489
* @hidden
501490
* @internal

0 commit comments

Comments
 (0)