Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TILES-6869 fix depth msaa #38

Merged
merged 2 commits into from
Oct 11, 2024
Merged

TILES-6869 fix depth msaa #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1520d3e
fix depth msaa
Oct 6, 2024
2c3c0b8
f
Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions demo/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,23 @@ map.once('idle', () => {
initDeckGL();
});

const buildingLayer = {
id: 'house private',
name: 'Частные дома',
type: 'polygonExtrusion',
style: {
topColor: '#00ff00',
sideColor: 'rgba(255,62,54,0.82)',
},
filter: ['match', ['get', 'sublayer'], ['Technical_house'], true, false],
minzoom: 16,
metadata: {
group: {
id: '746776',
},
},
};

function initDeckGL() {
const deckLayer1 = createHeatmapLayer(data);
map.addLayer(deckLayer1);
Expand All @@ -32,6 +49,7 @@ function initDeckGL() {
map.addLayer(deckLayer4);
map.removeLayer('deckgl-HexagonLayer');
map.addLayer(deckLayer2);
map.addLayer(buildingLayer);
}

const COLOR_RANGE: Color[] = [
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@2gis/deck2gis-layer",
"version": "2.0.8",
"version": "2.0.9",
"description": "",
"main": "dist/deck2gislayer.js",
"typings": "dist/types/index.d.ts",
Expand Down
3 changes: 3 additions & 0 deletions src/deckgl2gisLayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ export class Deck2gisLayer<LayerT extends Layer> implements DeckCustomLayer {

this.programmBinder();

gl.depthMask(false);
gl.drawArrays(gl.TRIANGLES, 0, 6);
gl.depthMask(true);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А почему маска устанавливается именно в true?
Не корректнее ли её устанавливать в то значение, которое было до вызова gl.drawArrays?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Точно - поправил.


(this.props.deck as any).glStateStore.useMapglWebglState();
};

Expand Down
11 changes: 0 additions & 11 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ export function drawLayer(deck: Deck, map: Map, layer: Deck2gisLayer<any>): bool
if (!isIncludeLayer(deck, layer)) {
return false;
}
stateBinder(map.getWebGLContext());

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

// Fix heatmap layer render: need reset gl state after each draw layers
/**
* @hidden
* @internal
*/
function stateBinder(gl: WebGLRenderingContext | WebGL2RenderingContext) {
gl.clearDepth(1);
gl.clear(gl.DEPTH_BUFFER_BIT);
}

/**
* @hidden
* @internal
Expand Down
Loading