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

packages/layers/src/point/shaders/fill_frag.glsl

@@ -82,7 +82,13 @@ void main() {
   float N_RINGS = 3.0;
   float FREQ = 1.0;
 
+  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) {
     float d = length(v_data.xy);
@@ -105,10 +111,14 @@ void main() {
     } else {
       gl_FragColor = filterColor(gl_FragColor);
     }
-
   } else {
     gl_FragColor = filterColor(gl_FragColor);
+    
   }
 
+  if(u_additive > 0.0) {
     gl_FragColor *= opacity_t;
+  } else {
+    gl_FragColor.a *= opacity_t;
+  }
 }

stories/Map/components/mapCenter.tsx

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