@antv/l7-layers 2.20.5 → 2.20.6

package/{lib/point/shaders → es/point/shaders/fill}/fill_frag.glsl

@@ -1,12 +1,14 @@
-
 layout(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
   float u_stroke_width;
   float u_additive;
   float u_stroke_opacity;
   float u_size_unit;
+  float u_time;
+  vec4 u_animate;
 };
 
+
 in vec4 v_color;
 in vec4 v_stroke;
 in vec4 v_data;
@@ -63,17 +65,32 @@ void main() {
     inner_df
   );
 
+  float PI = 3.14159;
+  float N_RINGS = 3.0;
+  float FREQ = 1.0;
+
   if(u_stroke_width < 0.01) {
     outputColor = v_color;
   } else {
     outputColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
   }
+  float intensity = 1.0;
+  if(u_time!=-1.0){
+    //wave相关逻辑
+    float d = length(v_data.xy);
+    if(d > 0.5) {
+      discard;
+    }
+    intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_animate.z - u_animate.y * u_time)), 0.0, 1.0);
+  }
 
   if(u_additive > 0.0) {
     outputColor *= opacity_t;
+    outputColor *= intensity;//wave
     outputColor = filterColorAlpha(outputColor, outputColor.a);
   } else {
     outputColor.a *= opacity_t;
+    outputColor.a *= intensity;//wave 
     outputColor = filterColor(outputColor);
   }
    // 作为 mask 模板时需要丢弃透明的像素

package/es/point/shaders/{fill_vert.glsl → fill/fill_vert.glsl}

@@ -1,8 +1,7 @@
 layout(location = 0) in vec3 a_Position;
 layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
+layout(location = 9) in vec2 a_SizeAndShape;
 layout(location = 11) in vec3 a_Extrude;
-layout(location = 10) in float a_Shape;
 
 layout(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
@@ -10,6 +9,8 @@ layout(std140) uniform commonUniforms {
   float u_additive;
   float u_stroke_opacity;
   float u_size_unit;
+  float u_time;
+  vec4 u_animate;   
 };
 
 out vec4 v_color;
@@ -25,12 +26,12 @@ void main() {
   // 透明度计算
    v_stroke = stroke;  
   vec3 extrude = a_Extrude;
-  float shape_type = a_Shape;
+  float shape_type = a_SizeAndShape.y;
   /*
   *  setPickingSize 设置拾取大小
   *  u_meter2coord 在等面积大小的时候设置单位
   */
-  float newSize = setPickingSize(a_Size);
+  float newSize = setPickingSize(a_SizeAndShape.x);
   // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;
 
 

package/es/point/shaders/fillImage/fillImage_frag.glsl

@@ -0,0 +1,24 @@
+in vec4 v_color;
+in vec2 v_uv;// 本身的 uv 坐标
+in vec2 v_Iconuv;
+in float v_opacity;
+out vec4 outputColor;
+
+uniform sampler2D u_texture;
+layout(std140) uniform commonUniform {
+  vec2 u_textSize;
+  float u_heightfixed: 0.0;
+  float u_raisingHeight: 0.0;
+  float u_size_unit;
+};
+
+#pragma include "sdf_2d"
+#pragma include "picking"
+
+
+void main() {
+  vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;
+  outputColor = texture(SAMPLER_2D(u_texture), pos);
+  outputColor.a *= v_opacity;
+  outputColor = filterColor(outputColor);
+}

package/{lib/point/shaders/image → es/point/shaders/fillImage}/fillImage_vert.glsl

@@ -1,21 +1,19 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-attribute vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 14) in vec2 a_Uv;
 
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform commonUniform {
+  vec2 u_textSize;
+  float u_heightfixed: 0.0;
+  float u_raisingHeight: 0.0;
+  float u_size_unit;
+};
 
-uniform mat2 u_RotateMatrix;
-uniform int u_size_unit;
-
-varying vec2 v_uv; // 本身的 uv 坐标
-varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
-
-uniform float u_raisingHeight: 0.0;
-uniform float u_heightfixed: 0.0;
-varying float v_opacity;
-// uniform vec2 u_offsets; // shader 注入
+out vec2 v_uv;
+out vec2 v_Iconuv;
+out float v_opacity;
 
 
 #pragma include "projection"
@@ -29,7 +27,7 @@ void main() {
   v_Iconuv = a_Uv;
   v_opacity = opacity;
   float newSize = a_Size;
-  if(u_size_unit == 1) {
+  if(u_size_unit == 1.0) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
   

package/es/point/shaders/image/image_frag.glsl

@@ -0,0 +1,42 @@
+layout(std140) uniform commonUniforms {
+  vec2 u_textSize;
+  float u_raisingHeight;
+  float u_heightfixed;
+};
+
+uniform sampler2D u_texture;
+
+in vec4 v_color;
+in vec2 v_uv;
+in float v_opacity;
+
+#pragma include "picking"
+
+out vec4 outputColor;
+
+void main(){
+  vec2 pos = v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;
+  vec4 textureColor;
+
+  // Y = 0.299R + 0.587G + 0.114B // 亮度提取
+  
+  textureColor = texture(SAMPLER_2D(u_texture), pos);
+
+  // Tip: 去除边缘部分 mipmap 导致的混合变暗
+  float fragmengTocenter = distance(vec2(0.5), gl_PointCoord);
+  if(fragmengTocenter >= 0.5) {
+        float luma = 0.299 * textureColor.r + 0.587 * textureColor.g + 0.114 * textureColor.b;
+        textureColor.a *= luma;
+  }
+  
+  if(all(lessThan(v_color, vec4(1.0+0.00001))) && all(greaterThan(v_color, vec4(1.0-0.00001))) || v_color==vec4(1.0)){
+        outputColor= textureColor;
+  }else {
+        outputColor= step(0.01, textureColor.z) * v_color;
+  }
+  outputColor.a *= v_opacity;
+  if (outputColor.a < 0.01) {
+      discard;
+  }
+  outputColor = filterColor(outputColor);
+}

package/{lib/point/shaders → es/point/shaders/image}/image_vert.glsl

@@ -1,16 +1,17 @@
-precision highp float;
-attribute vec3 a_Position;
-attribute vec4 a_Color;
-attribute vec2 a_Uv;
-attribute float a_Size;
-varying vec4 v_color;
-varying vec2 v_uv;
-varying float v_opacity;
-uniform mat4 u_ModelMatrix;
-
-
-uniform float u_raisingHeight: 0.0;
-uniform float u_heightfixed: 0.0;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+  vec2 u_textSize;
+  float u_raisingHeight;
+  float u_heightfixed;
+};
+
+out vec4 v_color;
+out vec2 v_uv;
+out float v_opacity;
 
 #pragma include "projection"
 #pragma include "picking"

package/es/point/shaders/radar/radar_frag.glsl

@@ -1,14 +1,19 @@
 
-uniform float u_additive;
-uniform float u_opacity: 1.0;
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec2 v_exteude;
+layout(std140) uniform commonUniorm{
+  float u_additive;
+  float u_size_unit;
+  float u_speed: 1.0;
+  float u_time;
+};
+in vec4 v_data;
+in vec4 v_color;
+in float v_radius;
+in vec2 v_extrude;
 #pragma include "sdf_2d"
 #pragma include "picking"
 
+out vec4 outputColor;
+
 void main() {
 
   lowp float antialiasblur = v_data.z;
@@ -19,19 +24,19 @@ void main() {
 
   float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
 
-  gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);
+  outputColor = vec4(v_color.rgb, v_color.a);
 
   if(u_additive > 0.0) {
-    gl_FragColor *= opacity_t;
+    outputColor *= opacity_t;
   } else {
-    gl_FragColor.a *= opacity_t;
+    outputColor.a *= opacity_t;
   }
 
-  if(gl_FragColor.a > 0.0) {
-    gl_FragColor = filterColor(gl_FragColor);
+  if(outputColor.a > 0.0) {
+    outputColor = filterColor(outputColor);
   }
 
-  vec2 extrude =  v_exteude;
+  vec2 extrude =  v_extrude;
   vec2 dir = normalize(extrude);
   vec2 baseDir = vec2(1.0, 0.0);
   float pi = 3.14159265359;
@@ -43,5 +48,5 @@ void main() {
     radar_v = 1.0 - (radar_v - 0.99)/0.01;
   }
 
-  gl_FragColor.a *= radar_v;
+  outputColor.a *= radar_v;
 }

package/es/point/shaders/radar/radar_vert.glsl

@@ -1,50 +1,47 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-uniform float u_speed: 1.0;
-uniform float u_time;
-
-uniform mat4 u_ModelMatrix;
-
-uniform int u_size_unit;
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec2 v_exteude;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 11) in vec4 a_ExtrudeAndSize;
+
+layout(std140) uniform commonUniorm {
+  float u_additive;
+  float u_size_unit;
+  float u_speed: 1.0;
+  float u_time;
+};
+
+out vec4 v_data;
+out vec4 v_color;
+out float v_radius;
+out vec2 v_extrude;
 
 #pragma include "projection"
 #pragma include "picking"
 
 void main() {
-  vec3 extrude = a_Extrude;
-  float newSize = setPickingSize(a_Size);
+  vec3 extrude = a_ExtrudeAndSize.xyz;
+  float newSize = setPickingSize(a_ExtrudeAndSize.w);
 
   float time = u_time * u_speed;
   mat2 rotateMatrix = mat2( 
     cos(time), sin(time), 
     -sin(time), cos(time)
   );
-  v_exteude = rotateMatrix * a_Extrude.xy;
+  v_extrude = rotateMatrix * a_ExtrudeAndSize.xy;
 
-  // unpack color(vec2)
   v_color = a_Color;
+  v_color.a *= opacity;
 
-  // anti-alias
   float blur = 0.0;
-  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);
+  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_ExtrudeAndSize.w, blur);
 
-  if(u_size_unit == 1) {
+  if(u_size_unit == 1.) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
-  // radius(16-bit)
   v_radius = newSize;
 
   vec2 offset = (extrude.xy * (newSize));
   vec3 aPosition = a_Position;
   
-    // 不以米为实际单位
   offset = project_pixel(offset);
   
   v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);

package/es/point/shaders/text/text_frag.glsl

@@ -0,0 +1,44 @@
+#define SDF_PX 8.0
+#define EDGE_GAMMA 0.105
+#define FONT_SIZE 48.0
+
+uniform sampler2D u_sdf_map;
+layout(std140) uniform commonUniforms {
+  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
+  vec2 u_sdf_map_size;
+  float u_raisingHeight: 0.0;
+  float u_stroke_width : 2;
+  float u_gamma_scale : 0.5;
+  float u_halo_blur : 0.5;
+};
+
+in vec4 v_color;
+in vec4 v_stroke_color;
+in vec2 v_uv;
+in float v_gamma_scale;
+in float v_fontScale;
+out vec4 outputColor;
+
+#pragma include "picking"
+void main() {
+  // get style data mapping
+
+  // get sdf from atlas
+  float dist = texture(SAMPLER_2D(u_sdf_map), v_uv).a;
+
+  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;
+  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;
+
+  highp float gamma_scaled = gamma * v_gamma_scale;
+
+  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
+
+  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));
+
+  outputColor.a *= alpha;
+   // 作为 mask 模板时需要丢弃透明的像素
+  if (outputColor.a < 0.01) {
+    discard;
+  }
+  outputColor = filterColor(outputColor);
+}

package/es/point/shaders/{text_vert.glsl → text/text_vert.glsl}

@@ -1,24 +1,26 @@
 #define SDF_PX 8.0
 #define EDGE_GAMMA 0.105
 #define FONT_SIZE 24.0
-attribute vec3 a_Position;
-attribute vec2 a_tex;
-attribute vec2 a_textOffsets;
-attribute vec4 a_Color;
-attribute float a_Size;
 
-uniform vec2 u_sdf_map_size;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 14) in vec4 a_textUvAndOffsets;
 
-uniform float u_raisingHeight: 0.0;
+layout(std140) uniform commonUniforms {
+  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
+  vec2 u_sdf_map_size;
+  float u_raisingHeight: 0.0;
+  float u_stroke_width : 2;
+  float u_gamma_scale : 0.5;
+  float u_halo_blur : 0.5;
+};
 
-varying vec2 v_uv;
-varying float v_gamma_scale;
-varying vec4 v_color;
-varying vec4 v_stroke_color;
-varying float v_fontScale;
-uniform float u_stroke_width : 2;
-uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
+out vec2 v_uv;
+out float v_gamma_scale;
+out vec4 v_color;
+out vec4 v_stroke_color;
+out float v_fontScale;
 
 
 
@@ -29,7 +31,7 @@ uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
   
-  v_uv = a_tex / u_sdf_map_size;
+  v_uv = a_textUvAndOffsets.xy / u_sdf_map_size;
 
 
 
@@ -43,7 +45,7 @@ void main() {
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
-  vec2 offset = rotate_matrix(a_textOffsets,rotation);
+  vec2 offset = rotate_matrix(a_textUvAndOffsets.zw,rotation);
   
   // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
 

package/es/point/shape/extrude.d.ts

@@ -1,4 +1,4 @@
-import { IPath } from '../../core/shape/Path';
+import type { IPath } from '../../core/shape/Path';
 export interface IExtrudeGeomety {
     positions: number[];
     index: number[];

package/es/polygon/index.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../core/BaseLayer';
-import { IPolygonLayerStyleOptions } from '../core/interface';
-import { PolygonModelType } from './models/';
+import type { IPolygonLayerStyleOptions } from '../core/interface';
+import type { PolygonModelType } from './models/';
 export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
     type: string;
     enableShaderEncodeStyles: string[];

package/es/polygon/models/extrude.d.ts

@@ -1,16 +1,16 @@
-import { IModel, ITexture2D } from '@antv/l7-core';
+import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class ExtrudeModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): {
-        u_topsurface: number;
-        u_sidesurface: number;
-        u_heightfixed: number;
-        u_raisingHeight: number;
-        u_linearColor: number;
-        u_sourceColor: number[];
-        u_targetColor: number[];
-        u_texture: ITexture2D;
+        [x: string]: any;
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
     };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;