@antv/l7-renderer 2.21.2 → 2.21.4-beta.0

package/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 AntV team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/es/device/DeviceAttribute.js

@@ -1,15 +1,7 @@
 // src/device/DeviceAttribute.ts
 var DeviceAttribute = class {
   constructor(device, options) {
-    const {
-      buffer,
-      offset,
-      stride,
-      normalized,
-      size,
-      divisor,
-      shaderLocation
-    } = options;
+    const { buffer, offset, stride, normalized, size, divisor, shaderLocation } = options;
     this.buffer = buffer;
     this.attribute = {
       shaderLocation,

package/es/device/DeviceCache.js

@@ -8,12 +8,7 @@ import {
   renderPipelineDescriptorCopy,
   renderPipelineDescriptorEquals
 } from "@antv/g-device-api";
-import {
-  HashMap,
-  hashCodeNumberFinish,
-  hashCodeNumberUpdate,
-  nullHashFunc
-} from "./utils/HashMap";
+import { HashMap, hashCodeNumberFinish, hashCodeNumberUpdate, nullHashFunc } from "./utils/HashMap";
 function blendStateHash(hash, a) {
   hash = hashCodeNumberUpdate(hash, a.blendMode);
   hash = hashCodeNumberUpdate(hash, a.blendSrcFactor);
@@ -27,10 +22,7 @@ function attachmentStateHash(hash, a) {
   return hash;
 }
 function colorHash(hash, a) {
-  hash = hashCodeNumberUpdate(
-    hash,
-    a.r << 24 | a.g << 16 | a.b << 8 | a.a
-  );
+  hash = hashCodeNumberUpdate(hash, a.r << 24 | a.g << 16 | a.b << 8 | a.a);
   return hash;
 }
 function megaStateDescriptorHash(hash, a) {
@@ -129,7 +121,10 @@ var RenderCache = class {
       bindingsDescriptorEquals,
       bindingsDescriptorHash
     );
-    this.renderPipelinesCache = new HashMap(renderPipelineDescriptorEquals, renderPipelineDescriptorHash);
+    this.renderPipelinesCache = new HashMap(
+      renderPipelineDescriptorEquals,
+      renderPipelineDescriptorHash
+    );
     this.inputLayoutsCache = new HashMap(
       inputLayoutDescriptorEquals,
       nullHashFunc
@@ -156,7 +151,9 @@ var RenderCache = class {
     let renderPipeline = this.renderPipelinesCache.get(descriptor);
     if (renderPipeline === null) {
       const descriptorCopy = renderPipelineDescriptorCopy(descriptor);
-      descriptorCopy.colorAttachmentFormats = descriptorCopy.colorAttachmentFormats.filter((f) => f);
+      descriptorCopy.colorAttachmentFormats = descriptorCopy.colorAttachmentFormats.filter(
+        (f) => f
+      );
       renderPipeline = this.device.createRenderPipeline(descriptorCopy);
       this.renderPipelinesCache.add(descriptorCopy, renderPipeline);
     }

package/es/device/DeviceElements.js

@@ -10,9 +10,7 @@ var DeviceElements = class {
     if (isTypedArray(data)) {
       typed = data;
     } else {
-      typed = new typedArrayCtorMap[this.type || gl.UNSIGNED_INT](
-        data
-      );
+      typed = new typedArrayCtorMap[this.type || gl.UNSIGNED_INT](data);
     }
     this.type = type;
     this.count = count;
@@ -31,9 +29,7 @@ var DeviceElements = class {
     if (isTypedArray(data)) {
       typed = data;
     } else {
-      typed = new typedArrayCtorMap[this.type || gl.UNSIGNED_INT](
-        data
-      );
+      typed = new typedArrayCtorMap[this.type || gl.UNSIGNED_INT](data);
     }
     this.indexBuffer.setSubData(0, new Uint8Array(typed.buffer));
   }

package/es/device/DeviceFramebuffer.js

@@ -16,9 +16,7 @@ var DeviceFramebuffer = class {
           color.resize({ width, height });
         }
         this.colorTexture = color.get();
-        this.colorRenderTarget = this.device.createRenderTargetFromTexture(
-          this.colorTexture
-        );
+        this.colorRenderTarget = this.device.createRenderTargetFromTexture(this.colorTexture);
         this.width = color["width"];
         this.height = color["height"];
       } else if (width && height) {
@@ -28,9 +26,7 @@ var DeviceFramebuffer = class {
           width,
           height
         });
-        this.colorRenderTarget = this.device.createRenderTargetFromTexture(
-          this.colorTexture
-        );
+        this.colorRenderTarget = this.device.createRenderTargetFromTexture(this.colorTexture);
         this.width = width;
         this.height = height;
       }
@@ -44,9 +40,7 @@ var DeviceFramebuffer = class {
           depth.resize({ width, height });
         }
         this.depthTexture = depth.get();
-        this.depthRenderTarget = this.device.createRenderTargetFromTexture(
-          this.depthTexture
-        );
+        this.depthRenderTarget = this.device.createRenderTargetFromTexture(this.depthTexture);
         this.width = depth["width"];
         this.height = depth["height"];
       } else if (width && height) {
@@ -56,9 +50,7 @@ var DeviceFramebuffer = class {
           width,
           height
         });
-        this.depthRenderTarget = this.device.createRenderTargetFromTexture(
-          this.depthTexture
-        );
+        this.depthRenderTarget = this.device.createRenderTargetFromTexture(this.depthTexture);
         this.width = width;
         this.height = height;
       }

package/es/device/DeviceModel.js

@@ -54,15 +54,7 @@ var DeviceModel = class {
     this.destroyed = false;
     this.uniforms = {};
     this.vertexBuffers = [];
-    const {
-      vs,
-      fs,
-      attributes,
-      uniforms,
-      count,
-      elements,
-      diagnosticDerivativeUniformityEnabled
-    } = options;
+    const { vs, fs, attributes, uniforms, count, elements, diagnosticDerivativeUniformityEnabled } = options;
     this.options = options;
     const diagnosticDerivativeUniformityHeader = diagnosticDerivativeUniformityEnabled ? "" : this.service["viewportOrigin"] === ViewportOrigin.UPPER_LEFT ? "diagnostic(off,derivative_uniformity);" : "";
     this.program = service.renderCache.createProgram({
@@ -290,9 +282,7 @@ var DeviceModel = class {
     this.pipeline.destroy();
     this.destroyed = true;
   }
-  initDepthDrawParams({
-    depth
-  }) {
+  initDepthDrawParams({ depth }) {
     if (depth) {
       return {
         enable: depth.enable === void 0 ? true : !!depth.enable,
@@ -302,9 +292,7 @@ var DeviceModel = class {
       };
     }
   }
-  getBlendDrawParams({
-    blend
-  }) {
+  getBlendDrawParams({ blend }) {
     const { enable, func, equation, color = [0, 0, 0, 0] } = blend || {};
     return {
       enable: !!enable,
@@ -324,9 +312,7 @@ var DeviceModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
    */
-  getStencilDrawParams({
-    stencil
-  }) {
+  getStencilDrawParams({ stencil }) {
     const {
       enable,
       mask = 4294967295,
@@ -369,9 +355,7 @@ var DeviceModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#culling
    */
-  initCullDrawParams({
-    cull
-  }) {
+  initCullDrawParams({ cull }) {
     if (cull) {
       const { enable, face = gl.BACK } = cull;
       return {
@@ -388,12 +372,7 @@ var DeviceModel = class {
   extractUniforms(uniforms) {
     const extractedUniforms = {};
     Object.keys(uniforms).forEach((uniformName) => {
-      this.extractUniformsRecursively(
-        uniformName,
-        uniforms[uniformName],
-        extractedUniforms,
-        ""
-      );
+      this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, "");
     });
     return extractedUniforms;
   }

package/es/device/index.js

@@ -242,12 +242,7 @@ var DeviceRendererService = class {
       // @ts-ignore
       (currentFramebuffer == null ? void 0 : currentFramebuffer.clearOptions) || {}
     );
-    const colorClearColor = colorAttachment ? colorNewFromRGBA(
-      color[0] * 255,
-      color[1] * 255,
-      color[2] * 255,
-      color[3]
-    ) : TransparentBlack;
+    const colorClearColor = colorAttachment ? colorNewFromRGBA(color[0] * 255, color[1] * 255, color[2] * 255, color[3]) : TransparentBlack;
     const depthClearValue = depthStencilAttachment ? depth : void 0;
     const stencilClearValue = depthStencilAttachment ? stencil : void 0;
     const renderPass = this.device.createRenderPass({

package/es/regl/ReglModel.js

@@ -19,11 +19,7 @@ var __spreadValues = (a, b) => {
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
 // src/regl/ReglModel.ts
-import {
-  ClipSpaceNearZ,
-  preprocessShader_GLSL,
-  ViewportOrigin
-} from "@antv/g-device-api";
+import { ClipSpaceNearZ, preprocessShader_GLSL, ViewportOrigin } from "@antv/g-device-api";
 import { gl, removeDuplicateUniforms } from "@antv/l7-core";
 import { lodashUtil } from "@antv/l7-utils";
 import {
@@ -41,18 +37,7 @@ var ReglModel = class {
     this.destroyed = false;
     this.uniforms = {};
     this.reGl = reGl;
-    const {
-      vs,
-      fs,
-      attributes,
-      uniforms,
-      primitive,
-      count,
-      elements,
-      depth,
-      cull,
-      instances
-    } = options;
+    const { vs, fs, attributes, uniforms, primitive, count, elements, depth, cull, instances } = options;
     const vendorInfo = {
       platformString: "WebGL1",
       glslVersion: "#version 100",
@@ -190,9 +175,7 @@ var ReglModel = class {
       };
     }
   }
-  getBlendDrawParams({
-    blend
-  }) {
+  getBlendDrawParams({ blend }) {
     const { enable, func, equation, color = [0, 0, 0, 0] } = blend || {};
     return {
       enable: !!enable,
@@ -212,9 +195,7 @@ var ReglModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
    */
-  getStencilDrawParams({
-    stencil
-  }) {
+  getStencilDrawParams({ stencil }) {
     const {
       enable,
       mask = -1,
@@ -276,12 +257,7 @@ var ReglModel = class {
   extractUniforms(uniforms) {
     const extractedUniforms = {};
     Object.keys(uniforms).forEach((uniformName) => {
-      this.extractUniformsRecursively(
-        uniformName,
-        uniforms[uniformName],
-        extractedUniforms,
-        ""
-      );
+      this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, "");
     });
     return extractedUniforms;
   }

package/lib/device/DeviceAttribute.js

@@ -24,15 +24,7 @@ __export(DeviceAttribute_exports, {
 module.exports = __toCommonJS(DeviceAttribute_exports);
 var DeviceAttribute = class {
   constructor(device, options) {
-    const {
-      buffer,
-      offset,
-      stride,
-      normalized,
-      size,
-      divisor,
-      shaderLocation
-    } = options;
+    const { buffer, offset, stride, normalized, size, divisor, shaderLocation } = options;
     this.buffer = buffer;
     this.attribute = {
       shaderLocation,

package/lib/device/DeviceCache.js

@@ -37,10 +37,7 @@ function attachmentStateHash(hash, a) {
   return hash;
 }
 function colorHash(hash, a) {
-  hash = (0, import_HashMap.hashCodeNumberUpdate)(
-    hash,
-    a.r << 24 | a.g << 16 | a.b << 8 | a.a
-  );
+  hash = (0, import_HashMap.hashCodeNumberUpdate)(hash, a.r << 24 | a.g << 16 | a.b << 8 | a.a);
   return hash;
 }
 function megaStateDescriptorHash(hash, a) {
@@ -139,7 +136,10 @@ var RenderCache = class {
       import_g_device_api.bindingsDescriptorEquals,
       bindingsDescriptorHash
     );
-    this.renderPipelinesCache = new import_HashMap.HashMap(import_g_device_api.renderPipelineDescriptorEquals, renderPipelineDescriptorHash);
+    this.renderPipelinesCache = new import_HashMap.HashMap(
+      import_g_device_api.renderPipelineDescriptorEquals,
+      renderPipelineDescriptorHash
+    );
     this.inputLayoutsCache = new import_HashMap.HashMap(
       import_g_device_api.inputLayoutDescriptorEquals,
       import_HashMap.nullHashFunc
@@ -166,7 +166,9 @@ var RenderCache = class {
     let renderPipeline = this.renderPipelinesCache.get(descriptor);
     if (renderPipeline === null) {
       const descriptorCopy = (0, import_g_device_api.renderPipelineDescriptorCopy)(descriptor);
-      descriptorCopy.colorAttachmentFormats = descriptorCopy.colorAttachmentFormats.filter((f) => f);
+      descriptorCopy.colorAttachmentFormats = descriptorCopy.colorAttachmentFormats.filter(
+        (f) => f
+      );
       renderPipeline = this.device.createRenderPipeline(descriptorCopy);
       this.renderPipelinesCache.add(descriptorCopy, renderPipeline);
     }

package/lib/device/DeviceElements.js

@@ -33,9 +33,7 @@ var DeviceElements = class {
     if ((0, import_typedarray.isTypedArray)(data)) {
       typed = data;
     } else {
-      typed = new import_constants.typedArrayCtorMap[this.type || import_l7_core.gl.UNSIGNED_INT](
-        data
-      );
+      typed = new import_constants.typedArrayCtorMap[this.type || import_l7_core.gl.UNSIGNED_INT](data);
     }
     this.type = type;
     this.count = count;
@@ -54,9 +52,7 @@ var DeviceElements = class {
     if ((0, import_typedarray.isTypedArray)(data)) {
       typed = data;
     } else {
-      typed = new import_constants.typedArrayCtorMap[this.type || import_l7_core.gl.UNSIGNED_INT](
-        data
-      );
+      typed = new import_constants.typedArrayCtorMap[this.type || import_l7_core.gl.UNSIGNED_INT](data);
     }
     this.indexBuffer.setSubData(0, new Uint8Array(typed.buffer));
   }

package/lib/device/DeviceFramebuffer.js

@@ -39,9 +39,7 @@ var DeviceFramebuffer = class {
           color.resize({ width, height });
         }
         this.colorTexture = color.get();
-        this.colorRenderTarget = this.device.createRenderTargetFromTexture(
-          this.colorTexture
-        );
+        this.colorRenderTarget = this.device.createRenderTargetFromTexture(this.colorTexture);
         this.width = color["width"];
         this.height = color["height"];
       } else if (width && height) {
@@ -51,9 +49,7 @@ var DeviceFramebuffer = class {
           width,
           height
         });
-        this.colorRenderTarget = this.device.createRenderTargetFromTexture(
-          this.colorTexture
-        );
+        this.colorRenderTarget = this.device.createRenderTargetFromTexture(this.colorTexture);
         this.width = width;
         this.height = height;
       }
@@ -67,9 +63,7 @@ var DeviceFramebuffer = class {
           depth.resize({ width, height });
         }
         this.depthTexture = depth.get();
-        this.depthRenderTarget = this.device.createRenderTargetFromTexture(
-          this.depthTexture
-        );
+        this.depthRenderTarget = this.device.createRenderTargetFromTexture(this.depthTexture);
         this.width = depth["width"];
         this.height = depth["height"];
       } else if (width && height) {
@@ -79,9 +73,7 @@ var DeviceFramebuffer = class {
           width,
           height
         });
-        this.depthRenderTarget = this.device.createRenderTargetFromTexture(
-          this.depthTexture
-        );
+        this.depthRenderTarget = this.device.createRenderTargetFromTexture(this.depthTexture);
         this.width = width;
         this.height = height;
       }

package/lib/device/DeviceModel.js

@@ -64,15 +64,7 @@ var DeviceModel = class {
     this.destroyed = false;
     this.uniforms = {};
     this.vertexBuffers = [];
-    const {
-      vs,
-      fs,
-      attributes,
-      uniforms,
-      count,
-      elements,
-      diagnosticDerivativeUniformityEnabled
-    } = options;
+    const { vs, fs, attributes, uniforms, count, elements, diagnosticDerivativeUniformityEnabled } = options;
     this.options = options;
     const diagnosticDerivativeUniformityHeader = diagnosticDerivativeUniformityEnabled ? "" : this.service["viewportOrigin"] === import_g_device_api.ViewportOrigin.UPPER_LEFT ? "diagnostic(off,derivative_uniformity);" : "";
     this.program = service.renderCache.createProgram({
@@ -300,9 +292,7 @@ var DeviceModel = class {
     this.pipeline.destroy();
     this.destroyed = true;
   }
-  initDepthDrawParams({
-    depth
-  }) {
+  initDepthDrawParams({ depth }) {
     if (depth) {
       return {
         enable: depth.enable === void 0 ? true : !!depth.enable,
@@ -312,9 +302,7 @@ var DeviceModel = class {
       };
     }
   }
-  getBlendDrawParams({
-    blend
-  }) {
+  getBlendDrawParams({ blend }) {
     const { enable, func, equation, color = [0, 0, 0, 0] } = blend || {};
     return {
       enable: !!enable,
@@ -334,9 +322,7 @@ var DeviceModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
    */
-  getStencilDrawParams({
-    stencil
-  }) {
+  getStencilDrawParams({ stencil }) {
     const {
       enable,
       mask = 4294967295,
@@ -379,9 +365,7 @@ var DeviceModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#culling
    */
-  initCullDrawParams({
-    cull
-  }) {
+  initCullDrawParams({ cull }) {
     if (cull) {
       const { enable, face = import_l7_core.gl.BACK } = cull;
       return {
@@ -398,12 +382,7 @@ var DeviceModel = class {
   extractUniforms(uniforms) {
     const extractedUniforms = {};
     Object.keys(uniforms).forEach((uniformName) => {
-      this.extractUniformsRecursively(
-        uniformName,
-        uniforms[uniformName],
-        extractedUniforms,
-        ""
-      );
+      this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, "");
     });
     return extractedUniforms;
   }

package/lib/device/index.js

@@ -266,12 +266,7 @@ var DeviceRendererService = class {
       // @ts-ignore
       (currentFramebuffer == null ? void 0 : currentFramebuffer.clearOptions) || {}
     );
-    const colorClearColor = colorAttachment ? (0, import_g_device_api.colorNewFromRGBA)(
-      color[0] * 255,
-      color[1] * 255,
-      color[2] * 255,
-      color[3]
-    ) : import_g_device_api.TransparentBlack;
+    const colorClearColor = colorAttachment ? (0, import_g_device_api.colorNewFromRGBA)(color[0] * 255, color[1] * 255, color[2] * 255, color[3]) : import_g_device_api.TransparentBlack;
     const depthClearValue = depthStencilAttachment ? depth : void 0;
     const stencilClearValue = depthStencilAttachment ? stencil : void 0;
     const renderPass = this.device.createRenderPass({

package/lib/regl/ReglModel.js

@@ -49,18 +49,7 @@ var ReglModel = class {
     this.destroyed = false;
     this.uniforms = {};
     this.reGl = reGl;
-    const {
-      vs,
-      fs,
-      attributes,
-      uniforms,
-      primitive,
-      count,
-      elements,
-      depth,
-      cull,
-      instances
-    } = options;
+    const { vs, fs, attributes, uniforms, primitive, count, elements, depth, cull, instances } = options;
     const vendorInfo = {
       platformString: "WebGL1",
       glslVersion: "#version 100",
@@ -198,9 +187,7 @@ var ReglModel = class {
       };
     }
   }
-  getBlendDrawParams({
-    blend
-  }) {
+  getBlendDrawParams({ blend }) {
     const { enable, func, equation, color = [0, 0, 0, 0] } = blend || {};
     return {
       enable: !!enable,
@@ -220,9 +207,7 @@ var ReglModel = class {
   /**
    * @see https://github.com/regl-project/regl/blob/gh-pages/API.md#stencil
    */
-  getStencilDrawParams({
-    stencil
-  }) {
+  getStencilDrawParams({ stencil }) {
     const {
       enable,
       mask = -1,
@@ -284,12 +269,7 @@ var ReglModel = class {
   extractUniforms(uniforms) {
     const extractedUniforms = {};
     Object.keys(uniforms).forEach((uniformName) => {
-      this.extractUniformsRecursively(
-        uniformName,
-        uniforms[uniformName],
-        extractedUniforms,
-        ""
-      );
+      this.extractUniformsRecursively(uniformName, uniforms[uniformName], extractedUniforms, "");
     });
     return extractedUniforms;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-renderer",
-  "version": "2.21.2",
+  "version": "2.21.4-beta.0",
   "description": "",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -12,26 +12,26 @@
     "lib",
     "es"
   ],
-  "scripts": {
-    "dev": "father dev",
-    "build": "npm run clean && father build",
-    "check-deps": "father doctor",
-    "lint": "eslint src __tests__",
-    "clean": "rimraf dist es lib",
-    "sync": "tnpm sync"
-  },
   "dependencies": {
     "@antv/g-device-api": "^1.6.4",
-    "@antv/l7-core": "^2.21.2",
-    "@antv/l7-utils": "^2.21.2",
     "@babel/runtime": "^7.7.7",
-    "regl": "1.6.1"
+    "regl": "1.6.1",
+    "@antv/l7-core": "2.21.4-beta.0",
+    "@antv/l7-utils": "2.21.4-beta.0"
   },
-  "devDependencies": {
-    "@antv/l7-test-utils": "^2.21.2"
+  "peerDependencies": {
+    "@antv/l7-test-utils": "2.21.4-beta.0"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "5c2d29d2ac1d631bdecf741cb1725316c0d6f9b9"
-}
+  "repository": "git@github.com:antvis/L7.git",
+  "scripts": {
+    "dev": "father dev",
+    "build": "npm run clean && father build",
+    "check-deps": "father doctor",
+    "lint": "eslint src __tests__",
+    "clean": "rimraf dist es lib"
+  }
+}