@antv/l7-layers 2.9.27-alpha.3 → 2.9.27

package/lib/line/shaders/line_arc_3d_vert.glsl

@@ -13,9 +13,9 @@ uniform float u_global_height: 10;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
-// varying vec2 v_normal;
+
 uniform float u_line_type: 0.0;
 uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 varying vec4 v_dash_array;
@@ -135,7 +135,6 @@ void main() {
   float d_distance_ratio;
    if(u_line_type == LineTypeDash) {
     d_distance_ratio = segmentIndex / segmentNumber;
-    // float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba) / 2.0 * PI;
     vec2 s = source;
     vec2 t = target;
     
@@ -146,7 +145,7 @@ void main() {
     float total_Distance = pixelDistance(s, t) / 2.0 * PI;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
   }
   styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例

package/lib/line/shaders/line_arc_frag.glsl

@@ -11,7 +11,7 @@ varying vec4 v_dash_array;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture;
 uniform sampler2D u_texture;
@@ -34,10 +34,10 @@ void main() {
   
   gl_FragColor.a *= opacity;
 
-  if(u_aimate.x == Animate && u_line_texture != LineTexture) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate && u_line_texture != LineTexture) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       // alpha = smoothstep(0., 1., alpha);
       alpha = clamp(alpha, 0.0, 1.0);
       gl_FragColor.a *= alpha;
@@ -51,8 +51,8 @@ void main() {
     float count = styleMappingMat[3].g; // 贴图在弧线上重复的数量
 
     float time = 0.0;
-    if(u_aimate.x == Animate) {
-      time = u_time / u_aimate.y;
+    if(u_animate.x == Animate) {
+      time = u_time / u_animate.y;
     }
     float redioCount = arcRadio * count;
 
@@ -62,9 +62,9 @@ void main() {
 
     vec4 pattern = texture2D(u_texture, uv);
 
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       float currentPlane = floor(redioCount - time);
-      float textureStep = floor(count * u_aimate.z);
+      float textureStep = floor(count * u_animate.z);
       float a = mod(currentPlane, textureStep);
       if(a < textureStep - 1.0) {
         pattern = vec4(0.0);
@@ -85,5 +85,4 @@ void main() {
   } else {
      gl_FragColor = filterColor(gl_FragColor);
   }
-  // gl_FragColor = filterColor(gl_FragColor);
 }

package/lib/line/shaders/line_arc_great_circle_frag.glsl

@@ -13,7 +13,7 @@ varying float v_distance_ratio;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture: 0.0;
 uniform sampler2D u_texture;
@@ -58,10 +58,10 @@ void main() {
   }
 
   // 设置弧线的动画模式
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }
@@ -73,7 +73,7 @@ void main() {
     float count = styleMappingMat[3].b; // 贴图在弧线上重复的数量
     float u = fract(arcRadio * count - animateSpeed * count);
     // float u = fract(arcRadio * count - animateSpeed);
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       u = gl_FragColor.a/opacity;
     }
 

package/lib/line/shaders/line_arc_great_circle_vert.glsl

@@ -10,9 +10,8 @@ attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
-// varying vec2 v_normal;
 
 varying float v_distance_ratio;
 uniform float u_line_type: 0.0;
@@ -172,7 +171,7 @@ void main() {
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
   }
 
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       v_distance_ratio = segmentIndex / segmentNumber;
   }
 

package/lib/line/shaders/line_arc_vert.glsl

@@ -8,7 +8,7 @@ attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
 
 uniform float u_lineDir: 1.0;
@@ -123,7 +123,7 @@ void main() {
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
   
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
       if(u_lineDir != 1.0) {
         d_distance_ratio = 1.0 - d_distance_ratio;

package/lib/line/shaders/line_bezier_vert.glsl

@@ -7,7 +7,7 @@ attribute vec4 a_Instance;
 attribute float a_Size;
 uniform mat4 u_ModelMatrix;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 varying vec4 v_color;
 varying vec2 v_normal;
 
@@ -72,7 +72,7 @@ void main() {
       float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba) / 2.0 * PI;
       v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
     }
-  if(u_aimate.x == Animate) {
+  if(u_animate.x == Animate) {
       v_distance_ratio = segmentIndex / segmentNumber;
   }
   vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio), 0.0, 1.0));

package/lib/line/shaders/line_frag.glsl

@@ -19,7 +19,7 @@ varying vec2 v_iconMapUV;
 #pragma include "picking"
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 1, 2., 1.0, 0.2 ]; // 控制运动
+uniform vec4 u_animate: [ 1, 2., 1.0, 0.2 ]; // 控制运动
 
 varying mat4 styleMappingMat;
 // [animate, duration, interval, trailLength],
@@ -31,10 +31,10 @@ void main() {
   // anti-alias
   // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
   gl_FragColor.a *= opacity; // 全局透明度
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + animateSpeed);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }

package/lib/line/shaders/line_vert.glsl

@@ -15,7 +15,7 @@ attribute vec2 a_DistanceAndIndex;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 uniform float u_icon_step: 100;
 
 uniform float u_heightfixed: 0.0;

package/lib/line/shaders/linear/arc3d_linear_frag.glsl

@@ -6,9 +6,8 @@ uniform float u_blur : 0.9;
 varying float v_segmentIndex;
 uniform float segmentNumber;
 
-
 uniform float u_time;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_linearColor: 0;
 uniform vec4 u_sourceColor;
@@ -27,16 +26,16 @@ void main() {
 
   gl_FragColor.a *= opacity;
 
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + u_time / u_aimate.y);
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+      float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
 
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       // alpha = smoothstep(0., 1., alpha);
       alpha = clamp(alpha, 0.0, 1.0);
       gl_FragColor.a *= alpha;
 
-      // u_aimate 
+      // u_animate 
       // x enable
       // y duration
       // z interval

package/lib/line/shaders/linear/arc3d_linear_vert.glsl

@@ -6,6 +6,7 @@ attribute vec3 a_Position;
 attribute vec4 a_Instance;
 attribute vec4 a_Color;
 attribute float a_Size;
+attribute vec2 a_iconMapUV;
 
 uniform float u_globel;
 uniform float u_globel_radius;
@@ -13,23 +14,21 @@ uniform float u_global_height: 10;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float segmentNumber;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
-varying vec4 v_color;
-// varying vec2 v_normal;
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+
 uniform float u_line_type: 0.0;
 uniform vec4 u_dash_array: [10.0, 5., 0, 0];
-varying vec4 v_dash_array;
-
 uniform float u_icon_step: 100;
 uniform float u_line_texture: 0.0;
-varying float v_segmentIndex;
+uniform float u_opacity: 1.0;
 
-attribute vec2 a_iconMapUV;
+varying vec4 v_dash_array;
+varying vec4 v_color;
+varying float v_segmentIndex;
 varying vec2 v_iconMapUV;
-
-uniform float u_opacity: 1.0;
 varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
+
 #pragma include "styleMapping"
 #pragma include "styleMappingCalOpacity"
 
@@ -146,7 +145,7 @@ void main() {
     float total_Distance = pixelDistance(s, t) / 2.0 * PI;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
-    if(u_aimate.x == Animate) {
+    if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
   }
   styleMappingMat[3].g = d_distance_ratio; // 当前点位距离占线总长的比例

package/lib/line/shaders/linear/arc_linear_frag.glsl

@@ -10,7 +10,7 @@ varying vec4 v_dash_array;
 varying vec4 v_color;
 
 uniform float u_time;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 
 uniform float u_line_texture;
 uniform sampler2D u_texture;

package/lib/line/shaders/wall/wall_frag.glsl

@@ -12,7 +12,7 @@ uniform float u_opacity : 1.0;
 uniform float u_textureBlend;
 uniform float u_iconStepCount;
 uniform float u_time;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
 
 varying vec2 v_iconMapUV;
 varying float v_blur;
@@ -35,10 +35,10 @@ void main() {
   }
 
   gl_FragColor.a *= opacity; // 全局透明度
-  if(u_aimate.x == Animate) {
-      animateSpeed = u_time / u_aimate.y;
-       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_aimate.z)* (1.0/ u_aimate.z) + animateSpeed);
-      alpha = (alpha + u_aimate.w -1.0) / u_aimate.w;
+  if(u_animate.x == Animate) {
+      animateSpeed = u_time / u_animate.y;
+       float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);
+      alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
       gl_FragColor.a *= alpha;
   }

package/lib/line/shaders/wall/wall_vert.glsl

@@ -11,7 +11,7 @@ attribute float a_Distance;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 1., 2., 1.0, 0.2 ];
+uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
 uniform float u_icon_step: 100;
 uniform float u_heightfixed;
 uniform float u_linearColor: 0;
@@ -43,7 +43,7 @@ void main() {
     d_texPixelLen *= 10.0;
   }
 
-  if(u_aimate.x == Animate || u_linearColor == 1.0) {
+  if(u_animate.x == Animate || u_linearColor == 1.0) {
       d_distance_ratio = a_Distance / a_Total_Distance;
   }
 

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -29,8 +29,8 @@ var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
     value: function apply(layer) {
       layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', function () {
         // @ts-ignore
-        var aniamateStatus = layer.aniamateStatus;
-        aniamateStatus && layer.models.forEach(function (model) {
+        var animateStatus = layer.animateStatus;
+        animateStatus && layer.models.forEach(function (model) {
           model.addUniforms((0, _objectSpread2.default)({}, layer.layerModel.getAnimateUniforms()));
         });
       });

package/lib/point/index.js

@@ -170,7 +170,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         text: {
           blend: 'normal'
         },
-        vectorpoint: {},
+        vectorPoint: {},
         tile: {},
         tileText: {},
         earthFill: {},
@@ -184,9 +184,8 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
       var parserType = this.layerSource.getParserType();
 
       if ((0, _utils.isVectorTile)(parserType)) {
-        return 'vectorpoint';
-      } // pointlayer
-      //  2D、 3d、 shape、image、text、normal、
+        return 'vectorPoint';
+      } //  2D、 3d、 shape、image、text、normal、
 
 
       var layerData = this.getEncodedData();

package/lib/point/models/earthExtrude.js

@@ -59,7 +59,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseCount", 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiserepeat", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseRepeat", 0);
     return _this;
   }
 
@@ -133,18 +133,16 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
 
-      if (this.raiseCount < 1 && this.raiserepeat > 0) {
+      if (this.raiseCount < 1 && this.raiseRepeat > 0) {
         if (animateOption.enable) {
           var _animateOption$speed = animateOption.speed,
-              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed,
-              _animateOption$repeat = animateOption.repeat,
-              repeat = _animateOption$repeat === void 0 ? false : _animateOption$repeat;
+              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
           this.raiseCount += speed;
 
           if (this.raiseCount >= 1) {
-            if (this.raiserepeat > 1) {
+            if (this.raiseRepeat > 1) {
               this.raiseCount = 0;
-              this.raiserepeat--;
+              this.raiseRepeat--;
             } else {
               this.raiseCount = 1;
             }
@@ -157,7 +155,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         u_pickLight: Number(pickLight),
         // 圆柱体是否固定高度
         u_heightfixed: Number(heightfixed),
-        u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,
+        u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
         u_dataTexture: this.dataTexture,
         // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
         u_cellTypeLayout: this.getCellTypeLayout(),
@@ -186,7 +184,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           _ref2$animateOption$r = _ref2.animateOption.repeat,
           repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
 
-      this.raiserepeat = repeat;
+      this.raiseRepeat = repeat;
       this.layer.buildLayerModel({
         moduleName: 'pointEarthExtrude',
         vertexShader: pointExtrudeVert,
@@ -217,20 +215,18 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var size = feature.size;
 
             if (size) {
@@ -275,13 +271,12 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Pos',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
+          update: function update(feature) {
             var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
             return (0, _utils.lglt2xyz)([coordinates[0], coordinates[1]]);
           }

package/lib/point/models/earthFill.js

@@ -39,7 +39,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var pointFillFrag = "uniform float u_additive;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n  float stroke_opacity = styleMappingMat[0][1];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  if(outer_df > antialiasblur + 0.018) discard;\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/earth/fill_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // TODO: billboard\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1, 1.0);\n\n  setPickingColor(a_PickingColor);\n}\n";
+var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1, 1.0);\n\n  setPickingColor(a_PickingColor);\n}\n";
 
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
@@ -133,7 +133,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
       } : _ref2$animateOption;
 
       return {
-        u_aimate: this.animateOption2Array(animateOption),
+        u_animate: this.animateOption2Array(animateOption),
         u_time: this.layer.getLayerAnimateTime()
       };
     }

package/lib/point/models/extrude.js

@@ -61,7 +61,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseCount", 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiserepeat", 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "raiseRepeat", 0);
     return _this;
   }
 
@@ -135,18 +135,16 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         useLinearColor = 1;
       }
 
-      if (this.raiseCount < 1 && this.raiserepeat > 0) {
+      if (this.raiseCount < 1 && this.raiseRepeat > 0) {
         if (animateOption.enable) {
           var _animateOption$speed = animateOption.speed,
-              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed,
-              _animateOption$repeat = animateOption.repeat,
-              repeat = _animateOption$repeat === void 0 ? false : _animateOption$repeat;
+              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
           this.raiseCount += speed;
 
           if (this.raiseCount >= 1) {
-            if (this.raiserepeat > 1) {
+            if (this.raiseRepeat > 1) {
               this.raiseCount = 0;
-              this.raiserepeat--;
+              this.raiseRepeat--;
             } else {
               this.raiseCount = 1;
             }
@@ -159,7 +157,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         u_pickLight: Number(pickLight),
         // 圆柱体是否固定高度
         u_heightfixed: Number(heightfixed),
-        u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,
+        u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
         u_dataTexture: this.dataTexture,
         // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
         u_cellTypeLayout: this.getCellTypeLayout(),
@@ -192,7 +190,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 // GAODE1.x GAODE2.x MAPBOX
                 _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
-                this.raiserepeat = repeat;
+                this.raiseRepeat = repeat;
                 this.layer.buildLayerModel({
                   moduleName: 'pointExtrude',
                   vertexShader: pointExtrudeVert,
@@ -244,13 +242,12 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Size',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var size = feature.size;
 
             if (size) {
@@ -301,7 +298,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.gl.FLOAT
           },
           size: 3,
-          update: function update(feature, featureIdx) {
+          update: function update(feature) {
             var coordinates = (0, _l7Utils.calculateCentroid)(feature.coordinates);
             return [coordinates[0], coordinates[1], 0];
           }