@antv/l7-renderer 2.15.2 → 2.15.4

package/es/regl/ReglAttribute.js

@@ -1,19 +1,17 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 /**
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#attributes
  */
 var ReglAttribute = /*#__PURE__*/function () {
   function ReglAttribute(gl, options) {
     _classCallCheck(this, ReglAttribute);
-
     var buffer = options.buffer,
-        offset = options.offset,
-        stride = options.stride,
-        normalized = options.normalized,
-        size = options.size,
-        divisor = options.divisor;
+      offset = options.offset,
+      stride = options.stride,
+      normalized = options.normalized,
+      size = options.size,
+      divisor = options.divisor;
     this.buffer = buffer;
     this.attribute = {
       buffer: buffer.get(),
@@ -22,12 +20,10 @@ var ReglAttribute = /*#__PURE__*/function () {
       normalized: normalized || false,
       divisor: divisor || 0
     };
-
     if (size) {
       this.attribute.size = size;
     }
   }
-
   _createClass(ReglAttribute, [{
     key: "get",
     value: function get() {
@@ -44,8 +40,6 @@ var ReglAttribute = /*#__PURE__*/function () {
       this.buffer.destroy();
     }
   }]);
-
   return ReglAttribute;
 }();
-
 export { ReglAttribute as default };

package/es/regl/ReglBuffer.js

@@ -2,26 +2,24 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { gl } from '@antv/l7-core';
 import { dataTypeMap, usageMap } from "./constants";
+
 /**
  * adaptor for regl.Buffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#buffers
  */
-
 var ReglBuffer = /*#__PURE__*/function () {
   function ReglBuffer(reGl, options) {
     _classCallCheck(this, ReglBuffer);
-
     var data = options.data,
-        usage = options.usage,
-        type = options.type;
+      usage = options.usage,
+      type = options.type;
     this.buffer = reGl.buffer({
       data: data,
       usage: usageMap[usage || gl.STATIC_DRAW],
-      type: dataTypeMap[type || gl.UNSIGNED_BYTE] // length: 0,
-
+      type: dataTypeMap[type || gl.UNSIGNED_BYTE]
+      // length: 0,
     });
   }
-
   _createClass(ReglBuffer, [{
     key: "get",
     value: function get() {
@@ -36,12 +34,10 @@ var ReglBuffer = /*#__PURE__*/function () {
     key: "subData",
     value: function subData(_ref) {
       var data = _ref.data,
-          offset = _ref.offset;
+        offset = _ref.offset;
       this.buffer.subdata(data, offset);
     }
   }]);
-
   return ReglBuffer;
 }();
-
 export { ReglBuffer as default };

package/es/regl/ReglElements.js

@@ -2,18 +2,17 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { gl } from '@antv/l7-core';
 import { dataTypeMap, usageMap } from "./constants";
+
 /**
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#elements
  */
-
 var ReglElements = /*#__PURE__*/function () {
   function ReglElements(reGl, options) {
     _classCallCheck(this, ReglElements);
-
     var data = options.data,
-        usage = options.usage,
-        type = options.type,
-        count = options.count;
+      usage = options.usage,
+      type = options.type,
+      count = options.count;
     this.elements = reGl.elements({
       data: data,
       usage: usageMap[usage || gl.STATIC_DRAW],
@@ -21,7 +20,6 @@ var ReglElements = /*#__PURE__*/function () {
       count: count
     });
   }
-
   _createClass(ReglElements, [{
     key: "get",
     value: function get() {
@@ -35,11 +33,10 @@ var ReglElements = /*#__PURE__*/function () {
     }
   }, {
     key: "destroy",
-    value: function destroy() {// this.elements.destroy();
+    value: function destroy() {
+      // this.elements.destroy();
     }
   }]);
-
   return ReglElements;
 }();
-
 export { ReglElements as default };

package/es/regl/ReglFramebuffer.js

@@ -1,6 +1,5 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-
 /**
  * adaptor for regl.Framebuffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#framebuffers
@@ -8,30 +7,27 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 var ReglFramebuffer = /*#__PURE__*/function () {
   function ReglFramebuffer(reGl, options) {
     _classCallCheck(this, ReglFramebuffer);
-
     var width = options.width,
-        height = options.height,
-        color = options.color,
-        colors = options.colors;
+      height = options.height,
+      color = options.color,
+      colors = options.colors;
     var framebufferOptions = {
       width: width,
       height: height
     };
-
     if (Array.isArray(colors)) {
       framebufferOptions.colors = colors.map(function (c) {
         return c.get();
       });
     }
-
     if (color && typeof color !== 'boolean') {
       framebufferOptions.color = color.get();
-    } // TODO: depth & stencil
+    }
 
+    // TODO: depth & stencil
 
     this.framebuffer = reGl.framebuffer(framebufferOptions);
   }
-
   _createClass(ReglFramebuffer, [{
     key: "get",
     value: function get() {
@@ -46,12 +42,10 @@ var ReglFramebuffer = /*#__PURE__*/function () {
     key: "resize",
     value: function resize(_ref) {
       var width = _ref.width,
-          height = _ref.height;
+        height = _ref.height;
       this.framebuffer.resize(width, height);
     }
   }]);
-
   return ReglFramebuffer;
 }();
-
 export { ReglFramebuffer as default };

package/es/regl/ReglModel.js

@@ -6,32 +6,27 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { gl } from '@antv/l7-core';
 import { isPlainObject, isTypedArray } from 'lodash';
 import { blendEquationMap, blendFuncMap, cullFaceMap, depthFuncMap, primitiveMap, stencilFuncMap, stencilOpMap } from "./constants";
-
 /**
  * adaptor for regl.DrawCommand
  */
 var ReglModel = /*#__PURE__*/function () {
   function ReglModel(reGl, options) {
     _classCallCheck(this, ReglModel);
-
     _defineProperty(this, "destroyed", false);
-
     _defineProperty(this, "uniforms", {});
-
     this.reGl = reGl;
     var vs = options.vs,
-        fs = options.fs,
-        attributes = options.attributes,
-        uniforms = options.uniforms,
-        primitive = options.primitive,
-        count = options.count,
-        elements = options.elements,
-        depth = options.depth,
-        cull = options.cull,
-        instances = options.instances;
+      fs = options.fs,
+      attributes = options.attributes,
+      uniforms = options.uniforms,
+      primitive = options.primitive,
+      count = options.count,
+      elements = options.elements,
+      depth = options.depth,
+      cull = options.cull,
+      instances = options.instances;
     var reglUniforms = {};
     this.options = options;
-
     if (uniforms) {
       this.uniforms = this.extractUniforms(uniforms);
       Object.keys(uniforms).forEach(function (uniformName) {
@@ -40,7 +35,6 @@ var ReglModel = /*#__PURE__*/function () {
         reglUniforms[uniformName] = reGl.prop(uniformName);
       });
     }
-
     var reglAttributes = {};
     Object.keys(attributes).forEach(function (name) {
       reglAttributes[name] = attributes[name].get();
@@ -76,32 +70,29 @@ var ReglModel = /*#__PURE__*/function () {
       },
       primitive: primitiveMap[primitive === undefined ? gl.TRIANGLES : primitive]
     };
-
     if (instances) {
       drawParams.instances = instances;
-    } // Tip:
+    }
+
+    // Tip:
     // elements 中可能包含 count，此时不应传入
     // count 和 elements 相比、count 优先
-
-
     if (count) {
       drawParams.count = count;
     } else if (elements) {
       drawParams.elements = elements.get();
     }
-
     this.initDepthDrawParams({
       depth: depth
-    }, drawParams); // this.initBlendDrawParams({ blend }, drawParams);
+    }, drawParams);
+    // this.initBlendDrawParams({ blend }, drawParams);
     // this.initStencilDrawParams({ stencil }, drawParams);
-
     this.initCullDrawParams({
       cull: cull
     }, drawParams);
     this.drawCommand = reGl(drawParams);
     this.drawParams = drawParams;
   }
-
   _createClass(ReglModel, [{
     key: "updateAttributesAndElements",
     value: function updateAttributesAndElements(attributes, elements) {
@@ -135,62 +126,58 @@ var ReglModel = /*#__PURE__*/function () {
       if (this.drawParams.attributes && Object.keys(this.drawParams.attributes).length === 0) {
         return;
       }
-
       var uniforms = _objectSpread(_objectSpread({}, this.uniforms), this.extractUniforms(options.uniforms || {}));
-
       var reglDrawProps = {};
       Object.keys(uniforms).forEach(function (uniformName) {
         var type = _typeof(uniforms[uniformName]);
-
-        if (type === 'boolean' || type === 'number' || Array.isArray(uniforms[uniformName]) || // @ts-ignore
+        if (type === 'boolean' || type === 'number' || Array.isArray(uniforms[uniformName]) ||
+        // @ts-ignore
         uniforms[uniformName].BYTES_PER_ELEMENT) {
           reglDrawProps[uniformName] = uniforms[uniformName];
         } else {
           reglDrawProps[uniformName] = uniforms[uniformName].get();
         }
-      }); // 更新 blend
+      });
+      // 更新 blend
       // @ts-ignore
-
       reglDrawProps.blend = pick // picking 操作不应该使用 blend
       ? this.getBlendDrawParams({
         blend: {
           enable: false
         }
-      }) : this.getBlendDrawParams(options); // 更新stentil 配置
-      // @ts-ignore
-
-      reglDrawProps.stencil = this.getStencilDrawParams(options); // @ts-ignore
+      }) : this.getBlendDrawParams(options);
 
-      reglDrawProps.colorMask = this.getColorMaskDrawParams(options, pick); // 在进行拾取操作的绘制中，不应该使用叠加模式 - picking 根据拾取的颜色作为判断的输入，而叠加模式会产生新的，在 id 序列中不存在的颜色
+      // 更新stentil 配置
+      // @ts-ignore
+      reglDrawProps.stencil = this.getStencilDrawParams(options);
+      // @ts-ignore
+      reglDrawProps.colorMask = this.getColorMaskDrawParams(options, pick);
 
+      // 在进行拾取操作的绘制中，不应该使用叠加模式 - picking 根据拾取的颜色作为判断的输入，而叠加模式会产生新的，在 id 序列中不存在的颜色
       this.drawCommand(reglDrawProps);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       var _this$drawParams, _this$drawParams$elem;
-
       // @ts-ignore
       (_this$drawParams = this.drawParams) === null || _this$drawParams === void 0 ? void 0 : (_this$drawParams$elem = _this$drawParams.elements) === null || _this$drawParams$elem === void 0 ? void 0 : _this$drawParams$elem.destroy();
-
       if (this.options.attributes) {
         Object.values(this.options.attributes).forEach(function (attr) {
           // @ts-ignore
           attr === null || attr === void 0 ? void 0 : attr.destroy();
         });
       }
-
       this.destroyed = true;
     }
+
     /**
      * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#depth-buffer
      */
-
   }, {
     key: "initDepthDrawParams",
     value: function initDepthDrawParams(_ref, drawParams) {
       var depth = _ref.depth;
-
       if (depth) {
         drawParams.depth = {
           enable: depth.enable === undefined ? true : !!depth.enable,
@@ -204,15 +191,13 @@ var ReglModel = /*#__PURE__*/function () {
     key: "getBlendDrawParams",
     value: function getBlendDrawParams(_ref2) {
       var blend = _ref2.blend;
-
       var _ref3 = blend || {},
-          enable = _ref3.enable,
-          func = _ref3.func,
-          equation = _ref3.equation,
-          _ref3$color = _ref3.color,
-          color = _ref3$color === void 0 ? [0, 0, 0, 0] : _ref3$color; // @ts-ignore
-
-
+        enable = _ref3.enable,
+        func = _ref3.func,
+        equation = _ref3.equation,
+        _ref3$color = _ref3.color,
+        color = _ref3$color === void 0 ? [0, 0, 0, 0] : _ref3$color;
+      // @ts-ignore
       return {
         enable: !!enable,
         func: {
@@ -231,35 +216,32 @@ var ReglModel = /*#__PURE__*/function () {
     /**
      * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
      */
-
   }, {
     key: "getStencilDrawParams",
     value: function getStencilDrawParams(_ref4) {
       var stencil = _ref4.stencil;
-
       var _ref5 = stencil || {},
-          enable = _ref5.enable,
-          _ref5$mask = _ref5.mask,
-          mask = _ref5$mask === void 0 ? -1 : _ref5$mask,
-          _ref5$func = _ref5.func,
-          func = _ref5$func === void 0 ? {
-        cmp: gl.ALWAYS,
-        ref: 0,
-        mask: -1
-      } : _ref5$func,
-          _ref5$opFront = _ref5.opFront,
-          opFront = _ref5$opFront === void 0 ? {
-        fail: gl.KEEP,
-        zfail: gl.KEEP,
-        zpass: gl.KEEP
-      } : _ref5$opFront,
-          _ref5$opBack = _ref5.opBack,
-          opBack = _ref5$opBack === void 0 ? {
-        fail: gl.KEEP,
-        zfail: gl.KEEP,
-        zpass: gl.KEEP
-      } : _ref5$opBack;
-
+        enable = _ref5.enable,
+        _ref5$mask = _ref5.mask,
+        mask = _ref5$mask === void 0 ? -1 : _ref5$mask,
+        _ref5$func = _ref5.func,
+        func = _ref5$func === void 0 ? {
+          cmp: gl.ALWAYS,
+          ref: 0,
+          mask: -1
+        } : _ref5$func,
+        _ref5$opFront = _ref5.opFront,
+        opFront = _ref5$opFront === void 0 ? {
+          fail: gl.KEEP,
+          zfail: gl.KEEP,
+          zpass: gl.KEEP
+        } : _ref5$opFront,
+        _ref5$opBack = _ref5.opBack,
+        opBack = _ref5$opBack === void 0 ? {
+          fail: gl.KEEP,
+          zfail: gl.KEEP,
+          zpass: gl.KEEP
+        } : _ref5$opBack;
       return {
         enable: !!enable,
         mask: mask,
@@ -285,39 +267,36 @@ var ReglModel = /*#__PURE__*/function () {
       // TODO: 重构相关参数
       // 掩膜模式下，颜色通道全部关闭
       var colorMask = stencil !== null && stencil !== void 0 && stencil.enable && stencil.opFront && !pick ? [false, false, false, false] : [true, true, true, true]; // 非掩码模式下，颜色通道全部开启
-
       return colorMask;
     }
+
     /**
      * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#culling
      */
-
   }, {
     key: "initCullDrawParams",
     value: function initCullDrawParams(_ref7, drawParams) {
       var cull = _ref7.cull;
-
       if (cull) {
         var enable = cull.enable,
-            _cull$face = cull.face,
-            face = _cull$face === void 0 ? gl.BACK : _cull$face;
+          _cull$face = cull.face,
+          face = _cull$face === void 0 ? gl.BACK : _cull$face;
         drawParams.cull = {
           enable: !!enable,
           face: cullFaceMap[face]
         };
       }
     }
+
     /**
      * 考虑结构体命名, eg:
      * a: { b: 1 }  ->  'a.b'
      * a: [ { b: 1 } ] -> 'a[0].b'
      */
-
   }, {
     key: "extractUniforms",
     value: function extractUniforms(uniforms) {
       var _this = this;
-
       var extractedUniforms = {};
       Object.keys(uniforms).forEach(function (uniformName) {
         _this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, '');
@@ -328,38 +307,41 @@ var ReglModel = /*#__PURE__*/function () {
     key: "extractUniformsRecursively",
     value: function extractUniformsRecursively(uniformName, uniformValue, uniforms, prefix) {
       var _this2 = this;
-
-      if (uniformValue === null || typeof uniformValue === 'number' || // u_A: 1
-      typeof uniformValue === 'boolean' || // u_A: false
-      Array.isArray(uniformValue) && typeof uniformValue[0] === 'number' || // u_A: [1, 2, 3]
-      isTypedArray(uniformValue) || // u_A: Float32Array
+      if (uniformValue === null || typeof uniformValue === 'number' ||
+      // u_A: 1
+      typeof uniformValue === 'boolean' ||
+      // u_A: false
+      Array.isArray(uniformValue) && typeof uniformValue[0] === 'number' ||
+      // u_A: [1, 2, 3]
+      isTypedArray(uniformValue) ||
+      // u_A: Float32Array
       // @ts-ignore
       uniformValue === '' || 'resize' in uniformValue) {
         uniforms["".concat(prefix && prefix + '.').concat(uniformName)] = uniformValue;
         return;
-      } // u_Struct.a.b.c
-
+      }
 
+      // u_Struct.a.b.c
       if (isPlainObject(uniformValue)) {
         Object.keys(uniformValue).forEach(function (childName) {
-          _this2.extractUniformsRecursively(childName, // @ts-ignore
+          _this2.extractUniformsRecursively(childName,
+          // @ts-ignore
           uniformValue[childName], uniforms, "".concat(prefix && prefix + '.').concat(uniformName));
         });
-      } // u_Struct[0].a
-
+      }
 
+      // u_Struct[0].a
       if (Array.isArray(uniformValue)) {
         uniformValue.forEach(function (child, idx) {
           Object.keys(child).forEach(function (childName) {
-            _this2.extractUniformsRecursively(childName, // @ts-ignore
+            _this2.extractUniformsRecursively(childName,
+            // @ts-ignore
             child[childName], uniforms, "".concat(prefix && prefix + '.').concat(uniformName, "[").concat(idx, "]"));
           });
         });
       }
     }
   }]);
-
   return ReglModel;
 }();
-
 export { ReglModel as default };

package/es/regl/ReglRenderbuffer.js

@@ -1,25 +1,23 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { formatMap } from "./constants";
+
 /**
  * adaptor for regl.Renderbuffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#renderbuffers
  */
-
 var ReglRenderbuffer = /*#__PURE__*/function () {
   function ReglRenderbuffer(reGl, options) {
     _classCallCheck(this, ReglRenderbuffer);
-
     var width = options.width,
-        height = options.height,
-        format = options.format;
+      height = options.height,
+      format = options.format;
     this.renderbuffer = reGl.renderbuffer({
       width: width,
       height: height,
       format: formatMap[format]
     });
   }
-
   _createClass(ReglRenderbuffer, [{
     key: "get",
     value: function get() {
@@ -34,12 +32,10 @@ var ReglRenderbuffer = /*#__PURE__*/function () {
     key: "resize",
     value: function resize(_ref) {
       var width = _ref.width,
-          height = _ref.height;
+        height = _ref.height;
       this.renderbuffer.resize(width, height);
     }
   }]);
-
   return ReglRenderbuffer;
 }();
-
 export { ReglRenderbuffer as default };

package/es/regl/ReglTexture2D.js

@@ -3,50 +3,48 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { gl } from '@antv/l7-core';
 import { colorSpaceMap, dataTypeMap, filterMap, formatMap, mipmapMap, wrapModeMap } from "./constants";
+
 /**
  * adaptor for regl.Buffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#buffers
  */
-
 var ReglTexture2D = /*#__PURE__*/function () {
   function ReglTexture2D(reGl, options) {
     _classCallCheck(this, ReglTexture2D);
-
     _defineProperty(this, "isDestroy", false);
-
     var data = options.data,
-        _options$type = options.type,
-        type = _options$type === void 0 ? gl.UNSIGNED_BYTE : _options$type,
-        width = options.width,
-        height = options.height,
-        _options$flipY = options.flipY,
-        flipY = _options$flipY === void 0 ? false : _options$flipY,
-        _options$format = options.format,
-        format = _options$format === void 0 ? gl.RGBA : _options$format,
-        _options$mipmap = options.mipmap,
-        mipmap = _options$mipmap === void 0 ? false : _options$mipmap,
-        _options$wrapS = options.wrapS,
-        wrapS = _options$wrapS === void 0 ? gl.CLAMP_TO_EDGE : _options$wrapS,
-        _options$wrapT = options.wrapT,
-        wrapT = _options$wrapT === void 0 ? gl.CLAMP_TO_EDGE : _options$wrapT,
-        _options$aniso = options.aniso,
-        aniso = _options$aniso === void 0 ? 0 : _options$aniso,
-        _options$alignment = options.alignment,
-        alignment = _options$alignment === void 0 ? 1 : _options$alignment,
-        _options$premultiplyA = options.premultiplyAlpha,
-        premultiplyAlpha = _options$premultiplyA === void 0 ? false : _options$premultiplyA,
-        _options$mag = options.mag,
-        mag = _options$mag === void 0 ? gl.NEAREST : _options$mag,
-        _options$min = options.min,
-        min = _options$min === void 0 ? gl.NEAREST : _options$min,
-        _options$colorSpace = options.colorSpace,
-        colorSpace = _options$colorSpace === void 0 ? gl.BROWSER_DEFAULT_WEBGL : _options$colorSpace,
-        _options$x = options.x,
-        x = _options$x === void 0 ? 0 : _options$x,
-        _options$y = options.y,
-        y = _options$y === void 0 ? 0 : _options$y,
-        _options$copy = options.copy,
-        copy = _options$copy === void 0 ? false : _options$copy;
+      _options$type = options.type,
+      type = _options$type === void 0 ? gl.UNSIGNED_BYTE : _options$type,
+      width = options.width,
+      height = options.height,
+      _options$flipY = options.flipY,
+      flipY = _options$flipY === void 0 ? false : _options$flipY,
+      _options$format = options.format,
+      format = _options$format === void 0 ? gl.RGBA : _options$format,
+      _options$mipmap = options.mipmap,
+      mipmap = _options$mipmap === void 0 ? false : _options$mipmap,
+      _options$wrapS = options.wrapS,
+      wrapS = _options$wrapS === void 0 ? gl.CLAMP_TO_EDGE : _options$wrapS,
+      _options$wrapT = options.wrapT,
+      wrapT = _options$wrapT === void 0 ? gl.CLAMP_TO_EDGE : _options$wrapT,
+      _options$aniso = options.aniso,
+      aniso = _options$aniso === void 0 ? 0 : _options$aniso,
+      _options$alignment = options.alignment,
+      alignment = _options$alignment === void 0 ? 1 : _options$alignment,
+      _options$premultiplyA = options.premultiplyAlpha,
+      premultiplyAlpha = _options$premultiplyA === void 0 ? false : _options$premultiplyA,
+      _options$mag = options.mag,
+      mag = _options$mag === void 0 ? gl.NEAREST : _options$mag,
+      _options$min = options.min,
+      min = _options$min === void 0 ? gl.NEAREST : _options$min,
+      _options$colorSpace = options.colorSpace,
+      colorSpace = _options$colorSpace === void 0 ? gl.BROWSER_DEFAULT_WEBGL : _options$colorSpace,
+      _options$x = options.x,
+      x = _options$x === void 0 ? 0 : _options$x,
+      _options$y = options.y,
+      y = _options$y === void 0 ? 0 : _options$y,
+      _options$copy = options.copy,
+      copy = _options$copy === void 0 ? false : _options$copy;
     this.width = width;
     this.height = height;
     var textureOptions = {
@@ -70,21 +68,17 @@ var ReglTexture2D = /*#__PURE__*/function () {
       y: y,
       copy: copy
     };
-
     if (data) {
       // @ts-ignore
       textureOptions.data = data;
     }
-
     if (typeof mipmap === 'number') {
       textureOptions.mipmap = mipmapMap[mipmap];
     } else if (typeof mipmap === 'boolean') {
       textureOptions.mipmap = mipmap;
     }
-
     this.texture = reGl.texture(textureOptions);
   }
-
   _createClass(ReglTexture2D, [{
     key: "get",
     value: function get() {
@@ -106,7 +100,7 @@ var ReglTexture2D = /*#__PURE__*/function () {
     key: "resize",
     value: function resize(_ref) {
       var width = _ref.width,
-          height = _ref.height;
+        height = _ref.height;
       this.texture.resize(width, height);
       this.width = width;
       this.height = height;
@@ -121,15 +115,11 @@ var ReglTexture2D = /*#__PURE__*/function () {
     value: function destroy() {
       if (!this.isDestroy) {
         var _this$texture;
-
         (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       }
-
       this.isDestroy = true;
     }
   }]);
-
   return ReglTexture2D;
 }();
-
 export { ReglTexture2D as default };

package/es/regl/constants.js

@@ -1,7 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 var _primitiveMap, _usageMap, _dataTypeMap, _formatMap, _mipmapMap, _filterMap, _wrapModeMap, _colorSpaceMap, _depthFuncMap, _blendEquationMap, _blendFuncMap, _stencilFuncMap, _stencilOpMap, _cullFaceMap;
-
 /**
  * @desc 由于 regl 使用大量字符串而非 WebGL 常量，因此需要映射
  */

package/es/regl/index.js

@@ -2,15 +2,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 var _dec, _class;
-
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 /**
  * render w/ regl
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md
  */
+
 import { isMini } from '@antv/l7-utils';
 import { injectable } from 'inversify';
 import regl from 'l7regl';
@@ -21,55 +19,45 @@ import ReglElements from "./ReglElements";
 import ReglFramebuffer from "./ReglFramebuffer";
 import ReglModel from "./ReglModel";
 import ReglTexture2D from "./ReglTexture2D";
+
 /**
  * regl renderer
  */
-
 var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function ReglRendererService() {
     var _this = this;
-
     _classCallCheck(this, ReglRendererService);
-
     _defineProperty(this, "createModel", function (options) {
       return new ReglModel(_this.gl, options);
     });
-
     _defineProperty(this, "createAttribute", function (options) {
       return new ReglAttribute(_this.gl, options);
     });
-
     _defineProperty(this, "createBuffer", function (options) {
       return new ReglBuffer(_this.gl, options);
     });
-
     _defineProperty(this, "createElements", function (options) {
       return new ReglElements(_this.gl, options);
     });
-
     _defineProperty(this, "createTexture2D", function (options) {
       return new ReglTexture2D(_this.gl, options);
     });
-
     _defineProperty(this, "createFramebuffer", function (options) {
       return new ReglFramebuffer(_this.gl, options);
     });
-
     _defineProperty(this, "useFramebuffer", function (framebuffer, drawCommands) {
       _this.gl({
         framebuffer: framebuffer ? framebuffer.get() : null
       })(drawCommands);
     });
-
     _defineProperty(this, "clear", function (options) {
       var _this$gl;
-
       // @see https://github.com/regl-project/regl/blob/gh-pages/API.md#clear-the-draw-buffer
       var color = options.color,
-          depth = options.depth,
-          stencil = options.stencil,
-          _options$framebuffer = options.framebuffer,
-          framebuffer = _options$framebuffer === void 0 ? null : _options$framebuffer;
+        depth = options.depth,
+        stencil = options.stencil,
+        _options$framebuffer = options.framebuffer,
+        framebuffer = _options$framebuffer === void 0 ? null : _options$framebuffer;
       var reglClearOptions = {
         color: color,
         depth: depth,
@@ -78,158 +66,135 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
       reglClearOptions.framebuffer = framebuffer === null ? framebuffer : framebuffer.get();
       (_this$gl = _this.gl) === null || _this$gl === void 0 ? void 0 : _this$gl.clear(reglClearOptions);
     });
-
     _defineProperty(this, "viewport", function (_ref) {
       var x = _ref.x,
-          y = _ref.y,
-          width = _ref.width,
-          height = _ref.height;
-
+        y = _ref.y,
+        width = _ref.width,
+        height = _ref.height;
       // use WebGL context directly
       // @see https://github.com/regl-project/regl/blob/gh-pages/API.md#unsafe-escape-hatch
       _this.gl._gl.viewport(x, y, width, height);
-
       _this.width = width;
       _this.height = height;
-
       _this.gl._refresh();
     });
-
     _defineProperty(this, "readPixels", function (options) {
       var framebuffer = options.framebuffer,
-          x = options.x,
-          y = options.y,
-          width = options.width,
-          height = options.height;
+        x = options.x,
+        y = options.y,
+        width = options.width,
+        height = options.height;
       var readPixelsOptions = {
         x: x,
         y: y,
         width: width,
         height: height
       };
-
       if (framebuffer) {
         readPixelsOptions.framebuffer = framebuffer.get();
       }
-
       return _this.gl.read(readPixelsOptions);
     });
-
     _defineProperty(this, "getViewportSize", function () {
       return {
         width: _this.gl._gl.drawingBufferWidth,
         height: _this.gl._gl.drawingBufferHeight
       };
     });
-
     _defineProperty(this, "getContainer", function () {
       if (isMini) {
         return _this.canvas;
       } else {
         var _this$canvas;
-
         return (_this$canvas = _this.canvas) === null || _this$canvas === void 0 ? void 0 : _this$canvas.parentElement;
       }
     });
-
     _defineProperty(this, "getCanvas", function () {
       // return this.$container?.getElementsByTagName('canvas')[0] || null;
       return _this.canvas;
     });
-
     _defineProperty(this, "getGLContext", function () {
       return _this.gl._gl;
     });
-
     _defineProperty(this, "destroy", function () {
       var _this$gl2, _this$gl2$_gl, _this$gl2$_gl$getExte;
-
       // this.canvas = null 清除对 webgl 实例的引用
       // @ts-ignore
-      _this.canvas = null; // make sure release webgl context
+      _this.canvas = null;
 
-      (_this$gl2 = _this.gl) === null || _this$gl2 === void 0 ? void 0 : (_this$gl2$_gl = _this$gl2._gl) === null || _this$gl2$_gl === void 0 ? void 0 : (_this$gl2$_gl$getExte = _this$gl2$_gl.getExtension('WEBGL_lose_context')) === null || _this$gl2$_gl$getExte === void 0 ? void 0 : _this$gl2$_gl$getExte.loseContext(); // @see https://github.com/regl-project/regl/blob/gh-pages/API.md#clean-up
-
-      _this.gl.destroy(); // @ts-ignore
+      // make sure release webgl context
+      (_this$gl2 = _this.gl) === null || _this$gl2 === void 0 ? void 0 : (_this$gl2$_gl = _this$gl2._gl) === null || _this$gl2$_gl === void 0 ? void 0 : (_this$gl2$_gl$getExte = _this$gl2$_gl.getExtension('WEBGL_lose_context')) === null || _this$gl2$_gl$getExte === void 0 ? void 0 : _this$gl2$_gl$getExte.loseContext();
 
+      // @see https://github.com/regl-project/regl/blob/gh-pages/API.md#clean-up
+      _this.gl.destroy();
 
+      // @ts-ignore
       _this.gl = null;
     });
   }
-
   _createClass(ReglRendererService, [{
     key: "init",
     value: function () {
       var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(canvas, cfg, gl) {
         var _this2 = this;
-
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                // this.$container = $container;
-                this.canvas = canvas;
-
-                if (!gl) {
-                  _context.next = 5;
-                  break;
-                }
-
-                this.gl = gl;
-                _context.next = 8;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              // this.$container = $container;
+              this.canvas = canvas;
+              if (!gl) {
+                _context.next = 5;
                 break;
-
-              case 5:
-                _context.next = 7;
-                return new Promise(function (resolve, reject) {
-                  regl({
-                    canvas: _this2.canvas,
-                    attributes: {
-                      alpha: true,
-                      // use TAA instead of MSAA
-                      // @see https://www.khronos.org/registry/webgl/specs/1.0/#5.2.1
-                      antialias: cfg.antialias,
-                      premultipliedAlpha: true,
-                      preserveDrawingBuffer: cfg.preserveDrawingBuffer,
-                      stencil: cfg.stencil
-                    },
-                    // TODO: use extensions
-                    extensions: ['OES_element_index_uint', 'OES_standard_derivatives', // wireframe
-                    'ANGLE_instanced_arrays' // VSM shadow map
-                    ],
-                    optionalExtensions: ['oes_texture_float_linear', 'OES_texture_float', 'EXT_texture_filter_anisotropic', 'EXT_blend_minmax', 'WEBGL_depth_texture', 'WEBGL_lose_context'],
-                    profile: true,
-                    onDone: function onDone(err, r) {
-                      if (err || !r) {
-                        reject(err);
-                      } // @ts-ignore
-
-
-                      resolve(r);
+              }
+              this.gl = gl;
+              _context.next = 8;
+              break;
+            case 5:
+              _context.next = 7;
+              return new Promise(function (resolve, reject) {
+                regl({
+                  canvas: _this2.canvas,
+                  attributes: {
+                    alpha: true,
+                    // use TAA instead of MSAA
+                    // @see https://www.khronos.org/registry/webgl/specs/1.0/#5.2.1
+                    antialias: cfg.antialias,
+                    premultipliedAlpha: true,
+                    preserveDrawingBuffer: cfg.preserveDrawingBuffer,
+                    stencil: cfg.stencil
+                  },
+                  // TODO: use extensions
+                  extensions: ['OES_element_index_uint', 'OES_standard_derivatives',
+                  // wireframe
+                  'ANGLE_instanced_arrays' // VSM shadow map
+                  ],
+
+                  optionalExtensions: ['oes_texture_float_linear', 'OES_texture_float', 'EXT_texture_filter_anisotropic', 'EXT_blend_minmax', 'WEBGL_depth_texture', 'WEBGL_lose_context'],
+                  profile: true,
+                  onDone: function onDone(err, r) {
+                    if (err || !r) {
+                      reject(err);
                     }
-                  });
+                    // @ts-ignore
+                    resolve(r);
+                  }
                 });
-
-              case 7:
-                this.gl = _context.sent;
-
-              case 8:
-                this.extensionObject = {
-                  OES_texture_float: this.testExtension('OES_texture_float')
-                };
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
+              });
+            case 7:
+              this.gl = _context.sent;
+            case 8:
+              this.extensionObject = {
+                OES_texture_float: this.testExtension('OES_texture_float')
+              };
+            case 9:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function init(_x, _x2, _x3) {
         return _init.apply(this, arguments);
       }
-
       return init;
     }()
   }, {
@@ -245,7 +210,8 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
     }
   }, {
     key: "setState",
-    value: // TODO: 临时方法
+    value:
+    // TODO: 临时方法
     function setState() {
       this.gl({
         cull: {
@@ -264,7 +230,6 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
         },
         framebuffer: null
       });
-
       this.gl._refresh();
     }
   }, {
@@ -287,7 +252,6 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
         },
         framebuffer: null
       });
-
       this.gl._refresh();
     }
   }, {
@@ -307,7 +271,6 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
       return this.isDirty;
     }
   }]);
-
   return ReglRendererService;
 }()) || _class);
 export { ReglRendererService as default };

package/lib/index.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts

package/lib/regl/ReglBuffer.js

@@ -31,6 +31,7 @@ var ReglBuffer = class {
       data,
       usage: import_constants.usageMap[usage || import_l7_core.gl.STATIC_DRAW],
       type: import_constants.dataTypeMap[type || import_l7_core.gl.UNSIGNED_BYTE]
+      // length: 0,
     });
   }
   get() {

package/lib/regl/ReglFramebuffer.js

@@ -30,7 +30,9 @@ var ReglFramebuffer = class {
       height
     };
     if (Array.isArray(colors)) {
-      framebufferOptions.colors = colors.map((c) => c.get());
+      framebufferOptions.colors = colors.map(
+        (c) => c.get()
+      );
     }
     if (color && typeof color !== "boolean") {
       framebufferOptions.color = color.get();

package/lib/regl/ReglModel.js

@@ -59,18 +59,28 @@ var ReglModel = class {
       frag: fs,
       uniforms: reglUniforms,
       vert: vs,
+      // @ts-ignore
       colorMask: reGl.prop("colorMask"),
       blend: {
+        // @ts-ignore
         enable: reGl.prop("blend.enable"),
+        // @ts-ignore
         func: reGl.prop("blend.func"),
+        // @ts-ignore
         equation: reGl.prop("blend.equation"),
+        // @ts-ignore
         color: reGl.prop("blend.color")
       },
       stencil: {
+        // @ts-ignore
         enable: reGl.prop("stencil.enable"),
+        // @ts-ignore
         mask: reGl.prop("stencil.mask"),
+        // @ts-ignore
         func: reGl.prop("stencil.func"),
+        // @ts-ignore
         opFront: reGl.prop("stencil.opFront"),
+        // @ts-ignore
         opBack: reGl.prop("stencil.opBack")
       },
       primitive: import_constants.primitiveMap[primitive === void 0 ? import_l7_core.gl.TRIANGLES : primitive]
@@ -122,7 +132,8 @@ var ReglModel = class {
     const reglDrawProps = {};
     Object.keys(uniforms).forEach((uniformName) => {
       const type = typeof uniforms[uniformName];
-      if (type === "boolean" || type === "number" || Array.isArray(uniforms[uniformName]) || uniforms[uniformName].BYTES_PER_ELEMENT) {
+      if (type === "boolean" || type === "number" || Array.isArray(uniforms[uniformName]) || // @ts-ignore
+      uniforms[uniformName].BYTES_PER_ELEMENT) {
         reglDrawProps[uniformName] = uniforms[uniformName];
       } else {
         reglDrawProps[uniformName] = uniforms[uniformName].get();
@@ -145,6 +156,9 @@ var ReglModel = class {
     }
     this.destroyed = true;
   }
+  /**
+   * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#depth-buffer
+   */
   initDepthDrawParams({ depth }, drawParams) {
     if (depth) {
       drawParams.depth = {
@@ -174,6 +188,9 @@ var ReglModel = class {
       color
     };
   }
+  /**
+   * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
+   */
   getStencilDrawParams({
     stencil
   }) {
@@ -219,6 +236,9 @@ var ReglModel = class {
     const colorMask = (stencil == null ? void 0 : stencil.enable) && stencil.opFront && !pick ? [false, false, false, false] : [true, true, true, true];
     return colorMask;
   }
+  /**
+   * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#culling
+   */
   initCullDrawParams({ cull }, drawParams) {
     if (cull) {
       const { enable, face = import_l7_core.gl.BACK } = cull;
@@ -228,27 +248,54 @@ var ReglModel = class {
       };
     }
   }
+  /**
+   * 考虑结构体命名, eg:
+   * a: { b: 1 }  ->  'a.b'
+   * a: [ { b: 1 } ] -> 'a[0].b'
+   */
   extractUniforms(uniforms) {
     const extractedUniforms = {};
     Object.keys(uniforms).forEach((uniformName) => {
-      this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, "");
+      this.extractUniformsRecursively(
+        uniformName,
+        uniforms[uniformName],
+        extractedUniforms,
+        ""
+      );
     });
     return extractedUniforms;
   }
   extractUniformsRecursively(uniformName, uniformValue, uniforms, prefix) {
-    if (uniformValue === null || typeof uniformValue === "number" || typeof uniformValue === "boolean" || Array.isArray(uniformValue) && typeof uniformValue[0] === "number" || (0, import_lodash.isTypedArray)(uniformValue) || uniformValue === "" || "resize" in uniformValue) {
+    if (uniformValue === null || typeof uniformValue === "number" || // u_A: 1
+    typeof uniformValue === "boolean" || // u_A: false
+    Array.isArray(uniformValue) && typeof uniformValue[0] === "number" || // u_A: [1, 2, 3]
+    (0, import_lodash.isTypedArray)(uniformValue) || // u_A: Float32Array
+    // @ts-ignore
+    uniformValue === "" || "resize" in uniformValue) {
       uniforms[`${prefix && prefix + "."}${uniformName}`] = uniformValue;
       return;
     }
     if ((0, import_lodash.isPlainObject)(uniformValue)) {
       Object.keys(uniformValue).forEach((childName) => {
-        this.extractUniformsRecursively(childName, uniformValue[childName], uniforms, `${prefix && prefix + "."}${uniformName}`);
+        this.extractUniformsRecursively(
+          childName,
+          // @ts-ignore
+          uniformValue[childName],
+          uniforms,
+          `${prefix && prefix + "."}${uniformName}`
+        );
       });
     }
     if (Array.isArray(uniformValue)) {
       uniformValue.forEach((child, idx) => {
         Object.keys(child).forEach((childName) => {
-          this.extractUniformsRecursively(childName, child[childName], uniforms, `${prefix && prefix + "."}${uniformName}[${idx}]`);
+          this.extractUniformsRecursively(
+            childName,
+            // @ts-ignore
+            child[childName],
+            uniforms,
+            `${prefix && prefix + "."}${uniformName}[${idx}]`
+          );
         });
       });
     }

package/lib/regl/ReglTexture2D.js

@@ -52,10 +52,12 @@ var ReglTexture2D = class {
     const textureOptions = {
       width,
       height,
+      // @ts-ignore
       type: import_constants.dataTypeMap[type],
       format: import_constants.formatMap[format],
       wrapS: import_constants.wrapModeMap[wrapS],
       wrapT: import_constants.wrapModeMap[wrapT],
+      // @ts-ignore
       mag: import_constants.filterMap[mag],
       min: import_constants.filterMap[min],
       alignment,
@@ -63,6 +65,7 @@ var ReglTexture2D = class {
       colorSpace: import_constants.colorSpaceMap[colorSpace],
       premultiplyAlpha,
       aniso,
+      // copy pixels from current bind framebuffer
       x,
       y,
       copy

package/lib/regl/index.js

@@ -16,7 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
@@ -130,15 +137,20 @@ var ReglRendererService = class {
           canvas: this.canvas,
           attributes: {
             alpha: true,
+            // use TAA instead of MSAA
+            // @see https://www.khronos.org/registry/webgl/specs/1.0/#5.2.1
             antialias: cfg.antialias,
             premultipliedAlpha: true,
             preserveDrawingBuffer: cfg.preserveDrawingBuffer,
             stencil: cfg.stencil
           },
+          // TODO: use extensions
           extensions: [
             "OES_element_index_uint",
             "OES_standard_derivatives",
+            // wireframe
             "ANGLE_instanced_arrays"
+            // VSM shadow map
           ],
           optionalExtensions: [
             "oes_texture_float_linear",
@@ -168,6 +180,7 @@ var ReglRendererService = class {
   testExtension(name) {
     return !!this.getGLContext().getExtension(name);
   }
+  // TODO: 临时方法
   setState() {
     this.gl({
       cull: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-renderer",
-  "version": "2.15.2",
+  "version": "2.15.4",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -25,19 +25,19 @@
   "author": "xiaoiver",
   "license": "ISC",
   "devDependencies": {
-    "@antv/l7-test-utils": "2.15.2",
+    "@antv/l7-test-utils": "2.15.4",
     "gl": "^5.0.3"
   },
   "dependencies": {
-    "@antv/l7-core": "2.15.2",
-    "@antv/l7-utils": "2.15.2",
+    "@antv/l7-core": "2.15.4",
+    "@antv/l7-utils": "2.15.4",
     "@babel/runtime": "^7.7.7",
     "inversify": "^5.0.1",
     "l7regl": "^0.0.20",
     "lodash": "^4.17.15",
     "reflect-metadata": "^0.1.13"
   },
-  "gitHead": "89b84277323240e51f75d4e486072b8bb17b0c93",
+  "gitHead": "ab8429be57c8950a65493e33eb2fa9b38b2a125f",
   "publishConfig": {
     "access": "public"
   }