Release (#1670)

* feat: support ar in webxr (#1665) * feat: support ar in webxr * feat: each tick on canvas will pass webxr frame * chore: commit changeset * chore(release): bump version (#1669) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- 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 · Apr 24, 2024 · 520ff5e · 520ff5e
1 parent ee938ca
commit 520ff5e
Show file tree

Hide file tree

Showing 107 changed files with 1,055 additions and 219 deletions.
diff --git a/__tests__/demos/3d/index.ts b/__tests__/demos/3d/index.ts
@@ -3,3 +3,4 @@ export { sphere } from './sphere';
 export { torus } from './torus';
 export { cylinder } from './cylinder';
 export { force } from './force';
+export { ar } from './webar';
diff --git a/__tests__/demos/3d/webar.ts b/__tests__/demos/3d/webar.ts
@@ -0,0 +1,64 @@
+import { CanvasEvent } from '../../../packages/g';
+import {
+  MeshBasicMaterial,
+  CubeGeometry,
+  Mesh,
+  Plugin as Plugin3D,
+} from '../../../packages/g-plugin-3d';
+import { Plugin as PluginControl } from '../../../packages/g-plugin-control';
+import { ARButton, DeviceRenderer } from '../../../packages/g-webgl';
+
+export async function ar(context) {
+  const { canvas, renderer, container } = context;
+
+  // wait for canvas' initialization complete
+  await canvas.ready;
+
+  // use GPU device
+  const plugin = renderer.getPlugin('device-renderer') as DeviceRenderer.Plugin;
+  const device = plugin.getDevice();
+
+  // 1. load texture with URL
+  const map = plugin.loadTexture(
+    'https://gw.alipayobjects.com/mdn/rms_6ae20b/afts/img/A*_aqoS73Se3sAAAAAAAAAAAAAARQnAQ',
+  );
+
+  const cubeGeometry = new CubeGeometry(device, {
+    width: 200,
+    height: 200,
+    depth: 200,
+  });
+  const basicMaterial = new MeshBasicMaterial(device, {
+    // wireframe: true,
+    map,
+  });
+
+  const cube = new Mesh({
+    style: {
+      fill: '#1890FF',
+      opacity: 1,
+      geometry: cubeGeometry,
+      material: basicMaterial,
+    },
+  });
+
+  cube.setPosition(300, 250, 200);
+
+  canvas.appendChild(cube);
+
+  canvas.addEventListener(CanvasEvent.AFTER_RENDER, () => {
+    cube.rotate(1, 0, 0);
+  });
+
+  canvas.getConfig().disableHitTesting = true;
+
+  const $button = ARButton.createButton(canvas, renderer, {});
+  container.appendChild($button);
+}
+
+ar.initRenderer = (renderer, type) => {
+  if (type === 'webgl' || type === 'webgpu') {
+    renderer.registerPlugin(new Plugin3D());
+    renderer.registerPlugin(new PluginControl());
+  }
+};
diff --git a/__tests__/main.ts b/__tests__/main.ts
@@ -189,6 +189,7 @@ function createSpecRender(object) {
         ],
         // Used for WebGPU renderer
         shaderCompilerPath: '/glsl_wgsl_compiler_bg.wasm',
+        // enableAutoRendering: false,
         // enableDirtyRectangleRendering: false,
         // enableDirtyRectangleRenderingDebug: true,
       });

diff --git a/packages/g-camera-api/CHANGELOG.md b/packages/g-camera-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-camera-api
 
+## 2.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/g-camera-api/package.json b/packages/g-camera-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-camera-api",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A simple implementation of Camera API.",
   "keywords": [
     "antv",

diff --git a/packages/g-canvas/CHANGELOG.md b/packages/g-canvas/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @antv/g-canvas
 
+## 2.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+    -   @antv/g-plugin-canvas-path-generator@2.0.2
+    -   @antv/g-plugin-canvas-picker@2.0.2
+    -   @antv/g-plugin-canvas-renderer@2.0.2
+    -   @antv/g-plugin-dom-interaction@2.0.2
+    -   @antv/g-plugin-html-renderer@2.0.2
+    -   @antv/g-plugin-image-loader@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/g-canvas/package.json b/packages/g-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvas",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A renderer implemented by Canvas 2D API",
   "keywords": [
     "antv",

diff --git a/packages/g-canvaskit/CHANGELOG.md b/packages/g-canvaskit/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @antv/g-canvaskit
 
+## 1.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+    -   @antv/g-plugin-canvas-path-generator@2.0.2
+    -   @antv/g-plugin-canvas-picker@2.0.2
+    -   @antv/g-plugin-canvaskit-renderer@2.0.2
+    -   @antv/g-plugin-dom-interaction@2.0.2
+    -   @antv/g-plugin-html-renderer@2.0.2
+    -   @antv/g-plugin-image-loader@2.0.2
+
 ## 1.0.1
 
 ### Patch Changes

diff --git a/packages/g-canvaskit/package.json b/packages/g-canvaskit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvaskit",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A renderer implemented by CanvasKit",
   "keywords": [
     "antv",

diff --git a/packages/g-components/CHANGELOG.md b/packages/g-components/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-components
 
+## 2.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/g-components/package.json b/packages/g-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-components",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Components for g",
   "keywords": [
     "antv",

diff --git a/packages/g-dom-mutation-observer-api/CHANGELOG.md b/packages/g-dom-mutation-observer-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-dom-mutation-observer-api
 
+## 2.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/g-dom-mutation-observer-api/package.json b/packages/g-dom-mutation-observer-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-dom-mutation-observer-api",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A simple implementation of DOM MutationObserver API.",
   "keywords": [
     "antv",

diff --git a/packages/g-gesture/CHANGELOG.md b/packages/g-gesture/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-gesture
 
+## 3.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 3.0.1
 
 ### Patch Changes

diff --git a/packages/g-gesture/package.json b/packages/g-gesture/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-gesture",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "G Gesture",
   "keywords": [
     "antv",

diff --git a/packages/g-image-exporter/CHANGELOG.md b/packages/g-image-exporter/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-image-exporter
 
+## 1.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 1.0.1
 
 ### Patch Changes

diff --git a/packages/g-image-exporter/package.json b/packages/g-image-exporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-image-exporter",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A image exporter for G using DOM API",
   "keywords": [
     "antv",

diff --git a/packages/g-lite/CHANGELOG.md b/packages/g-lite/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-lite
 
+## 2.0.2
+
+### Patch Changes
+
+-   2948b0f8: Pass webxr frame on each tick when rendering.
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/packages/g-lite/package.json b/packages/g-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-lite",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A core module for rendering engine implements DOM API.",
   "keywords": [
     "antv",
@@ -53,7 +53,8 @@
     "@types/d3-color": "^3.0.2",
     "@types/gl-matrix": "^2.4.5",
     "@types/offscreencanvas": "^2019.6.4",
-    "@types/rbush": "^3.0.0"
+    "@types/rbush": "^3.0.0",
+    "@types/webxr": "0.5.5"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/g-lite/src/Canvas.ts b/packages/g-lite/src/Canvas.ts
@@ -481,11 +481,11 @@ export class Canvas extends EventTarget implements ICanvas {
     this.document.documentElement.destroyChildren();
   }
 
-  render() {
+  render(frame?: XRFrame) {
     this.dispatchEvent(beforeRenderEvent);
 
     const renderingService = this.getRenderingService();
-    renderingService.render(this.getConfig(), () => {
+    renderingService.render(this.getConfig(), frame, () => {
       // trigger actual rerender event
       // @see https://github.com/antvis/G/issues/1268
       this.dispatchEvent(rerenderEvent);
@@ -495,11 +495,11 @@ export class Canvas extends EventTarget implements ICanvas {
   }
 
   private run() {
-    const tick = () => {
-      this.render();
+    const tick = (time: number, frame?: XRFrame) => {
+      this.render(frame);
       this.frameId = this.requestAnimationFrame(tick);
     };
-    tick();
+    tick(0);
   }
 
   private initRenderer(renderer: IRenderer, firstContentfullPaint = false) {

diff --git a/packages/g-lite/src/camera/Camera.ts b/packages/g-lite/src/camera/Camera.ts
@@ -305,6 +305,13 @@ export class Camera implements ICamera {
     return this;
   }
 
+  /**
+   * Set projection matrix manually.
+   */
+  setProjectionMatrix(matrix: mat4) {
+    this.projectionMatrix = matrix;
+  }
+
   setFov(fov: number) {
     this.setPerspective(this.near, this.far, fov, this.aspect);
     return this;

diff --git a/packages/g-lite/src/services/RenderingService.ts b/packages/g-lite/src/services/RenderingService.ts
@@ -84,7 +84,7 @@ export class RenderingService {
     /**
      * called at beginning of each frame, won't get called if nothing to re-render
      */
-    beginFrame: new SyncHook<[]>(),
+    beginFrame: new SyncHook<[XRFrame]>(),
     /**
      * called before every dirty object get rendered
      */
@@ -97,7 +97,7 @@ export class RenderingService {
      * called after every dirty object get rendered
      */
     afterRender: new SyncHook<[DisplayObject]>(),
-    endFrame: new SyncHook<[]>(),
+    endFrame: new SyncHook<[XRFrame]>(),
     destroy: new SyncHook<[]>(),
     /**
      * use async but faster method such as GPU-based picking in `g-plugin-device-renderer`
@@ -161,7 +161,11 @@ export class RenderingService {
     );
   }
 
-  render(canvasConfig: Partial<CanvasConfig>, rerenderCallback: () => void) {
+  render(
+    canvasConfig: Partial<CanvasConfig>,
+    frame: XRFrame,
+    rerenderCallback: () => void,
+  ) {
     this.stats.total = 0;
     this.stats.rendered = 0;
     this.zIndexCounter = 0;
@@ -191,7 +195,7 @@ export class RenderingService {
         );
       }
 
-      this.hooks.beginFrame.call();
+      this.hooks.beginFrame.call(frame);
 
       if (shouldTriggerRenderHooks) {
         renderingContext.renderListCurrentFrame.forEach((object) => {
@@ -201,7 +205,7 @@ export class RenderingService {
         });
       }
 
-      this.hooks.endFrame.call();
+      this.hooks.endFrame.call(frame);
       renderingContext.renderListCurrentFrame = [];
       renderingContext.renderReasons.clear();
 

diff --git a/packages/g-lottie-player/CHANGELOG.md b/packages/g-lottie-player/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-lottie-player
 
+## 1.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 1.0.1
 
 ### Patch Changes

diff --git a/packages/g-lottie-player/package.json b/packages/g-lottie-player/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-lottie-player",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A lottie player for G",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-canvas-element/CHANGELOG.md b/packages/g-mobile-canvas-element/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-mobile-canvas-element
 
+## 1.0.2
+
+### Patch Changes
+
+-   Updated dependencies [2948b0f8]
+    -   @antv/g-lite@2.0.2
+
 ## 1.0.1
 
 ### Patch Changes