@antv/l7-layers 2.18.3 → 2.19.0

package/lib/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl

@@ -10,7 +10,7 @@ attribute vec3 a_Normal;
 attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
@@ -42,15 +42,7 @@ void main() {
     }
   }
 
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
-
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
   float lightWeight = calc_lighting(pos);
   v_texture_data = vec2(a_Position.z,lightWeight);
 

package/lib/polygon/shaders/extrude/polygon_extrude_vert.glsl

@@ -10,7 +10,7 @@ attribute vec3 a_Normal;
 attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 uniform float u_linearColor: 0;
@@ -50,13 +50,7 @@ void main() {
   }
 
 
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+ gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
 
   // Tip: 部分机型 GPU 计算精度兼容
   if(isSide < 0.999) {

package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl

@@ -10,7 +10,7 @@ attribute vec3 a_Normal;
 attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform sampler2D u_texture;
 
 
@@ -51,13 +51,7 @@ void main() {
   }
 
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
-
+    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
 
 
 

package/lib/polygon/shaders/extrusion/polygon_extrusion_frag.glsl

@@ -0,0 +1,13 @@
+
+uniform float u_opacity: 1.0;
+varying vec4 v_Color;
+varying vec2 v_texture_data;
+
+
+#pragma include "picking"
+
+void main() {
+
+  gl_FragColor = v_Color;
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/lib/polygon/shaders/extrusion/polygon_extrusion_vert.glsl

@@ -0,0 +1,34 @@
+precision highp float;
+
+#define ambientRatio 0.5
+#define diffuseRatio 0.3
+#define specularRatio 0.2
+
+attribute vec4 a_Color;
+attribute vec3 a_Position;
+attribute vec3 a_Normal;
+attribute float a_Size;
+uniform mat4 u_ModelMatrix;
+
+
+
+
+varying vec4 v_Color;
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+void main() {
+ 
+  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);
+  float lightWeight = calc_lighting(pos);
+  vec4 project_pos = project_position(pos);
+  // project_pos.z += extrusionBase * 2.0;
+  v_Color = a_Color;
+  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);
+
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+
+  setPickingColor(a_PickingColor);
+}

package/lib/polygon/shaders/polygon_linear_vert.glsl

@@ -2,7 +2,7 @@ attribute vec4 a_Color;
 attribute vec3 a_Position;
 
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform float u_raisingHeight: 0.0;
 
 varying vec4 v_Color;
@@ -32,11 +32,6 @@ void main() {
     project_pos.z += u_raisingHeight * mapboxZoomScale;
   }
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
-
+   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
   setPickingColor(a_PickingColor);
 }

package/lib/polygon/shaders/polygon_vert.glsl

@@ -2,7 +2,7 @@ attribute vec4 a_Color;
 attribute vec3 a_Position;
 
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 
 uniform float u_raisingHeight: 0.0;
 
@@ -29,11 +29,8 @@ void main() {
     project_pos.z += u_raisingHeight * mapboxZoomScale;
   }
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+ 
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/lib/polygon/shaders/water/polygon_ocean_vert.glsl

@@ -1,7 +1,7 @@
 attribute vec2 a_uv;
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 
 varying vec2 v_uv;
 
@@ -11,11 +11,6 @@ void main() {
   v_uv = a_uv;
 
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
 }
 

package/lib/polygon/shaders/water/polygon_water_vert.glsl

@@ -2,7 +2,7 @@ attribute vec4 a_Color;
 attribute vec2 a_uv;
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 
 varying vec4 v_Color;
 varying vec2 v_uv;
@@ -17,10 +17,6 @@ void main() {
   v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
 }
 

package/lib/raster/models/raster.js

@@ -21,7 +21,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
 var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n      discard;\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n     discard;\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    \n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n    if(gl_FragColor.a < 0.01)\n      discard;\n   \n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
-var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);

package/lib/raster/models/rasterRgb.js

@@ -24,7 +24,7 @@ var _excluded = ["data"],
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
-var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 /* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
 var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n  if(gl_FragColor.a < 0.01)\n    discard;\n \n}";
 var RasterModel = /*#__PURE__*/function (_BaseModel) {

package/lib/raster/models/rasterTerrainRgb.js

@@ -21,7 +21,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/raster_terrain_rgb_frag.glsl' */
 var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nuniform vec4 u_unpack;\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data = texture2D(u_texture, coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return texture2D(u_colorTexture, coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    gl_FragColor = getColor(value);\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
-var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterTerrainRGB, _BaseModel);
   var _super = _createSuper(RasterTerrainRGB);

package/lib/raster/shaders/raster_2d_vert.glsl

@@ -1,6 +1,6 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 attribute vec3 a_Position;
 attribute vec2 a_Uv;
 varying vec2 v_texCoord;
@@ -9,9 +9,5 @@ void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));
-   } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-   }
+    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
 }

package/lib/raster/shaders/raster_vert.glsl

@@ -1,7 +1,7 @@
 precision highp float;
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform vec4 u_extent;
 uniform sampler2D u_texture;
 uniform sampler2D u_colorTexture;
@@ -27,18 +27,8 @@ void main() {
   float value1 =  (value - u_min) / (u_max -u_min);
   vec4 color = texture2D(u_colorTexture,vec2(intensity, 0));
 
-  // if(uv.x > 1.0 || uv.y > 1.0) {
-  //   v_color = vec4(0.);
-  // }
 
-  //  vec2 range = u_extent.zw - u_extent.xy;
-  //  vec4 project_pos = project_position(vec4(pos, 0, 1.0));
-  //  gl_Position = project_common_position_to_clipspace(vec4(pos.xy, project_scale(value) * u_heightRatio, 1.0));
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(pos.xy, project_scale(value) * u_heightRatio, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(pos.xy, project_scale(value) * u_heightRatio, 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace_v2(vec4(pos.xy, project_scale(value) * u_heightRatio, 1.0));
 
 }

package/lib/raster/shaders/rater_terrain_rgb_vert.glsl

@@ -1,6 +1,6 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 attribute vec3 a_Position;
 attribute vec2 a_Uv;
 varying vec2 v_texCoord;
@@ -8,10 +8,5 @@ varying vec2 v_texCoord;
 void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));
-   } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-   }
+   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
 }

package/lib/wind/models/wind.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/wind_frag.glsl' */
 var WindFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/wind_vert.glsl' */
-var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   \n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var defaultRampColors = {
   0.0: '#3288bd',
   0.1: '#66c2a5',

package/lib/wind/shaders/wind_vert.glsl

@@ -1,6 +1,6 @@
 precision highp float;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 attribute vec3 a_Position;
 attribute vec2 a_Uv;
 varying vec2 v_texCoord;
@@ -8,10 +8,6 @@ varying vec2 v_texCoord;
 void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));
-   } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-   }
+
+    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.18.3",
+  "version": "2.19.0",
   "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.18.3",
-    "@antv/l7-maps": "2.18.3",
-    "@antv/l7-source": "2.18.3",
-    "@antv/l7-utils": "2.18.3",
+    "@antv/l7-core": "2.19.0",
+    "@antv/l7-maps": "2.19.0",
+    "@antv/l7-source": "2.19.0",
+    "@antv/l7-utils": "2.19.0",
     "@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.18.3",
+    "@antv/l7-test-utils": "2.19.0",
     "@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": "882d6eaa2d503b4e50ad6d94b123f8f892c0f84c",
+  "gitHead": "7f08eaafe2a25e986ba52c625acf5511f1184b82",
   "publishConfig": {
     "access": "public"
   }

package/es/Geometry/shaders/plane_vert.glsl

@@ -1,53 +0,0 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
-
-uniform mat4 u_Mvp;
-uniform float u_opacity;
-uniform float u_terrainClipHeight;
-
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-attribute vec3 a_Color;
-
-varying vec3 v_Color;
-varying vec2 v_uv;
-varying float v_clip;
-
-#pragma include "projection"
-#pragma include "picking"
-void main() {
-   v_Color = a_Color;
-   v_uv = a_Uv;
-  
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-
-   v_clip = 1.0;
-   if(a_Position.z < u_terrainClipHeight) {
-      v_clip = 0.0;
-   }
-  
-   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-
-   // float x = 1.0;
-   // float y = 0.0;
-   // float z = 0.0;
-   // mat3 translateMatrix = mat3(
-   //    1.0, 0.0, 0.0 
-   //    0.0, 1.0, 0.0
-   //    -project_pos.x,    -project_pos.y,  1.0
-   // );
-   //  mat4 translateMatrix = mat4(
-   //    1.0, 0.0, 0.0, 0.0 ,
-   //    0.0, 1.0, 0.0, 0.0,
-   //    0.0, 0.0, 1.0, 0.0,
-   //    1.0, 0.0, 0.0, 1.0
-   // );
-
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));
-   } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
-   }
-
-   setPickingColor(a_PickingColor);
-}

package/lib/Geometry/shaders/plane_vert.glsl

@@ -1,53 +0,0 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
-
-uniform mat4 u_Mvp;
-uniform float u_opacity;
-uniform float u_terrainClipHeight;
-
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-attribute vec3 a_Color;
-
-varying vec3 v_Color;
-varying vec2 v_uv;
-varying float v_clip;
-
-#pragma include "projection"
-#pragma include "picking"
-void main() {
-   v_Color = a_Color;
-   v_uv = a_Uv;
-  
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-
-   v_clip = 1.0;
-   if(a_Position.z < u_terrainClipHeight) {
-      v_clip = 0.0;
-   }
-  
-   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
-
-   // float x = 1.0;
-   // float y = 0.0;
-   // float z = 0.0;
-   // mat3 translateMatrix = mat3(
-   //    1.0, 0.0, 0.0 
-   //    0.0, 1.0, 0.0
-   //    -project_pos.x,    -project_pos.y,  1.0
-   // );
-   //  mat4 translateMatrix = mat4(
-   //    1.0, 0.0, 0.0, 0.0 ,
-   //    0.0, 1.0, 0.0, 0.0,
-   //    0.0, 0.0, 1.0, 0.0,
-   //    1.0, 0.0, 0.0, 1.0
-   // );
-
-   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));
-   } else {
-      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
-   }
-
-   setPickingColor(a_PickingColor);
-}