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

Merge branch 'master' of https://github.com/antvis/L7

This commit is contained in:
2912401452 2021-12-21 15:49:04 +08:00
parent 0249d2b803 1fcd1f06a0
commit 19cfd7d6e7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,13 @@ void main() {
float N_RINGS = 3.0; float N_RINGS = 3.0;
float FREQ = 1.0; float FREQ = 1.0;
gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t); if(strokeWidth < 0.01) {
gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
} else {
gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
}
// gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
if(u_aimate.x == Animate) { if(u_aimate.x == Animate) {
float d = length(v_data.xy); float d = length(v_data.xy);
@ -105,10 +111,14 @@ void main() {
} else { } else {
gl_FragColor = filterColor(gl_FragColor); gl_FragColor = filterColor(gl_FragColor);
} }
} else { } else {
gl_FragColor = filterColor(gl_FragColor); gl_FragColor = filterColor(gl_FragColor);
} }
gl_FragColor *= opacity_t; if(u_additive > 0.0) {
gl_FragColor *= opacity_t;
} else {
gl_FragColor.a *= opacity_t;
}
} }

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

@ -78,13 +78,14 @@ export default class GaodeMapComponent extends React.Component {
}, },
) )
.shape('circle') .shape('circle')
.color('#00f') .color('#0f9')
.size(circleRadius) .size(circleRadius)
.style({ .style({
stroke: '#f00', stroke: '#f00',
// strokeWidth: 10, // strokeWidth: 10,
strokeWidth: 0,
strokeOpacity: 1, strokeOpacity: 1,
unit: 'meter', // unit: 'meter',
}) })
// .animate(true) // .animate(true)
.active({ color: '#00f' }); .active({ color: '#00f' });