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

fix: 修复 点图层兼容问题

This commit is contained in:
2912401452 2021-12-15 16:32:12 +08:00
parent 6a1eaaecd8
commit 82e2bcda36
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/shaders/picking.frag.glsl
View File

@ -54,12 +54,12 @@ vec4 filterColor(vec4 color) {
} }
// TODO: 优化水波点 blend additive 模式下有的拾取效果 // TODO: 优化水波点 blend additive 模式下有的拾取效果
vec4 filterColorAnimate(vec4 color) { vec4 filterColorAnimate(vec4 color, float weight) {
// TODO: 过滤多余的 shader 计算 // TODO: 过滤多余的 shader 计算
if(u_shaderPick < 0.5) { if(u_shaderPick < 0.5) {
return color; // 暂时去除 直接取消计算在选中时拖拽地图会有问题 return color; // 暂时去除 直接取消计算在选中时拖拽地图会有问题
} else { } else {
return filterPickingColor(filterHighlightColor(color, color.a)); return filterPickingColor(filterHighlightColor(color, weight));
} }
} }

15
packages/layers/src/point/shaders/fill_frag.glsl
View File

@ -89,18 +89,19 @@ void main() {
float intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_aimate.z - u_aimate.y * u_time)), 0.0, 1.0); float intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_aimate.z - u_aimate.y * u_time)), 0.0, 1.0);
// TODO: 根据叠加模式选择效果 // TODO: 根据叠加模式选择效果
if(u_additive > 0.0) { // if(u_additive > 0.0) {
gl_FragColor *= intensity; // gl_FragColor *= intensity;
} else { // } else {
gl_FragColor = vec4(gl_FragColor.xyz, intensity); // gl_FragColor = vec4(gl_FragColor.xyz, intensity);
} // }
gl_FragColor = vec4(gl_FragColor.xyz, intensity);
// TODO: 优化在水波纹情况下的拾取（a == 0 时无法拾取） // TODO: 优化在水波纹情况下的拾取（a == 0 时无法拾取）
if(d < 0.7) { if(d < 0.7) {
gl_FragColor.a = max(gl_FragColor.a, 0.001); gl_FragColor.a = max(gl_FragColor.a, 0.001);
} }
gl_FragColor = u_additive > 0.0 ？filterColorAnimate(gl_FragColor) : filterColor(gl_FragColor); // gl_FragColor = u_additive > 0.0 ？filterColorAnimate(gl_FragColor) : filterColor(gl_FragColor);
gl_FragColor = filterColor(gl_FragColor);
} else { } else {
gl_FragColor = filterColor(gl_FragColor); gl_FragColor = filterColor(gl_FragColor);
} }

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

@ -30,7 +30,7 @@ export default class GaodeMapComponent extends React.Component {
// none = 'none', // none = 'none',
// blend: 'additive' // blend: 'additive'
let layer = new PointLayer({ zIndex: 2, blend: 'additive' }) let layer = new PointLayer({ zIndex: 2, }) // blend: 'additive'
.source( .source(
[ [
{ {