@antv/l7-layers 2.17.4 → 2.17.6

package/es/utils/stencil.js

@@ -1,5 +1,5 @@
-import { gl, MaskOperation, StencilType } from '@antv/l7-core'; // 掩膜配置
-
+import { gl, MaskOperation, StencilType } from '@antv/l7-core';
+// 掩膜配置
 export function getStencil(mask, maskInside) {
   return {
     enable: mask,
@@ -30,7 +30,6 @@ export function getStencilMask(option) {
       }
     };
   }
-
   return {
     enable: true,
     mask: 0xff,

package/es/utils/symbol-layout.js

@@ -1,9 +1,6 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 /**
  * 返回文本相对锚点位置
  * @param {string} anchor 锚点位置
@@ -12,76 +9,64 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function getAnchorAlignment(anchor) {
   var horizontalAlign = 0.5;
   var verticalAlign = 0.5;
-
   switch (anchor) {
     case 'right':
     case 'top-right':
     case 'bottom-right':
       horizontalAlign = 1;
       break;
-
     case 'left':
     case 'top-left':
     case 'bottom-left':
       horizontalAlign = 0;
       break;
-
     default:
       horizontalAlign = 0.5;
   }
-
   switch (anchor) {
     case 'bottom':
     case 'bottom-right':
     case 'bottom-left':
       verticalAlign = 1;
       break;
-
     case 'top':
     case 'top-right':
     case 'top-left':
       verticalAlign = 0;
       break;
-
     default:
       verticalAlign = 0.5;
   }
-
   return {
     horizontalAlign: horizontalAlign,
     verticalAlign: verticalAlign
   };
-} // justify right = 1, left = 0, center = 0.5
-
+}
 
+// justify right = 1, left = 0, center = 0.5
 function justifyLine(positionedGlyphs, glyphMap, start, end, justify) {
   if (!justify) {
     return;
   }
-
   var lastPositionedGlyph = positionedGlyphs[end];
   var glyph = lastPositionedGlyph.glyph;
-
   if (glyph) {
     var lastAdvance = glyphMap[glyph].advance * lastPositionedGlyph.scale;
     var lineIndent = (positionedGlyphs[end].x + lastAdvance) * justify;
-
     for (var j = start; j <= end; j++) {
       positionedGlyphs[j].x -= lineIndent;
     }
   }
-} // justify right=1 left=0 center=0.5
+}
+
+// justify right=1 left=0 center=0.5
 // horizontalAlign right=1 left=0 center=0.5
 // verticalAlign right=1 left=0 center=0.5
-
-
 function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lineCount) {
   var shiftX = (justify - horizontalAlign) * maxLineLength;
   var shiftY = (-verticalAlign * lineCount + 0.5) * lineHeight;
-
   var _iterator = _createForOfIteratorHelper(positionedGlyphs),
-      _step;
-
+    _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var glyphs = _step.value;
@@ -94,7 +79,6 @@ function align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLin
     _iterator.f();
   }
 }
-
 function shapeLines(shaping, glyphMap, lines, lineHeight, textAnchor, textJustify, spacing) {
   // buffer 为 4
   var yOffset = -8;
@@ -108,7 +92,6 @@ function shapeLines(shaping, glyphMap, lines, lineHeight, textAnchor, textJustif
     line.split('').forEach(function (char) {
       var glyph = glyphMap[char];
       var baselineOffset = 0;
-
       if (glyph) {
         positionedGlyphs.push({
           glyph: char,
@@ -121,31 +104,29 @@ function shapeLines(shaping, glyphMap, lines, lineHeight, textAnchor, textJustif
         });
         x += glyph.advance + spacing;
       }
-    }); // 左右对齐
+    });
 
+    // 左右对齐
     if (positionedGlyphs.length !== lineStartIndex) {
       var lineLength = x - spacing;
       maxLineLength = Math.max(lineLength, maxLineLength);
       justifyLine(positionedGlyphs, glyphMap, lineStartIndex, positionedGlyphs.length - 1, justify);
     }
-
     x = 0;
     y -= lineHeight + 5;
   });
-
   var _getAnchorAlignment = getAnchorAlignment(textAnchor),
-      horizontalAlign = _getAnchorAlignment.horizontalAlign,
-      verticalAlign = _getAnchorAlignment.verticalAlign;
-
-  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lines.length); // 计算包围盒
+    horizontalAlign = _getAnchorAlignment.horizontalAlign,
+    verticalAlign = _getAnchorAlignment.verticalAlign;
+  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, lines.length);
 
+  // 计算包围盒
   var height = y - yOffset;
   shaping.top += -verticalAlign * height;
   shaping.bottom = shaping.top - height;
   shaping.left += -horizontalAlign * maxLineLength;
   shaping.right = shaping.left + maxLineLength;
 }
-
 function shapeIconFont(shaping, glyphMap, iconfonts, lineHeight, textAnchor, textJustify, spacing) {
   // buffer 为 4
   var yOffset = -8;
@@ -158,12 +139,10 @@ function shapeIconFont(shaping, glyphMap, iconfonts, lineHeight, textAnchor, tex
   iconfonts.forEach(function (iconfont) {
     var glyph = glyphMap[iconfont];
     var baselineOffset = 0;
-
     if (glyph) {
       positionedGlyphs.push({
         glyph: iconfont,
         // x,
-
         /**
          * iconfont
          * 在计算大小的时候计算的是 unicode 字符 如 &#xe6d4;
@@ -177,31 +156,30 @@ function shapeIconFont(shaping, glyphMap, iconfonts, lineHeight, textAnchor, tex
         metrics: glyph
       });
       x += glyph.advance + spacing;
-    } // 左右对齐
-
+    }
 
+    // 左右对齐
     if (positionedGlyphs.length !== lineStartIndex) {
       var lineLength = x - spacing;
       maxLineLength = Math.max(lineLength, maxLineLength);
       justifyLine(positionedGlyphs, glyphMap, lineStartIndex, positionedGlyphs.length - 1, justify);
     }
-
     x = 0;
     y -= lineHeight + 5;
   });
-
   var _getAnchorAlignment2 = getAnchorAlignment(textAnchor),
-      horizontalAlign = _getAnchorAlignment2.horizontalAlign,
-      verticalAlign = _getAnchorAlignment2.verticalAlign;
-
-  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, iconfonts.length); // 计算包围盒
+    horizontalAlign = _getAnchorAlignment2.horizontalAlign,
+    verticalAlign = _getAnchorAlignment2.verticalAlign;
+  align(positionedGlyphs, justify, horizontalAlign, verticalAlign, maxLineLength, lineHeight, iconfonts.length);
 
+  // 计算包围盒
   var height = y - yOffset;
   shaping.top += -verticalAlign * height;
   shaping.bottom = shaping.top - height;
   shaping.left += -horizontalAlign * maxLineLength;
   shaping.right = shaping.left + maxLineLength;
 }
+
 /**
  * 计算文本中每个独立字符相对锚点的位置
  *
@@ -215,8 +193,6 @@ function shapeIconFont(shaping, glyphMap, iconfonts, lineHeight, textAnchor, tex
  * @param {[boolean]} isIconFont 是否是 iconfont
  * @return {boolean|shaping} 每个字符相对于锚点的位置
  */
-
-
 export function shapeText(text, glyphs, lineHeight, textAnchor, textJustify, spacing) {
   var translate = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [0, 0];
   var isIconFont = arguments.length > 7 ? arguments[7] : undefined;
@@ -233,28 +209,25 @@ export function shapeText(text, glyphs, lineHeight, textAnchor, textJustify, spa
     text: text
   };
   isIconFont ? shapeIconFont(shaping, glyphs, lines, lineHeight, textAnchor, textJustify, spacing) : shapeLines(shaping, glyphs, lines, lineHeight, textAnchor, textJustify, spacing);
-
   if (!positionedGlyphs.length) {
     return false;
   }
-
   return shaping;
 }
 export function getGlyphQuads(shaping) {
   var textOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [0, 0];
   var alongLine = arguments.length > 2 ? arguments[2] : undefined;
   var _shaping$positionedGl = shaping.positionedGlyphs,
-      positionedGlyphs = _shaping$positionedGl === void 0 ? [] : _shaping$positionedGl;
+    positionedGlyphs = _shaping$positionedGl === void 0 ? [] : _shaping$positionedGl;
   var quads = [];
-
   var _iterator2 = _createForOfIteratorHelper(positionedGlyphs),
-      _step2;
-
+    _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var positionedGlyph = _step2.value;
-      var rect = positionedGlyph.metrics; // The rects have an addditional buffer that is not included in their size.
+      var rect = positionedGlyph.metrics;
 
+      // The rects have an addditional buffer that is not included in their size.
       var rectBuffer = 4;
       var halfAdvance = rect.advance * positionedGlyph.scale / 2;
       var glyphOffset = alongLine ? [positionedGlyph.x + halfAdvance, positionedGlyph.y] : [0, 0];
@@ -278,7 +251,9 @@ export function getGlyphQuads(shaping) {
       var br = {
         x: x2,
         y: y2
-      }; // TODO：处理字符旋转的情况
+      };
+
+      // TODO：处理字符旋转的情况
 
       quads.push({
         tl: tl,
@@ -294,6 +269,5 @@ export function getGlyphQuads(shaping) {
   } finally {
     _iterator2.f();
   }
-
   return quads;
 }

package/es/wind/index.js

@@ -7,68 +7,50 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 import BaseLayer from "../core/BaseLayer";
 import WindModels from "./models";
-
 var WindLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(WindLayer, _BaseLayer);
-
   var _super = _createSuper(WindLayer);
-
   function WindLayer() {
     var _this;
-
     _classCallCheck(this, WindLayer);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
-
     _defineProperty(_assertThisInitialized(_this), "type", 'WindLayer');
-
     return _this;
   }
-
   _createClass(WindLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var modelType;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new WindModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              modelType = this.getModelType();
+              this.layerModel = new WindModels[modelType](this);
+              _context.next = 4;
+              return this.initLayerModels();
+            case 4:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
     key: "renderModels",
     value: function renderModels() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
       if (this.layerModel) {
         this.layerModel.render(options); // 独立的渲染流程
       }
@@ -90,8 +72,6 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       return 'wind';
     }
   }]);
-
   return WindLayer;
 }(BaseLayer);
-
 export { WindLayer as default };

package/es/wind/models/utils.js

@@ -1,30 +1,26 @@
 export function createProgram(gl, vshader, fshader) {
   // Create shader object
   var vertexShader = loadShader(gl, gl.VERTEX_SHADER, vshader); // 创建顶点着色器对象
-
   var fragmentShader = loadShader(gl, gl.FRAGMENT_SHADER, fshader); // 创建片元着色器对象
-
   if (!vertexShader || !fragmentShader) {
     return null;
-  } // Create a program object
-
+  }
 
+  // Create a program object
   var program = gl.createProgram(); // 创建程序对象
-
   if (!program) {
     return null;
-  } // Attach the shader objects
-
+  }
 
+  // Attach the shader objects
   gl.attachShader(program, vertexShader); // 绑定着色器对象
+  gl.attachShader(program, fragmentShader);
 
-  gl.attachShader(program, fragmentShader); // Link the program object
-
+  // Link the program object
   gl.linkProgram(program); // 链接着色器对象
-  // Check the result of linking
 
+  // Check the result of linking
   var linked = gl.getProgramParameter(program, gl.LINK_STATUS); // 判断着色器对象是否链接成功
-
   if (!linked) {
     var error = gl.getProgramInfoLog(program);
     console.warn('Failed to link program: ' + error);
@@ -33,55 +29,48 @@ export function createProgram(gl, vshader, fshader) {
     gl.deleteShader(vertexShader);
     return null;
   }
-
   var numAttributes = gl.getProgramParameter(program, gl.ACTIVE_ATTRIBUTES);
-
   for (var i = 0; i < numAttributes; i++) {
-    var attribute = gl.getActiveAttrib(program, i); // @ts-ignore
-
+    var attribute = gl.getActiveAttrib(program, i);
+    // @ts-ignore
     program[attribute.name] = gl.getAttribLocation(program, attribute.name);
   }
-
   var numUniforms = gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS);
-
   for (var i$1 = 0; i$1 < numUniforms; i$1++) {
-    var uniform = gl.getActiveUniform(program, i$1); // @ts-ignore
-
+    var uniform = gl.getActiveUniform(program, i$1);
+    // @ts-ignore
     program[uniform.name] = gl.getUniformLocation(program, uniform.name);
-  } // @ts-ignore
-
-
-  program.vertexShader = vertexShader; // @ts-ignore
+  }
 
+  // @ts-ignore
+  program.vertexShader = vertexShader;
+  // @ts-ignore
   program.fragmentShader = fragmentShader;
   return program;
 }
 export function loadShader(gl, type, source) {
   // Create shader object
   var shader = gl.createShader(type); // 生成着色器对象
-
   if (shader == null) {
     console.warn('unable to create shader');
     return null;
-  } // Set the shader program
-
+  }
 
+  // Set the shader program
   gl.shaderSource(shader, source); // 载入着色器
-  // Compile the shader
 
+  // Compile the shader
   gl.compileShader(shader); // 编译着色器代码
-  // Check the result of compilation
 
+  // Check the result of compilation
   var compiled = gl.getShaderParameter(shader, gl.COMPILE_STATUS); // 判断着色器对象是否生成成功
   // gl.SHADER_TYPE、gl.DELETE_STATUS、gl.COMPILE_STATUS
-
   if (!compiled) {
     var error = gl.getShaderInfoLog(shader);
     console.warn('Failed to compile shader: ' + error);
     gl.deleteShader(shader);
     return null;
   }
-
   return shader;
 }
 export function createTexture(gl, filter, data, width, height) {
@@ -118,13 +107,10 @@ export function createBuffer(gl, data) {
 }
 export function bindAttriBuffer(gl, attrName, vertices, count, program) {
   var buffer = gl.createBuffer();
-
   if (!buffer) {
     console.warn('failed create vertex buffer');
   }
-
   gl.bindBuffer(gl.ARRAY_BUFFER, buffer); // 将缓冲区对象绑定到目标
-
   gl.bufferData(gl.ARRAY_BUFFER, vertices, gl.STATIC_DRAW); // 向缓冲区对象中写入数据
 
   var attr = gl.getAttribLocation(program, attrName);
@@ -139,25 +125,21 @@ export function bindAttriBuffer(gl, attrName, vertices, count, program) {
 }
 export function bindAttriIndicesBuffer(gl, indices) {
   var buffer = gl.createBuffer();
-
   if (!buffer) {
     console.warn('failed create vertex buffer');
   } else {
     gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, buffer);
     gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, indices, gl.STATIC_DRAW);
   }
-
   return buffer;
 }
 export function bindUnifrom(gl, unifromName, data, program, vec) {
   var uniform = gl.getUniformLocation(program, unifromName);
-
   if (uniform === null || uniform < 0) {
     console.warn('无法获取 uniform 变量的存储位置');
   } else {
     setUnifrom(gl, uniform, data, vec);
   }
-
   return uniform;
 }
 export function setUnifrom(gl, location, data, vec) {
@@ -165,27 +147,20 @@ export function setUnifrom(gl, location, data, vec) {
     case 'float':
       gl.uniform1f(location, data);
       break;
-
     case 'vec2':
       gl.uniform2fv(location, data);
       break;
-
     case 'vec3':
       gl.uniform3fv(location, data);
       break;
-
     case 'vec4':
       gl.uniform4fv(location, data);
       break;
-
     case 'bool':
       gl.uniform1i(location, data); // 1 - true    0 - false
-
       break;
-
     case 'sampler2d':
       break;
-
     case 'mat4':
       gl.uniformMatrix4fv(location, false, data);
       break;
@@ -193,7 +168,7 @@ export function setUnifrom(gl, location, data, vec) {
 }
 export function initFramebuffer(gl) {
   var drawingBufferWidth = gl.drawingBufferWidth,
-      drawingBufferHeight = gl.drawingBufferHeight;
+    drawingBufferHeight = gl.drawingBufferHeight;
   var OFFER_SCREEN_WIDTH = drawingBufferWidth;
   var OFFER_SCREEN_HEIGHT = drawingBufferHeight;
   var FRAMEBUFFER = gl.createFramebuffer();
@@ -202,12 +177,12 @@ export function initFramebuffer(gl) {
   gl.bindRenderbuffer(gl.RENDERBUFFER, depthbuffer);
   gl.renderbufferStorage(gl.RENDERBUFFER, gl.DEPTH_COMPONENT16, OFFER_SCREEN_WIDTH, OFFER_SCREEN_HEIGHT);
   gl.framebufferRenderbuffer(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.RENDERBUFFER, depthbuffer);
-  var texture = gl.createTexture(); // @ts-ignore
-
-  FRAMEBUFFER.texture = texture; // @ts-ignore
-
-  FRAMEBUFFER.width = OFFER_SCREEN_WIDTH; // @ts-ignore
-
+  var texture = gl.createTexture();
+  // @ts-ignore
+  FRAMEBUFFER.texture = texture;
+  // @ts-ignore
+  FRAMEBUFFER.width = OFFER_SCREEN_WIDTH;
+  // @ts-ignore
   FRAMEBUFFER.height = OFFER_SCREEN_HEIGHT;
   gl.bindTexture(gl.TEXTURE_2D, texture);
   gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);