Merge e2b7b3d into b68c0dd

antvis · May 23, 2023 · 419704b · 419704b
2 parents b68c0dd + e2b7b3d
commit 419704b
Show file tree

Hide file tree

Showing 75 changed files with 376 additions and 191 deletions.
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": "1.0.38",
+  "version": "1.0.39",
   "description": "A simple implementation of Camera API.",
   "keywords": [
     "antv",

diff --git a/packages/g-canvas/package.json b/packages/g-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvas",
-  "version": "1.9.44",
+  "version": "1.9.45",
   "description": "A renderer implemented by Canvas 2D API",
   "keywords": [
     "antv",
@@ -32,12 +32,12 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-plugin-canvas-path-generator": "^1.1.49",
-    "@antv/g-plugin-canvas-picker": "^1.8.48",
-    "@antv/g-plugin-canvas-renderer": "^1.7.56",
-    "@antv/g-plugin-dom-interaction": "^1.7.48",
-    "@antv/g-plugin-html-renderer": "^1.7.52",
-    "@antv/g-plugin-image-loader": "^1.1.50",
+    "@antv/g-plugin-canvas-path-generator": "^1.1.50",
+    "@antv/g-plugin-canvas-picker": "^1.8.49",
+    "@antv/g-plugin-canvas-renderer": "^1.7.57",
+    "@antv/g-plugin-dom-interaction": "^1.7.49",
+    "@antv/g-plugin-html-renderer": "^1.7.53",
+    "@antv/g-plugin-image-loader": "^1.1.51",
     "@antv/util": "^3.3.1",
     "@types/offscreencanvas": "^2019.6.4",
     "tslib": "^2.3.1"

diff --git a/packages/g-canvaskit/package.json b/packages/g-canvaskit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-canvaskit",
-  "version": "0.8.41",
+  "version": "0.8.42",
   "description": "A renderer implemented by CanvasKit",
   "keywords": [
     "antv",
@@ -32,12 +32,12 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-plugin-canvas-path-generator": "^1.1.49",
-    "@antv/g-plugin-canvas-picker": "^1.8.48",
-    "@antv/g-plugin-canvaskit-renderer": "^1.1.50",
-    "@antv/g-plugin-dom-interaction": "^1.7.48",
-    "@antv/g-plugin-html-renderer": "^1.7.52",
-    "@antv/g-plugin-image-loader": "^1.1.50",
+    "@antv/g-plugin-canvas-path-generator": "^1.1.50",
+    "@antv/g-plugin-canvas-picker": "^1.8.49",
+    "@antv/g-plugin-canvaskit-renderer": "^1.1.51",
+    "@antv/g-plugin-dom-interaction": "^1.7.49",
+    "@antv/g-plugin-html-renderer": "^1.7.53",
+    "@antv/g-plugin-image-loader": "^1.1.51",
     "@antv/util": "^3.3.1",
     "canvaskit-wasm": "^0.34.0",
     "tslib": "^2.3.1"

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

diff --git a/packages/g-css-layout-api/package.json b/packages/g-css-layout-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-css-layout-api",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "A simple implementation of CSS Layout API.",
   "keywords": [
     "antv",

diff --git a/packages/g-css-typed-om-api/package.json b/packages/g-css-typed-om-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-css-typed-om-api",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "A simple implementation of CSS Typed OM API.",
   "keywords": [
     "antv",

diff --git a/packages/g-devtool/package.json b/packages/g-devtool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-devtool",
-  "version": "0.10.47",
+  "version": "0.10.48",
   "private": true,
   "description": "devtool for g in browser",
   "license": "MIT",

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": "1.0.36",
+  "version": "1.0.37",
   "description": "A simple implementation of DOM MutationObserver API.",
   "keywords": [
     "antv",

diff --git a/packages/g-gesture/package.json b/packages/g-gesture/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-gesture",
-  "version": "0.0.79",
+  "version": "0.0.80",
   "description": "G Gesture",
   "keywords": [
     "antv",
@@ -34,8 +34,8 @@
     "eventemitter3": "^4.0.0"
   },
   "devDependencies": {
-    "@antv/g-mobile-canvas": "^0.8.52",
-    "@antv/g-mobile-canvas-element": "^0.6.47"
+    "@antv/g-mobile-canvas": "^0.8.53",
+    "@antv/g-mobile-canvas-element": "^0.6.48"
   },
   "peerDependencies": {
     "@antv/g-lite": "^1.0.0"

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": "0.5.48",
+  "version": "0.5.49",
   "description": "A image exporter for G using DOM API",
   "keywords": [
     "antv",

diff --git a/packages/g-layout-blocklike/package.json b/packages/g-layout-blocklike/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-layout-blocklike",
-  "version": "1.7.47",
+  "version": "1.7.48",
   "description": "A blocklike layout",
   "keywords": [
     "antv",

diff --git a/packages/g-lite/package.json b/packages/g-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-lite",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "A core module for rendering engine implements DOM API.",
   "keywords": [
     "antv",
@@ -32,7 +32,7 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-math": "^1.7.47",
+    "@antv/g-math": "^1.7.48",
     "@antv/util": "^3.3.1",
     "@types/offscreencanvas": "^2019.6.4",
     "d3-color": "^1.4.0",

diff --git a/packages/g-lite/src/css/StyleValueRegistry.ts b/packages/g-lite/src/css/StyleValueRegistry.ts
@@ -332,6 +332,12 @@ export const BUILT_IN_PROPERTIES: PropertyMetadata[] = [
     d: '0',
     syntax: PropertySyntax.COORDINATE,
   },
+  {
+    n: 'cz',
+    int: true,
+    d: '0',
+    syntax: PropertySyntax.COORDINATE,
+  },
   {
     n: 'r',
     int: true,
@@ -1281,6 +1287,8 @@ export class DefaultStyleValueRegistry implements StyleValueRegistry {
       // <Text> use textAlign & textBaseline instead of anchor
       if (nodeName === Shape.TEXT) {
         delete parsedStyle.anchor;
+      } else if (nodeName === Shape.MESH) {
+        parsedStyle.anchor[2] = 0.5;
       }
 
       const center: Tuple3Number = [

diff --git a/packages/g-lite/src/css/properties/CSSPropertyLocalPosition.ts b/packages/g-lite/src/css/properties/CSSPropertyLocalPosition.ts
@@ -30,13 +30,16 @@ export class CSSPropertyLocalPosition
     switch (object.nodeName) {
       case Shape.CIRCLE:
       case Shape.ELLIPSE:
-        const { cx, cy } = (object as Circle).parsedStyle;
+        const { cx, cy, cz } = (object as Circle).parsedStyle;
         if (!isNil(cx)) {
           x = cx;
         }
         if (!isNil(cy)) {
           y = cy;
         }
+        if (!isNil(cz)) {
+          z = cz;
+        }
         break;
       case Shape.LINE:
         const { x1, x2, y1, y2 } = (object as Line).parsedStyle;

diff --git a/packages/g-lite/src/display-objects/Circle.ts b/packages/g-lite/src/display-objects/Circle.ts
@@ -8,12 +8,16 @@ import { DisplayObject } from './DisplayObject';
 export interface CircleStyleProps extends BaseStyleProps {
   cx?: number | string | null;
   cy?: number | string | null;
+  cz?: number | string | null;
   r: number | string | null;
+  isBillboard?: boolean;
 }
 export interface ParsedCircleStyleProps extends ParsedBaseStyleProps {
   cx: number;
   cy: number;
+  cz?: number;
   r: number;
+  isBillboard?: boolean;
 }
 export class Circle extends DisplayObject<
   CircleStyleProps,

diff --git a/packages/g-lite/src/display-objects/Ellipse.ts b/packages/g-lite/src/display-objects/Ellipse.ts
@@ -8,14 +8,18 @@ import { DisplayObject } from './DisplayObject';
 export interface EllipseStyleProps extends BaseStyleProps {
   cx?: number | string;
   cy?: number | string;
+  cz?: number | string;
   rx: number | string;
   ry: number | string;
+  isBillboard?: boolean;
 }
 export interface ParsedEllipseStyleProps extends ParsedBaseStyleProps {
   cx: number;
   cy: number;
+  cz?: number;
   rx: number;
   ry: number;
+  isBillboard?: boolean;
 }
 export class Ellipse extends DisplayObject<
   EllipseStyleProps,

diff --git a/packages/g-lite/src/display-objects/Rect.ts b/packages/g-lite/src/display-objects/Rect.ts
@@ -7,8 +7,10 @@ import { DisplayObject } from './DisplayObject';
 export interface RectStyleProps extends BaseStyleProps {
   x?: number | string;
   y?: number | string;
+  z?: number;
   width: number | string;
   height: number | string;
+  isBillboard?: boolean;
   /**
    * top-left, top-right, bottom-right, bottom-left
    */
@@ -18,8 +20,10 @@ export interface RectStyleProps extends BaseStyleProps {
 export interface ParsedRectStyleProps extends ParsedBaseStyleProps {
   x?: number;
   y?: number;
+  z?: number;
   width: number;
   height: number;
+  isBillboard?: boolean;
   radius?: [number, number, number, number];
 }
 

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": "0.0.36",
+  "version": "0.0.37",
   "description": "A lottie player for G",
   "keywords": [
     "antv",

diff --git a/packages/g-math/package.json b/packages/g-math/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-math",
-  "version": "1.7.47",
+  "version": "1.7.48",
   "description": "Geometry util",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-canvas-element/package.json b/packages/g-mobile-canvas-element/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-canvas-element",
-  "version": "0.6.47",
+  "version": "0.6.48",
   "description": "Create a CanvasLike element from existed context in mobile environment",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-canvas/package.json b/packages/g-mobile-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-canvas",
-  "version": "0.8.52",
+  "version": "0.8.53",
   "description": "A renderer implemented with Canvas2D API in mobile environment",
   "keywords": [
     "antv",
@@ -30,11 +30,11 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-plugin-canvas-path-generator": "^1.1.49",
-    "@antv/g-plugin-canvas-picker": "^1.8.48",
-    "@antv/g-plugin-canvas-renderer": "^1.7.56",
-    "@antv/g-plugin-image-loader": "^1.1.50",
-    "@antv/g-plugin-mobile-interaction": "^0.7.47",
+    "@antv/g-plugin-canvas-path-generator": "^1.1.50",
+    "@antv/g-plugin-canvas-picker": "^1.8.49",
+    "@antv/g-plugin-canvas-renderer": "^1.7.57",
+    "@antv/g-plugin-image-loader": "^1.1.51",
+    "@antv/g-plugin-mobile-interaction": "^0.7.48",
     "@antv/util": "^3.3.1",
     "tslib": "^2.3.1"
   },

diff --git a/packages/g-mobile-svg/package.json b/packages/g-mobile-svg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-mobile-svg",
-  "version": "0.8.56",
+  "version": "0.8.57",
   "description": "A renderer implemented by SVG in mobile environment",
   "keywords": [
     "antv",
@@ -30,9 +30,9 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-plugin-mobile-interaction": "^0.7.47",
-    "@antv/g-plugin-svg-picker": "^1.7.49",
-    "@antv/g-plugin-svg-renderer": "^1.8.56",
+    "@antv/g-plugin-mobile-interaction": "^0.7.48",
+    "@antv/g-plugin-svg-picker": "^1.7.50",
+    "@antv/g-plugin-svg-renderer": "^1.8.57",
     "@antv/util": "^3.3.1",
     "tslib": "^2.3.1"
   },

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.7.64",
+  "version": "0.7.66",
   "description": "A renderer implemented by WebGL1/2 in mobile environment",
   "keywords": [
     "antv",
@@ -30,12 +30,12 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-plugin-device-renderer": "^1.7.60",
-    "@antv/g-plugin-dragndrop": "^1.6.47",
-    "@antv/g-plugin-html-renderer": "^1.7.52",
-    "@antv/g-plugin-image-loader": "^1.1.50",
-    "@antv/g-plugin-mobile-interaction": "^0.7.47",
-    "@antv/g-plugin-webgl-device": "^1.7.49",
+    "@antv/g-plugin-device-renderer": "^1.7.62",
+    "@antv/g-plugin-dragndrop": "^1.6.48",
+    "@antv/g-plugin-html-renderer": "^1.7.53",
+    "@antv/g-plugin-image-loader": "^1.1.51",
+    "@antv/g-plugin-mobile-interaction": "^0.7.48",
+    "@antv/g-plugin-webgl-device": "^1.7.50",
     "@antv/util": "^3.3.1"
   },
   "devDependencies": {

diff --git a/packages/g-pattern/package.json b/packages/g-pattern/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-pattern",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "A pattern libs for G",
   "keywords": [
     "antv",

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.7.49",
+  "version": "1.7.51",
   "description": "Provide 3D extension for G",
   "keywords": [
     "antv",
@@ -30,7 +30,7 @@
     "sync": "tnpm sync"
   },
   "dependencies": {
-    "@antv/g-shader-components": "^1.7.47",
+    "@antv/g-shader-components": "^1.7.49",
     "gl-matrix": "^3.1.0",
     "tslib": "^2.3.1"
   },