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

fix(layer): 新图层透明度

This commit is contained in:
thinkinggis 2020-11-21 00:43:44 +08:00
parent 1145eff9c7
commit e18a8644b3
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/layers/src/image/shaders/image_frag.glsl
View File

@ -5,4 +5,5 @@ varying vec2 v_texCoord;
void main() { void main() {
vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)); vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));
gl_FragColor = color; gl_FragColor = color;
gl_FragColor.a *= u_opacity;
} }

2
packages/layers/src/line/shaders/line_frag.glsl
View File

@ -25,7 +25,7 @@ void main() {
gl_FragColor = v_color; gl_FragColor = v_color;
// anti-alias // anti-alias
// float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy)); // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
// gl_FragColor.a *= u_opacity * blur ; gl_FragColor.a *= u_opacity;
if(u_aimate.x == Animate) { if(u_aimate.x == Animate) {
float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y); float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
alpha = (alpha + u_aimate.w -1.0) / u_aimate.w; alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;

2
stories/Layers/components/Line.tsx
View File

@ -41,7 +41,7 @@ export default class LineDemo extends React.Component {
.shape('line') .shape('line')
.color('#f00') .color('#f00')
.style({ .style({
opacity: 1.0, opacity: 0.5,
}); });
scene.addLayer(polygonLayer); scene.addLayer(polygonLayer);