@antv/l7-layers 2.20.2 → 2.20.5

package/lib/point/shaders/extrude/extrude_vert.glsl

@@ -1,32 +1,28 @@
-precision highp float;
-
 #define pi 3.1415926535
 #define ambientRatio 0.5
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-attribute vec3 a_Position;
-attribute vec3 a_Pos;
-attribute vec4 a_Color;
-attribute vec3 a_Size;
-attribute vec3 a_Normal;
-
-uniform float u_heightfixed: 0.0; // 默认不固定
-uniform float u_r;
-uniform mat4 u_ModelMatrix;
-
-varying vec4 v_color;
-varying float v_lightWeight;
-varying float v_barLinearZ;
-
-uniform float u_opacity : 1;
-uniform float u_lightEnable: 1;
-uniform float u_opacitylinear: 0.0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_opacitylinear_dir: 1.0;
-uniform float  u_linearColor: 0.0;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec3 a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 13) in vec3 a_Normal;
+
+layout(std140) uniform commonUniforms {
+  float u_pickLight;
+  float u_heightfixed;
+  float u_r;
+  float u_linearColor;
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_opacitylinear;
+  float u_opacitylinear_dir;
+  float u_lightEnable;
+};
+out vec4 v_color;
+out float v_lightWeight;
+out float v_barLinearZ;
 
 #pragma include "projection"
 #pragma include "light"
@@ -72,7 +68,7 @@ void main() {
   }
 
 
-  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));
+  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));
 
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
@@ -91,9 +87,9 @@ void main() {
     // 设置圆柱的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
     v_color = mix(u_sourceColor, u_targetColor, a_Position.z);
-    v_color.a =  v_color.a * u_opacity;
+    v_color.a =  v_color.a * opacity;
   } else {
-    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);
+    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
   }
 
     if(u_opacitylinear > 0.0) {
@@ -101,8 +97,6 @@ void main() {
   }
 
 
-  // gl_Position = project_common_position_to_clipspace(pos);
-
   gl_Position = project_common_position_to_clipspace_v2(pos);
 
   setPickingColor(a_PickingColor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.2",
+  "version": "2.20.5",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.20.2",
-    "@antv/l7-maps": "2.20.2",
-    "@antv/l7-source": "2.20.2",
-    "@antv/l7-utils": "2.20.2",
+    "@antv/l7-core": "2.20.5",
+    "@antv/l7-maps": "2.20.5",
+    "@antv/l7-source": "2.20.5",
+    "@antv/l7-utils": "2.20.5",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.2",
+    "@antv/l7-test-utils": "2.20.5",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "c0e21cc20d1530aa586623484a9511636800839f",
+  "gitHead": "9c6df5f2ef050d18102f4aa4ccbb598bc1b5ee4d",
   "publishConfig": {
     "access": "public"
   }