@antv/l7-renderer 2.9.23 → 2.9.25

package/es/regl/ReglModel.js

@@ -58,14 +58,14 @@ var ReglModel = /*#__PURE__*/function () {
 
     if (instances) {
       drawParams.instances = instances;
-    } // elements 中可能包含 count，此时不应传入
+    } // Tip:
+    // elements 中可能包含 count，此时不应传入
+    // count 和 elements 相比、count 优先
 
 
     if (count) {
       drawParams.count = count;
-    }
-
-    if (elements) {
+    } else if (elements) {
       drawParams.elements = elements.get();
     }
 

package/es/regl/index.d.ts

@@ -3,6 +3,7 @@
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md
  */
 import { IAttribute, IAttributeInitializationOptions, IBuffer, IBufferInitializationOptions, IClearOptions, IElements, IElementsInitializationOptions, IExtensions, IFramebuffer, IFramebufferInitializationOptions, IModel, IModelInitializationOptions, IReadPixelsOptions, IRenderConfig, IRendererService, ITexture2D, ITexture2DInitializationOptions } from '@antv/l7-core';
+import regl from 'l7regl';
 import 'reflect-metadata';
 import ReglFramebuffer from './ReglFramebuffer';
 /**
@@ -16,7 +17,7 @@ export default class ReglRendererService implements IRendererService {
     private width;
     private height;
     private isDirty;
-    init(canvas: HTMLCanvasElement, cfg: IRenderConfig): Promise<void>;
+    init(canvas: HTMLCanvasElement, cfg: IRenderConfig, gl?: regl.Regl): Promise<void>;
     getPointSizeRange(): any;
     testExtension(name: string): boolean;
     createModel: (options: IModelInitializationOptions) => IModel;

package/es/regl/index.js

@@ -160,7 +160,7 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
   _createClass(ReglRendererService, [{
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(canvas, cfg) {
+      var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(canvas, cfg, gl) {
         var _this2 = this;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -168,9 +168,19 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
             switch (_context.prev = _context.next) {
               case 0:
                 // this.$container = $container;
-                this.canvas = canvas; // tslint:disable-next-line:typedef
+                this.canvas = canvas;
 
-                _context.next = 3;
+                if (!gl) {
+                  _context.next = 5;
+                  break;
+                }
+
+                this.gl = gl;
+                _context.next = 8;
+                break;
+
+              case 5:
+                _context.next = 7;
                 return new Promise(function (resolve, reject) {
                   regl({
                     canvas: _this2.canvas,
@@ -200,13 +210,15 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
                   });
                 });
 
-              case 3:
+              case 7:
                 this.gl = _context.sent;
+
+              case 8:
                 this.extensionObject = {
                   OES_texture_float: this.testExtension('OES_texture_float')
                 };
 
-              case 5:
+              case 9:
               case "end":
                 return _context.stop();
             }
@@ -214,7 +226,7 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
         }, _callee, this);
       }));
 
-      function init(_x, _x2) {
+      function init(_x, _x2, _x3) {
         return _init.apply(this, arguments);
       }
 

package/lib/regl/ReglModel.js

@@ -69,8 +69,7 @@ var ReglModel = class {
     }
     if (count) {
       drawParams.count = count;
-    }
-    if (elements) {
+    } else if (elements) {
       drawParams.elements = elements.get();
     }
     this.initDepthDrawParams({ depth }, drawParams);

package/lib/regl/index.js

@@ -120,39 +120,43 @@ var ReglRendererService = class {
       this.gl = null;
     };
   }
-  async init(canvas, cfg) {
+  async init(canvas, cfg, gl) {
     this.canvas = canvas;
-    this.gl = await new Promise((resolve, reject) => {
-      (0, import_l7regl.default)({
-        canvas: this.canvas,
-        attributes: {
-          alpha: true,
-          antialias: cfg.antialias,
-          premultipliedAlpha: true,
-          preserveDrawingBuffer: cfg.preserveDrawingBuffer,
-          stencil: cfg.stencil
-        },
-        extensions: [
-          "OES_element_index_uint",
-          "OES_standard_derivatives",
-          "ANGLE_instanced_arrays"
-        ],
-        optionalExtensions: [
-          "oes_texture_float_linear",
-          "OES_texture_float",
-          "EXT_texture_filter_anisotropic",
-          "EXT_blend_minmax",
-          "WEBGL_depth_texture"
-        ],
-        profile: true,
-        onDone: (err, r) => {
-          if (err || !r) {
-            reject(err);
+    if (gl) {
+      this.gl = gl;
+    } else {
+      this.gl = await new Promise((resolve, reject) => {
+        (0, import_l7regl.default)({
+          canvas: this.canvas,
+          attributes: {
+            alpha: true,
+            antialias: cfg.antialias,
+            premultipliedAlpha: true,
+            preserveDrawingBuffer: cfg.preserveDrawingBuffer,
+            stencil: cfg.stencil
+          },
+          extensions: [
+            "OES_element_index_uint",
+            "OES_standard_derivatives",
+            "ANGLE_instanced_arrays"
+          ],
+          optionalExtensions: [
+            "oes_texture_float_linear",
+            "OES_texture_float",
+            "EXT_texture_filter_anisotropic",
+            "EXT_blend_minmax",
+            "WEBGL_depth_texture"
+          ],
+          profile: true,
+          onDone: (err, r) => {
+            if (err || !r) {
+              reject(err);
+            }
+            resolve(r);
           }
-          resolve(r);
-        }
+        });
       });
-    });
+    }
     this.extensionObject = {
       OES_texture_float: this.testExtension("OES_texture_float")
     };

package/package.json

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