Release (#1526)

* feat: export webgl & webgpu device #1505 (#1510) * feat: export webgl & webgpu device #1505 * feat: use setVertexInput instead of inputState * feat: modify createProgram interface in Device API #1505 * fix: allow default values in createTexture & megaState #1505 * feat: support msaa in webgl2 & webgpu #1505 * fix: use latest gfx-naga in webgpu #1505 * feat: setImageData in webgpu #1505 * fix: adjust setImageData params #1505 * chore: commit changeset * feat: 取消react-g的log打印 (#1523) 取消react-g的log打印 * chore: commit changeset * fix: antialiasing SDF & Text #1522 (#1525) * feat: export webgl & webgpu device #1505 (#1510) * feat: export webgl & webgpu device #1505 * feat: use setVertexInput instead of inputState * feat: modify createProgram interface in Device API #1505 * fix: allow default values in createTexture & megaState #1505 * feat: support msaa in webgl2 & webgpu #1505 * fix: use latest gfx-naga in webgpu #1505 * feat: setImageData in webgpu #1505 * fix: adjust setImageData params #1505 * chore: commit changeset * feat: 取消react-g的log打印 (#1523) 取消react-g的log打印 * chore: commit changeset * fix: antialiasing SDF & Text #1522 --------- Co-authored-by: Torres Wang <[email protected]> * chore: lint * chore(release): bump version (#1524) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore: update webgl snapshots --------- Co-authored-by: Torres Wang <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
antvis · Sep 11, 2023 · 0b59e28 · 0b59e28
1 parent 189708e
commit 0b59e28
Show file tree

Hide file tree

Showing 144 changed files with 5,274 additions and 1,882 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,4 +6,5 @@ dist
 node_modules
 rollup.config.js
 site
+rust
 __tests__
diff --git a/__tests__/integration/__node__tests__/webgl/material.spec.js b/__tests__/integration/__node__tests__/webgl/material.spec.js
@@ -81,7 +81,7 @@ describe('Render custom material with g-webgl', () => {
     bufferGeometry.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.POSITION,
       byteStride: 4 * 3,
-      frequency: VertexBufferFrequency.PerVertex,
+      frequency: VertexBufferFrequency.VERTEX,
       attributes: [
         {
           format: Format.F32_RGB,

diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/circle.png b/__tests__/integration/__node__tests__/webgl/snapshots/circle.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/d3-barchart.png b/__tests__/integration/__node__tests__/webgl/snapshots/d3-barchart.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/d3-linechart.png b/__tests__/integration/__node__tests__/webgl/snapshots/d3-linechart.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/d3-scatterchart.png b/__tests__/integration/__node__tests__/webgl/snapshots/d3-scatterchart.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/ellipse.png b/__tests__/integration/__node__tests__/webgl/snapshots/ellipse.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/rect.png b/__tests__/integration/__node__tests__/webgl/snapshots/rect.png
diff --git a/__tests__/integration/__node__tests__/webgl/snapshots/text.png b/__tests__/integration/__node__tests__/webgl/snapshots/text.png
diff --git a/packages/g-mobile-webgl/CHANGELOG.md b/packages/g-mobile-webgl/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @antv/g-mobile-webgl
 
+## 0.9.20
+
+### Patch Changes
+
+-   Updated dependencies [c54cc6fb]
+-   Updated dependencies [568ec0f4]
+    -   @antv/g-plugin-device-renderer@1.9.17
+    -   @antv/g-plugin-webgl-device@1.9.17
+
 ## 0.9.19
 
 ### Patch Changes

diff --git a/packages/g-mobile-webgl/package.json b/packages/g-mobile-webgl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-webgl",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "A renderer implemented by WebGL1/2 in mobile environment",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-3d/CHANGELOG.md b/packages/g-plugin-3d/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @antv/g-plugin-3d
 
+## 1.9.17
+
+### Patch Changes
+
+-   c54cc6fb: Antialiasing SDF & Text.
+-   568ec0f4: Export Device API in webgl & webgpu.
+-   Updated dependencies [c54cc6fb]
+-   Updated dependencies [568ec0f4]
+    -   @antv/g-plugin-device-renderer@1.9.17
+
 ## 1.9.16
 
 ### Patch Changes

diff --git a/packages/g-plugin-3d/package.json b/packages/g-plugin-3d/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-plugin-3d",
-  "version": "1.9.16",
+  "version": "1.9.17",
   "description": "Provide 3D extension for G",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-3d/src/geometries/ProceduralGeometry.ts b/packages/g-plugin-3d/src/geometries/ProceduralGeometry.ts
@@ -4,7 +4,7 @@ import {
   Format,
   VertexAttributeBufferIndex,
   VertexAttributeLocation,
-  VertexBufferFrequency,
+  VertexStepMode,
 } from '@antv/g-plugin-device-renderer';
 import type { Device } from '@antv/g-plugin-device-renderer';
 import { mat4, vec3, vec4 } from 'gl-matrix';
@@ -139,7 +139,7 @@ export abstract class ProceduralGeometry<
     this.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.POSITION,
       byteStride: 4 * 3,
-      frequency: VertexBufferFrequency.PerVertex,
+      stepMode: VertexStepMode.VERTEX,
       attributes: [
         {
           format: Format.F32_RGB,
@@ -152,7 +152,7 @@ export abstract class ProceduralGeometry<
     this.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.NORMAL,
       byteStride: 4 * 3,
-      frequency: VertexBufferFrequency.PerVertex,
+      stepMode: VertexStepMode.VERTEX,
       attributes: [
         {
           format: Format.F32_RGB,
@@ -165,7 +165,7 @@ export abstract class ProceduralGeometry<
     this.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.UV,
       byteStride: 4 * 2,
-      frequency: VertexBufferFrequency.PerVertex,
+      stepMode: VertexStepMode.VERTEX,
       attributes: [
         {
           format: Format.F32_RG,

diff --git a/packages/g-plugin-3d/src/index.ts b/packages/g-plugin-3d/src/index.ts
@@ -10,7 +10,7 @@ import {
   Fog,
   FogType,
   Format,
-  FrontFaceMode,
+  FrontFace,
   GL,
   Light,
   Material,
@@ -24,7 +24,7 @@ import {
   TextureUsage,
   VertexAttributeBufferIndex,
   VertexAttributeLocation,
-  VertexBufferFrequency,
+  VertexStepMode,
   WrapMode,
 } from '@antv/g-plugin-device-renderer';
 
@@ -42,7 +42,7 @@ export {
   Fog,
   FogType,
   Format,
-  FrontFaceMode,
+  FrontFace,
   Light,
   Material,
   Mesh,
@@ -56,7 +56,7 @@ export {
   GL,
   VertexAttributeBufferIndex,
   VertexAttributeLocation,
-  VertexBufferFrequency,
+  VertexStepMode,
   WrapMode,
 };
 

diff --git a/packages/g-plugin-3d/src/materials/MeshBasicMaterial.ts b/packages/g-plugin-3d/src/materials/MeshBasicMaterial.ts
@@ -62,7 +62,7 @@ export class MeshBasicMaterial<
     super(device, {
       vertexShader: vert,
       fragmentShader: frag,
-      cullMode: CullMode.Back,
+      cullMode: CullMode.BACK,
       ...props,
     });
 

diff --git a/packages/g-plugin-3d/src/materials/PointMaterial.ts b/packages/g-plugin-3d/src/materials/PointMaterial.ts
@@ -1,4 +1,8 @@
-import type { IMaterial, Texture, Device } from '@antv/g-plugin-device-renderer';
+import type {
+  IMaterial,
+  Texture,
+  Device,
+} from '@antv/g-plugin-device-renderer';
 import { Material, CullMode } from '@antv/g-plugin-device-renderer';
 import vert from '../shaders/point.vert';
 import frag from '../shaders/point.frag';
@@ -57,7 +61,7 @@ export class PointMaterial<T extends IPointMaterial> extends Material<T> {
     super(device, {
       vertexShader: vert,
       fragmentShader: frag,
-      cullMode: CullMode.Back,
+      cullMode: CullMode.BACK,
       ...props,
     });
 

diff --git a/packages/g-plugin-device-renderer/CHANGELOG.md b/packages/g-plugin-device-renderer/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-plugin-device-renderer
 
+## 1.9.17
+
+### Patch Changes
+
+-   c54cc6fb: Antialiasing SDF & Text.
+-   568ec0f4: Export Device API in webgl & webgpu.
+
 ## 1.9.16
 
 ### Patch Changes

diff --git a/packages/g-plugin-device-renderer/package.json b/packages/g-plugin-device-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-plugin-device-renderer",
-  "version": "1.9.16",
+  "version": "1.9.17",
   "description": "A G plugin of renderer implementation with GPUDevice",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-device-renderer/src/PickingPlugin.ts b/packages/g-plugin-device-renderer/src/PickingPlugin.ts
@@ -316,12 +316,12 @@ export class PickingPlugin implements RenderingPlugin {
           depthWrite: true,
         },
         {
-          rgbBlendMode: BlendMode.Add,
-          rgbBlendSrcFactor: BlendFactor.One,
-          rgbBlendDstFactor: BlendFactor.Zero,
-          alphaBlendMode: BlendMode.Add,
-          alphaBlendSrcFactor: BlendFactor.One,
-          alphaBlendDstFactor: BlendFactor.Zero,
+          rgbBlendMode: BlendMode.ADD,
+          rgbBlendSrcFactor: BlendFactor.ONE,
+          rgbBlendDstFactor: BlendFactor.ZERO,
+          alphaBlendMode: BlendMode.ADD,
+          alphaBlendSrcFactor: BlendFactor.ONE,
+          alphaBlendDstFactor: BlendFactor.ZERO,
         },
       ),
     );

diff --git a/packages/g-plugin-device-renderer/src/RenderGraphPlugin.ts b/packages/g-plugin-device-renderer/src/RenderGraphPlugin.ts
@@ -235,6 +235,8 @@ export class RenderGraphPlugin implements RenderingPlugin {
 
     renderingService.hooks.destroy.tap(RenderGraphPlugin.tag, () => {
       this.renderHelper.destroy();
+      this.batchManager.destroy();
+      this.texturePool.destroy();
 
       canvas.removeEventListener(ElementEvent.MOUNTED, handleMounted);
       canvas.removeEventListener(ElementEvent.UNMOUNTED, handleUnmounted);
@@ -246,6 +248,9 @@ export class RenderGraphPlugin implements RenderingPlugin {
         ElementEvent.BOUNDS_CHANGED,
         handleBoundsChanged,
       );
+
+      this.device.destroy();
+      this.device.checkForLeaks();
     });
 
     /**
@@ -355,12 +360,12 @@ export class RenderGraphPlugin implements RenderingPlugin {
             blendConstant: TransparentBlack,
           },
           {
-            rgbBlendMode: BlendMode.Add,
-            alphaBlendMode: BlendMode.Add,
-            rgbBlendSrcFactor: BlendFactor.SrcAlpha,
-            alphaBlendSrcFactor: BlendFactor.One,
-            rgbBlendDstFactor: BlendFactor.OneMinusSrcAlpha,
-            alphaBlendDstFactor: BlendFactor.OneMinusSrcAlpha,
+            rgbBlendMode: BlendMode.ADD,
+            alphaBlendMode: BlendMode.ADD,
+            rgbBlendSrcFactor: BlendFactor.SRC_ALPHA,
+            alphaBlendSrcFactor: BlendFactor.ONE,
+            rgbBlendDstFactor: BlendFactor.ONE_MINUS_SRC_ALPHA,
+            alphaBlendDstFactor: BlendFactor.ONE_MINUS_SRC_ALPHA,
           },
         ),
       );

diff --git a/packages/g-plugin-device-renderer/src/TexturePool.ts b/packages/g-plugin-device-renderer/src/TexturePool.ts
@@ -50,8 +50,8 @@ export class TexturePool {
         height: 1,
         depth: 1,
         numLevels: 1,
-        dimension: TextureDimension.n2D,
-        usage: TextureUsage.Sampled,
+        dimension: TextureDimension.TEXTURE_2D,
+        usage: TextureUsage.SAMPLED,
         pixelStore: {
           unpackFlipY: false,
         },
@@ -64,7 +64,7 @@ export class TexturePool {
       }
 
       if (!isString(src)) {
-        texture.setImageData(src);
+        texture.setImageData([src]);
         texture.emit(TextureEvent.LOADED);
         this.context.renderingService.dirtify();
       } else {
@@ -81,7 +81,7 @@ export class TexturePool {
         if (image) {
           image.onload = () => {
             const onSuccess = (bitmap: ImageBitmap | HTMLImageElement) => {
-              this.textureCache[id].setImageData(bitmap);
+              this.textureCache[id].setImageData([bitmap]);
               this.textureCache[id].emit(TextureEvent.LOADED);
               this.context.renderingService.dirtify();
               if (successCallback) {

diff --git a/packages/g-plugin-device-renderer/src/drawcalls/Image.ts b/packages/g-plugin-device-renderer/src/drawcalls/Image.ts
@@ -4,7 +4,7 @@ import {
   VertexAttributeBufferIndex,
   VertexAttributeLocation,
 } from './Instanced';
-import { Format, VertexBufferFrequency } from '../platform';
+import { Format, VertexStepMode } from '../platform';
 import frag from '../shader/image.frag';
 import vert from '../shader/image.vert';
 import { enumToObject } from '../utils';
@@ -79,7 +79,7 @@ export class ImageDrawcall extends Instanced {
     this.geometry.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.POSITION,
       byteStride: 4 * 2,
-      frequency: VertexBufferFrequency.PerInstance,
+      stepMode: VertexStepMode.INSTANCE,
       attributes: [
         {
           format: Format.F32_RG,
@@ -92,7 +92,7 @@ export class ImageDrawcall extends Instanced {
     this.geometry.setVertexBuffer({
       bufferIndex: ImageVertexAttributeBufferIndex.PACKED_STYLE,
       byteStride: 4 * 4,
-      frequency: VertexBufferFrequency.PerInstance,
+      stepMode: VertexStepMode.INSTANCE,
       attributes: [
         {
           format: Format.F32_RGBA,
@@ -106,7 +106,7 @@ export class ImageDrawcall extends Instanced {
     this.geometry.setVertexBuffer({
       bufferIndex: VertexAttributeBufferIndex.UV,
       byteStride: 4 * 2,
-      frequency: VertexBufferFrequency.PerVertex,
+      stepMode: VertexStepMode.VERTEX,
       attributes: [
         {
           format: Format.F32_RG,