@antv/l7-layers 2.18.0 → 2.19.0

package/lib/point/shaders/{simplePoint_vert.glsl → billboard_point_vert.glsl}

@@ -1,7 +1,7 @@
 
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 attribute float a_Size;
 attribute vec4 a_Color;
 varying vec4 v_color;
@@ -31,7 +31,7 @@ void main() {
     vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);
     gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy+offset),project_pos.z,project_pos.w));
   }
-
+  
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
   setPickingColor(a_PickingColor);
 }

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

@@ -15,7 +15,7 @@ uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_globel;
 uniform float u_r;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 varying vec4 v_color;
 
 uniform float u_opacity : 1;

package/lib/point/shaders/earth/fill_vert.glsl

@@ -4,7 +4,7 @@ attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute float a_Shape;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 
 varying vec4 v_data;
 varying vec4 v_color;

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

@@ -14,7 +14,7 @@ attribute vec3 a_Normal;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_r;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 varying vec4 v_color;
 varying float v_lightWeight;
 varying float v_barLinearZ;
@@ -103,11 +103,7 @@ void main() {
 
   // gl_Position = project_common_position_to_clipspace(pos);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * pos;
-  } else {
-    gl_Position = project_common_position_to_clipspace(pos);
-  }
+  gl_Position = project_common_position_to_clipspace_v2(pos);
 
   setPickingColor(a_PickingColor);
 }

package/lib/point/shaders/fill_vert.glsl

@@ -3,28 +3,26 @@ attribute vec3 a_Position;
 attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute float a_Shape;
-
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform int u_size_unit;
 
 varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
 varying vec4 v_stroke;
-
-// uniform float u_opacity : 1;
 uniform float u_stroke_width: 2;
 uniform vec3 u_blur_height_fixed: [0, 0, 0];
 
 
 #pragma include "projection"
 #pragma include "picking"
+#pragma include "rotation_2d"
 
 
 void main() {
   // 透明度计算
-  v_stroke = stroke;  
+   v_stroke = stroke;  
   vec3 extrude = a_Extrude;
   float shape_type = a_Shape;
   /*
@@ -53,6 +51,7 @@ void main() {
   vec3 aPosition = a_Position;
 
   offset = project_pixel(offset);
+  offset = rotate_matrix(offset,rotation);
   
   // TODP: /abs(extrude.x) 是为了兼容地球模式
   v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
@@ -72,15 +71,8 @@ void main() {
       raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;
     }
   }
- 
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position =  u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
-  }
- 
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
+  
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/lib/point/shaders/image/fillImage_frag.glsl

@@ -6,12 +6,13 @@ uniform float u_opacity : 1;
 #pragma include "picking"
 varying vec2 v_uv; // 本身的 uv 坐标
 varying vec2 v_Iconuv;
+varying float v_opacity;
 
 void main() {
 
   vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;
   gl_FragColor = texture2D(u_texture, pos);
-  gl_FragColor.a *= u_opacity;
+  gl_FragColor.a *= v_opacity;
 
   gl_FragColor = filterColor(gl_FragColor);
 }

package/lib/point/shaders/image/fillImage_vert.glsl

@@ -3,10 +3,9 @@ attribute vec3 a_Position;
 attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute vec2 a_Uv;
-attribute float a_Rotate;
 
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform mat2 u_RotateMatrix;
 uniform int u_size_unit;
 
@@ -15,31 +14,30 @@ varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
 
 uniform float u_raisingHeight: 0.0;
 uniform float u_heightfixed: 0.0;
-uniform float u_opacity : 1;
-uniform vec2 u_offsets;
-
+varying float v_opacity;
+// uniform vec2 u_offsets; // shader 注入
 
 
 #pragma include "projection"
 #pragma include "picking"
+#pragma include "rotation_2d"
 
 void main() {
   vec3 extrude = a_Extrude;
   v_uv = (a_Extrude.xy + 1.0)/2.0;
   v_uv.y = 1.0 - v_uv.y;
   v_Iconuv = a_Uv;
-
-
-  highp float angle_sin = sin(a_Rotate);
-  highp float angle_cos = cos(a_Rotate);
-  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
+  v_opacity = opacity;
   float newSize = a_Size;
   if(u_size_unit == 1) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
-
+  
   // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
-  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + u_offsets);
+  vec2 offset = (extrude.xy * (newSize) + offsets);
+
+  offset = rotate_matrix(offset,rotation);
+
   vec3 aPosition = a_Position;
 
   offset = project_pixel(offset);
@@ -55,13 +53,7 @@ void main() {
     }
   }
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp *vec4(project_pos.xy + offset, raisingHeight, 1.0);
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
-  }
- 
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, 0.0, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/lib/point/shaders/image_frag.glsl

@@ -2,8 +2,8 @@
 uniform sampler2D u_texture;
 varying vec4 v_color;
 varying vec2 v_uv;
+varying float v_opacity;
 uniform vec2 u_textSize;
-uniform float u_opacity : 1;
 
 #pragma include "picking"
 
@@ -29,9 +29,7 @@ void main(){
       }else {
             gl_FragColor= step(0.01, textureColor.z) * v_color;
       }
-
-      gl_FragColor.a = gl_FragColor.a * u_opacity;
-      
+      gl_FragColor.a *= v_opacity;
       if (gl_FragColor.a < 0.01) {
          discard;
       }

package/lib/point/shaders/image_vert.glsl

@@ -5,15 +5,13 @@ 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 mat4 u_Mvp;
-uniform vec2 u_offsets;
 
-uniform float u_opacity : 1;
+
 uniform float u_raisingHeight: 0.0;
 uniform float u_heightfixed: 0.0;
 
-
 #pragma include "projection"
 #pragma include "picking"
 
@@ -21,10 +19,11 @@ void main() {
 
   // cal style mapping - 数据纹理映射部分的计算
   v_color = a_Color;
+  v_opacity = opacity;
   v_uv = a_Uv;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
    
-  vec2 offset = project_pixel(u_offsets);
+  vec2 offset = project_pixel(offsets);
 
   float raisingHeight = u_raisingHeight;
   if(u_heightfixed < 1.0) { // false
@@ -36,11 +35,8 @@ void main() {
     }
   }
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
-  }
+
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));
 
   gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
   setPickingColor(a_PickingColor);

package/lib/point/shaders/normal_vert.glsl

@@ -1,8 +1,7 @@
 
 attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
-uniform float u_opacity : 1;
-uniform mat4 u_Mvp;
+
 attribute float a_Size;
 attribute vec4 a_Color;
 
@@ -12,7 +11,7 @@ varying vec4 v_color;
 #pragma include "project"
 
 void main() {
-  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity);
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);

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

@@ -35,12 +35,6 @@ void main() {
   vec2 dir = normalize(extrude);
   vec2 baseDir = vec2(1.0, 0.0);
   float pi = 3.14159265359;
-  // full circle
-  // float rades = dot(dir, baseDir);
-  // float flag = sign(dir.y);
-  // float radar_v = (flag - 1.0) * -0.5 + flag * acos(rades)/pi/2.0;
-  
-  // half circle
   float flag = sign(dir.y);
   float rades = dot(dir, baseDir);
   float radar_v = (flag - 1.0) * -0.5 * acos(rades)/pi;

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

@@ -6,7 +6,7 @@ uniform float u_speed: 1.0;
 uniform float u_time;
 
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform int u_size_unit;
 
 varying vec4 v_data;
@@ -31,8 +31,6 @@ void main() {
   // unpack color(vec2)
   v_color = a_Color;
 
-
-
   // anti-alias
   float blur = 0.0;
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);
@@ -52,12 +50,7 @@ void main() {
   v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);
 
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp *vec4(project_pos.xy + offset, 0.0, 1.0);
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/lib/point/shaders/text_vert.glsl

@@ -6,11 +6,10 @@ attribute vec2 a_tex;
 attribute vec2 a_textOffsets;
 attribute vec4 a_Color;
 attribute float a_Size;
-attribute float a_Rotate;
 
 uniform vec2 u_sdf_map_size;
 uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
+
 uniform float u_raisingHeight: 0.0;
 
 varying vec2 v_uv;
@@ -18,13 +17,14 @@ varying float v_gamma_scale;
 varying vec4 v_color;
 varying vec4 v_stroke_color;
 varying float v_fontScale;
-// uniform float u_opacity : 1;
 uniform float u_stroke_width : 2;
 uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
 
 
+
 #pragma include "projection"
 #pragma include "picking"
+#pragma include "rotation_2d"
 
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
@@ -43,9 +43,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));
 
-  highp float angle_sin = sin(a_Rotate);
-  highp float angle_cos = cos(a_Rotate);
-  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
+  vec2 offset = rotate_matrix(a_textOffsets,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);
 
@@ -55,15 +53,10 @@ void main() {
     raiseHeight = u_raisingHeight * mapboxZoomScale;
   }
 
-  vec4 projected_position;
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-   projected_position  = u_Mvp *(vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
-  } else { // else
-   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
-  }
+  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
 
   gl_Position = vec4(
-    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
+    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
   v_gamma_scale = gl_Position.w;
   setPickingColor(a_PickingColor);
 

package/lib/polygon/index.js

@@ -29,7 +29,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'PolygonLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase']);
     return _this;
   }
   (0, _createClass2.default)(PolygonLayer, [{
@@ -65,6 +65,8 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
         return 'fill';
       } else if (shape === 'extrude') {
         return 'extrude';
+      } else if (shape === 'extrusion') {
+        return 'extrusion';
       } else if (shape === 'water') {
         return 'water';
       } else if (shape === 'ocean') {

package/lib/polygon/models/extrude.js

@@ -23,15 +23,15 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_frag.glsl' */
 var polygonExtrudeFrag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\n\n#pragma include \"picking\"\n\nvoid main() {\n\n\n     // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n\n    gl_FragColor = v_Color;\n  \n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_vert.glsl' */
-var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  float isSide = a_Position.z;\n float topU = a_uvs[0];\n float topV = 1.0 - a_uvs[1];\n float sidey = a_uvs[2];\n\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  float lightWeight = calc_lighting(pos);\n\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    // if(u_sidesurface < 1.0) {\n    //   discard;\n    // }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      v_Color = linearColor;\n    } else {\n      v_Color = a_Color;\n    }\n\n  } else {\n    v_Color = a_Color;\n  }\n\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n\n  setPickingColor(a_PickingColor);\n}\n"; // extrude
+var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\n\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  float isSide = a_Position.z;\n float topU = a_uvs[0];\n float topV = 1.0 - a_uvs[1];\n float sidey = a_uvs[2];\n\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  float lightWeight = calc_lighting(pos);\n\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n\n gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    // if(u_sidesurface < 1.0) {\n    //   discard;\n    // }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      v_Color = linearColor;\n    } else {\n      v_Color = a_Color;\n    }\n\n  } else {\n    v_Color = a_Color;\n  }\n\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n\n  setPickingColor(a_PickingColor);\n}\n"; // extrude
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrudetex_frag.glsl' */
 var polygonExtrudeTexFrag = "uniform sampler2D u_texture;\nuniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying vec3 v_uvs;\nvarying vec2 v_texture_data;\n\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = u_opacity;\n  float isSide = v_texture_data.x;\n  float lightWeight = v_texture_data.y;\n  float topU = v_uvs[0];\n  float topV = 1.0 - v_uvs[1];\n  float sidey = v_uvs[2];\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {// \u662F\u5426\u662F\u8FB9\u7F18\n    // side face\n    if(u_sidesurface < 1.0) {\n      discard;\n    }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      gl_FragColor = linearColor;\n    } else {\n      gl_FragColor = v_Color;\n    }\n  } else {\n\n     // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n\n    gl_FragColor = texture2D(u_texture, vec2(topU, topV));\n    // gl_FragColor = vec4(1.0, 0., 0., 1.0);\n  }\n  \n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n"; // texture
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrudetex_vert.glsl' */
-var polygonExtrudeTexVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform sampler2D u_texture;\n\n\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_linearColor: 0.0;\n\nvarying vec2 v_texture_data;\nvarying vec3 v_uvs;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  v_uvs = a_uvs;\n\n  v_texture_data = vec2(a_Position.z, lightWeight);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n\n\n\n  setPickingColor(a_PickingColor);\n}\n"; // extrude picking
+var polygonExtrudeTexVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\n\nuniform sampler2D u_texture;\n\n\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_linearColor: 0.0;\n\nvarying vec2 v_texture_data;\nvarying vec3 v_uvs;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  v_uvs = a_uvs;\n\n  v_texture_data = vec2(a_Position.z, lightWeight);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n\n\n  setPickingColor(a_PickingColor);\n}\n"; // extrude picking
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_picklight_frag.glsl' */
 var polygonExtrudePickLightFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying vec3 v_uvs;\nvarying vec2 v_texture_data;\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = u_opacity;\n  float isSide =  v_texture_data.x;\n  float sidey = v_uvs[2];\n  float lightWeight = v_texture_data.y;\n\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    if(u_sidesurface < 1.0) {\n      discard;\n    }\n    \n    if( u_linearColor == 1.0) {\n      // side use linear\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      gl_FragColor = linearColor;\n    } else {\n      // side notuse linear\n       gl_FragColor = v_Color;\n    }\n  } else {\n    // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n    gl_FragColor = v_Color;\n  }\n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);\n}\n";
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_picklight_vert.glsl' */
-var polygonExtrudePickLightVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_texture_data;\nvarying vec3 v_uvs;\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n\n\n  v_uvs = a_uvs;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  v_texture_data = vec2(a_Position.z,lightWeight);\n\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
+var polygonExtrudePickLightVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_texture_data;\nvarying vec3 v_uvs;\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n\n\n  v_uvs = a_uvs;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n  float lightWeight = calc_lighting(pos);\n  v_texture_data = vec2(a_Position.z,lightWeight);\n\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
 var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrudeModel, _BaseModel);
   var _super = _createSuper(ExtrudeModel);

package/lib/polygon/models/extrusion.js

@@ -0,0 +1,144 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _l7Core = require("@antv/l7-core");
+var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _triangulation = require("../../core/triangulation");
+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/extrusion/polygon_extrusion_frag.glsl' */
+var polygonExtrudeFrag = "\nuniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying vec2 v_texture_data;\n\n\n#pragma include \"picking\"\n\nvoid main() {\n\n  gl_FragColor = v_Color;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/extrusion/polygon_extrusion_vert.glsl' */
+var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\n\n\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  // project_pos.z += extrusionBase * 2.0;\n  v_Color = a_Color;\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+var ExtrusionModel = /*#__PURE__*/function (_BaseModel) {
+  (0, _inherits2.default)(ExtrusionModel, _BaseModel);
+  var _super = _createSuper(ExtrusionModel);
+  function ExtrusionModel() {
+    (0, _classCallCheck2.default)(this, ExtrusionModel);
+    return _super.apply(this, arguments);
+  }
+  (0, _createClass2.default)(ExtrusionModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      return (0, _objectSpread2.default)({}, this.getStyleAttribute());
+    }
+  }, {
+    key: "initModels",
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              return _context.abrupt("return", this.buildModels());
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+      return initModels;
+    }()
+  }, {
+    key: "buildModels",
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _this$getShaders, frag, vert, type, model;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+              _context2.next = 3;
+              return this.layer.buildLayerModel({
+                moduleName: type,
+                vertexShader: vert,
+                fragmentShader: frag,
+                inject: this.getInject(),
+                triangulation: _triangulation.PolygonExtrudeTriangulation
+              });
+            case 3:
+              model = _context2.sent;
+              return _context2.abrupt("return", [model]);
+            case 5:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+      return buildModels;
+    }()
+  }, {
+    key: "getShaders",
+    value: function getShaders() {
+      return {
+        frag: polygonExtrudeFrag,
+        vert: polygonExtrudeVert,
+        type: 'polygonExtrude'
+      };
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$texture;
+      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'normal',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Normal',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: _l7Core.gl.STATIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
+            return normal;
+          }
+        }
+      });
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'size',
+        type: _l7Core.AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Size',
+          buffer: {
+            usage: _l7Core.gl.DYNAMIC_DRAW,
+            data: [],
+            type: _l7Core.gl.FLOAT
+          },
+          size: 1,
+          update: function update(feature) {
+            var _feature$size = feature.size,
+              size = _feature$size === void 0 ? 10 : _feature$size;
+            return Array.isArray(size) ? [size[0]] : [size];
+          }
+        }
+      });
+    }
+  }]);
+  return ExtrusionModel;
+}(_BaseModel2.default);
+exports.default = ExtrusionModel;

package/lib/polygon/models/fill.js

@@ -24,9 +24,9 @@ var polygon_frag = "varying vec4 v_color;\n#pragma include \"picking\"\n\nvoid m
 /* babel-plugin-inline-import '../shaders/polygon_linear_frag.glsl' */
 var polygon_linear_frag = "#pragma include \"picking\"\nuniform float u_opacitylinear: 0.0;\nuniform float u_dir: 1.0;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\nvarying vec4 v_Color;\n\n\nvoid main() {\n   gl_FragColor = v_Color;\n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;\n  }\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/polygon_linear_vert.glsl' */
-var polygon_linear_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nuniform float u_opacitylinear: 0.0;\n\nattribute vec3 a_linear;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\nvoid main() {\n  if(u_opacitylinear > 0.0) {\n    v_linear = a_linear;\n    v_pos = a_Position.xy;\n  }\n  v_Color = vec4(a_Color.xyz, a_Color.w * opacity);\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}";
+var polygon_linear_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\n\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nuniform float u_opacitylinear: 0.0;\n\nattribute vec3 a_linear;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\nvoid main() {\n  if(u_opacitylinear > 0.0) {\n    v_linear = a_linear;\n    v_pos = a_Position.xy;\n  }\n  v_Color = vec4(a_Color.xyz, a_Color.w * opacity);\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n  setPickingColor(a_PickingColor);\n}";
 /* babel-plugin-inline-import '../shaders/polygon_vert.glsl' */
-var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n\n";
+var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n\n";
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
   var _super = _createSuper(FillModel);

package/lib/polygon/models/index.js

@@ -12,6 +12,7 @@ var _image = _interopRequireDefault(require("../../point/models/image"));
 var _normal = _interopRequireDefault(require("../../point/models/normal"));
 var _text = _interopRequireDefault(require("../../point/models/text"));
 var _extrude2 = _interopRequireDefault(require("./extrude"));
+var _extrusion = _interopRequireDefault(require("./extrusion"));
 var _fill2 = _interopRequireDefault(require("./fill"));
 var _ocean = _interopRequireDefault(require("./ocean"));
 var _water = _interopRequireDefault(require("./water"));
@@ -25,7 +26,8 @@ var PolygonModels = {
   point_normal: _normal.default,
   point_extrude: _extrude.default,
   water: _water.default,
-  ocean: _ocean.default
+  ocean: _ocean.default,
+  extrusion: _extrusion.default
   // point_fill: PointModels.fill,
 };
 var _default = PolygonModels;