@antv/l7-renderer 2.17.11 → 2.18.0

package/es/regl/ReglAttribute.d.ts

@@ -1,5 +1,5 @@
 import { IAttribute, IAttributeInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#attributes
  */

package/es/regl/ReglBuffer.d.ts

@@ -1,5 +1,5 @@
 import { IBuffer, IBufferInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * adaptor for regl.Buffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#buffers

package/es/regl/ReglElements.d.ts

@@ -1,5 +1,5 @@
 import { IElements, IElementsInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#elements
  */

package/es/regl/ReglFramebuffer.d.ts

@@ -1,5 +1,5 @@
 import { IFramebuffer, IFramebufferInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * adaptor for regl.Framebuffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#framebuffers

package/es/regl/ReglModel.d.ts

@@ -1,5 +1,5 @@
 import { IAttribute, IElements, IModel, IModelDrawOptions, IModelInitializationOptions, IUniform } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * adaptor for regl.DrawCommand
  */

package/es/regl/ReglModel.js

@@ -4,8 +4,11 @@ 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 { isPlainObject, isTypedArray } from 'lodash';
+import { lodashUtil } from '@antv/l7-utils';
 import { blendEquationMap, blendFuncMap, cullFaceMap, depthFuncMap, primitiveMap, stencilFuncMap, stencilOpMap } from "./constants";
+var isPlainObject = lodashUtil.isPlainObject,
+  isTypedArray = lodashUtil.isTypedArray;
+
 /**
  * adaptor for regl.DrawCommand
  */

package/es/regl/ReglRenderbuffer.d.ts

@@ -1,5 +1,5 @@
 import { IRenderbuffer, IRenderbufferInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * adaptor for regl.Renderbuffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#renderbuffers

package/es/regl/ReglTexture2D.d.ts

@@ -1,5 +1,5 @@
 import { ITexture2D, ITexture2DInitializationOptions } from '@antv/l7-core';
-import regl from 'l7regl';
+import regl from 'regl';
 /**
  * adaptor for regl.Buffer
  * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#buffers

package/es/regl/constants.d.ts

@@ -1,4 +1,4 @@
-import regl from 'l7regl';
+import regl from 'regl';
 export declare const primitiveMap: {
     [key: string]: 'points' | 'lines' | 'line loop' | 'line strip' | 'triangles' | 'triangle strip' | 'triangle fan';
 };

package/es/regl/index.d.ts

@@ -3,8 +3,8 @@
  * @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 regl from 'regl';
 import ReglFramebuffer from './ReglFramebuffer';
 /**
  * regl renderer

package/es/regl/index.js

@@ -9,10 +9,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  * @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';
 import 'reflect-metadata';
+import regl from 'regl';
 import ReglAttribute from "./ReglAttribute";
 import ReglBuffer from "./ReglBuffer";
 import ReglElements from "./ReglElements";
@@ -102,12 +101,8 @@ var ReglRendererService = (_dec = injectable(), _dec(_class = /*#__PURE__*/funct
       };
     });
     _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;
-      }
+      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;

package/lib/regl/ReglModel.js

@@ -23,8 +23,9 @@ __export(ReglModel_exports, {
 });
 module.exports = __toCommonJS(ReglModel_exports);
 var import_l7_core = require("@antv/l7-core");
-var import_lodash = require("lodash");
+var import_l7_utils = require("@antv/l7-utils");
 var import_constants = require("./constants");
+var { isPlainObject, isTypedArray } = import_l7_utils.lodashUtil;
 var ReglModel = class {
   constructor(reGl, options) {
     this.destroyed = false;
@@ -270,13 +271,13 @@ var ReglModel = class {
     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
+    isTypedArray(uniformValue) || // u_A: Float32Array
     // @ts-ignore
     uniformValue === "" || "resize" in uniformValue) {
       uniforms[`${prefix && prefix + "."}${uniformName}`] = uniformValue;
       return;
     }
-    if ((0, import_lodash.isPlainObject)(uniformValue)) {
+    if (isPlainObject(uniformValue)) {
       Object.keys(uniformValue).forEach((childName) => {
         this.extractUniformsRecursively(
           childName,

package/lib/regl/index.js

@@ -41,10 +41,9 @@ __export(regl_exports, {
   default: () => ReglRendererService
 });
 module.exports = __toCommonJS(regl_exports);
-var import_l7_utils = require("@antv/l7-utils");
 var import_inversify = require("inversify");
-var import_l7regl = __toESM(require("l7regl"));
 var import_reflect_metadata = require("reflect-metadata");
+var import_regl = __toESM(require("regl"));
 var import_ReglAttribute = __toESM(require("./ReglAttribute"));
 var import_ReglBuffer = __toESM(require("./ReglBuffer"));
 var import_ReglElements = __toESM(require("./ReglElements"));
@@ -107,11 +106,7 @@ var ReglRendererService = class {
     };
     this.getContainer = () => {
       var _a;
-      if (import_l7_utils.isMini) {
-        return this.canvas;
-      } else {
-        return (_a = this.canvas) == null ? void 0 : _a.parentElement;
-      }
+      return (_a = this.canvas) == null ? void 0 : _a.parentElement;
     };
     this.getCanvas = () => {
       return this.canvas;
@@ -133,7 +128,7 @@ var ReglRendererService = class {
       this.gl = gl;
     } else {
       this.gl = await new Promise((resolve, reject) => {
-        (0, import_l7regl.default)({
+        (0, import_regl.default)({
           canvas: this.canvas,
           attributes: {
             alpha: true,

package/package.json

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