@antv/l7-renderer 2.17.4 → 2.17.5

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.d.ts

@@ -6,6 +6,7 @@ import regl from 'l7regl';
  */
 export default class ReglBuffer implements IBuffer {
     private buffer;
+    private isDestroyed;
     constructor(reGl: regl.Regl, options: IBufferInitializationOptions);
     get(): regl.Buffer;
     destroy(): void;

package/es/regl/ReglBuffer.js

@@ -1,27 +1,27 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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);
-
+    _defineProperty(this, "isDestroyed", false);
     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() {
@@ -30,18 +30,19 @@ var ReglBuffer = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      this.buffer.destroy();
+      if (!this.isDestroyed) {
+        this.buffer.destroy();
+      }
+      this.isDestroyed = true;
     }
   }, {
     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();
@@ -77,32 +71,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 };