p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shihui (#992) 

* fix: 修复 cylinder 在 mapbox 高度错误且 heightfixed 失效

* fix: 修复点图层 水波点 叠加模式不兼容

* style: lint style
This commit is contained in:
YiQianYao 2022-03-03 19:25:38 +08:00 committed by GitHub
parent bca4bea08c
commit 5915afbe8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/layers/src/point/shaders/animate/wave_frag.glsl
View File

@ -43,6 +43,10 @@ void main() {
// TODO: 根据叠加水波效果
gl_FragColor = vec4(v_color.xyz, v_color.a * opacity * intensity);
if(u_additive > 0.0) {
gl_FragColor *= gl_FragColor.a;
}
// TODO: 优化在水波纹情况下的拾取
if(d < 0.5) {
gl_FragColor = filterColor(gl_FragColor);

66
stories/Map/components/mapCenter.tsx
View File

@ -170,10 +170,10 @@ export default class GaodeMapComponent extends React.Component {
// opacity: 0.5
// })
scene.addImage(
'00',
'https://gw.alipayobjects.com/zos/basement_prod/604b5e7f-309e-40db-b95b-4fac746c5153.svg',
);
// scene.addImage(
// '00',
// 'https://gw.alipayobjects.com/zos/basement_prod/604b5e7f-309e-40db-b95b-4fac746c5153.svg',
// );
scene.on('loaded', () => {
// scene.addLayer(layer);
@ -201,16 +201,17 @@ export default class GaodeMapComponent extends React.Component {
)
.shape('circle')
.color('#ff0')
.animate(true)
.size(20);
scene.addLayer(layer);
let text = new PointLayer({ zIndex: 2 })
let layer2 = new PointLayer({}) // blend: 'additive'
.source(
[
{
lng: aspaceLnglat[0] + 0.0002,
lat: aspaceLnglat[1],
name: '00',
lng: 120.1019811630249 + 0.0001,
lat: 30.264701434772807,
name: 'n3',
},
],
{
@ -221,21 +222,44 @@ export default class GaodeMapComponent extends React.Component {
},
},
)
// .shape('100m', 'text')
// .shape('circle')
.shape('name', ['00'])
.size(25)
// .color('#0f0')
// .select(true)
.style({
// textOffset: [50, 20],
});
.shape('circle')
.color('#ff0')
.animate(true)
.size(20);
scene.addLayer(layer2);
text.on('click', () => {
alert('***');
});
// let text = new PointLayer({ zIndex: 2 })
// .source(
// [
// {
// lng: aspaceLnglat[0] + 0.0002,
// lat: aspaceLnglat[1],
// name: '00',
// },
// ],
// {
// parser: {
// type: 'json',
// x: 'lng',
// y: 'lat',
// },
// },
// )
// // .shape('100m', 'text')
// // .shape('circle')
// .shape('name', ['00'])
// .size(25)
// // .color('#0f0')
// // .select(true)
// .style({
// // textOffset: [50, 20],
// });
scene.addLayer(text);
// text.on('click', () => {
// alert('***');
// });
// scene.addLayer(text);
// scene.addLayer(line);
// scene.addLayer(layer2);