Release (#1450)

* fix: merge anchor into modelmatrix #1440 (#1441) * fix: merge anchor into modelmatrix #1440 * chore: commit changeset * fix: billboard effect should work for Line under ortho camera #1442 * fix: dashline should be displayed as same as Canvas / SVG #1446 * chore: commit changeset * fix: 手势事件因为冒泡而多次绑定 (#1448) * chore: commit changeset --------- Co-authored-by: zengyue ye <[email protected]> * chore(release): bump version (#1449) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: zengyue ye <[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 · Jul 31, 2023 · deaa7d8 · deaa7d8
1 parent 586f3d7
commit deaa7d8
Show file tree

Hide file tree

Showing 27 changed files with 258 additions and 14 deletions.
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/line.png b/__tests__/integration/__node__tests__/webgl/snapshots/line.png
diff --git a/packages/g-gesture/CHANGELOG.md b/packages/g-gesture/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-gesture
 
+## 2.2.8
+
+### Patch Changes
+
+-   d9e769f2: Stop propagation in g-gesture.
+
 ## 2.2.7
 
 ### 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": "2.2.7",
+  "version": "2.2.8",
   "description": "G Gesture",
   "keywords": [
     "antv",

diff --git a/packages/g-mobile-webgl/CHANGELOG.md b/packages/g-mobile-webgl/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @antv/g-mobile-webgl
 
+## 0.9.10
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+    -   @antv/g-plugin-webgl-device@1.9.9
+
 ## 0.9.9
 
 ### 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.9",
+  "version": "0.9.10",
   "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,14 @@
 # @antv/g-plugin-3d
 
+## 1.9.9
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+
 ## 1.9.8
 
 ### 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.8",
+  "version": "1.9.9",
   "description": "Provide 3D extension for G",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-device-renderer/CHANGELOG.md b/packages/g-plugin-device-renderer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @antv/g-plugin-device-renderer
 
+## 1.9.9
+
+### Patch Changes
+
+-   d9e769f2: Merge anchor into modelmatrix.
+-   d9e769f2: Fix dash effect in webgl.
+-   d9e769f2: Stop propagation in g-gesture.
+
 ## 1.9.8
 
 ### 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.8",
+  "version": "1.9.9",
   "description": "A G plugin of renderer implementation with GPUDevice",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-device-renderer/src/drawcalls/InstancedFill.ts b/packages/g-plugin-device-renderer/src/drawcalls/InstancedFill.ts
@@ -16,6 +16,8 @@ import { BatchContext } from '../renderer';
 const SEGMENT_NUM = 12;
 
 export class InstancedFillDrawcall extends Instanced {
+  protected mergeAnchorIntoModelMatrix = true;
+
   constructor(
     protected renderHelper: RenderHelper,
     protected texturePool: TexturePool,

diff --git a/packages/g-plugin-device-renderer/src/shader/instanced-line.frag b/packages/g-plugin-device-renderer/src/shader/instanced-line.frag
@@ -37,6 +37,6 @@ void main() {
     outputColor.a = outputColor.a
       * blur
       * u_Opacity * u_StrokeOpacity
-      * ceil(mod(v_Dash.x + u_dash_offset, u_dash_array) - (u_dash_array * u_dash_ratio));
+      * (u_dash_array < 1.0 ? (ceil((u_dash_array * u_dash_ratio) - mod(v_Dash.x + u_dash_offset, u_dash_array))) : 1.0);
   }
 }
diff --git a/packages/g-plugin-device-renderer/src/shader/instanced-line.vert b/packages/g-plugin-device-renderer/src/shader/instanced-line.vert
@@ -33,9 +33,7 @@ void main() {
   float clampedStrokeWidth = max(strokeWidth, 1.0);
 
   float isBillboard = a_Dash.w;
-  bool isPerspective = isPerspectiveMatrix(u_ProjectionMatrix);
-
-  if (isBillboard > 0.5 && isPerspective) {
+  if (isBillboard > 0.5) {
     // clip space
     vec4 clip0 = project(vec4(a_PointA, 1.0), u_ProjectionMatrix, u_ViewMatrix, u_ModelMatrix);
     vec4 clip1 = project(vec4(a_PointB, 1.0), u_ProjectionMatrix, u_ViewMatrix, u_ModelMatrix);

diff --git a/packages/g-plugin-gpgpu/CHANGELOG.md b/packages/g-plugin-gpgpu/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-plugin-gpgpu
 
+## 1.9.10
+
+### Patch Changes
+
+-   @antv/g-webgpu@1.9.10
+
 ## 1.9.9
 
 ### Patch Changes

diff --git a/packages/g-plugin-gpgpu/package.json b/packages/g-plugin-gpgpu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-plugin-gpgpu",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "A G plugin for GPGPU based on WebGPU",
   "keywords": [
     "webgpu",

diff --git a/packages/g-plugin-webgl-device/CHANGELOG.md b/packages/g-plugin-webgl-device/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @antv/g-plugin-webgl-device
 
+## 1.9.9
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+
 ## 1.9.8
 
 ### Patch Changes

diff --git a/packages/g-plugin-webgl-device/package.json b/packages/g-plugin-webgl-device/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-plugin-webgl-device",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "description": "A G plugin implements GPUDevice interface with WebGL API",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-webgpu-device/CHANGELOG.md b/packages/g-plugin-webgpu-device/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @antv/g-plugin-webgpu-device
 
+## 1.9.9
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+
 ## 1.9.8
 
 ### Patch Changes

diff --git a/packages/g-plugin-webgpu-device/package.json b/packages/g-plugin-webgpu-device/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-plugin-webgpu-device",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "description": "A G plugin implements GPUDevice interface with WebGPU API",
   "keywords": [
     "antv",

diff --git a/packages/g-web-components/CHANGELOG.md b/packages/g-web-components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-web-components
 
+## 1.9.10
+
+### Patch Changes
+
+-   @antv/g-webgl@1.9.10
+
 ## 1.9.9
 
 ### Patch Changes

diff --git a/packages/g-web-components/package.json b/packages/g-web-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-web-components",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "A declarative usage for G implemented with WebComponents",
   "keywords": [
     "antv",

diff --git a/packages/g-webgl/CHANGELOG.md b/packages/g-webgl/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @antv/g-webgl
 
+## 1.9.10
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+    -   @antv/g-plugin-webgl-device@1.9.9
+
 ## 1.9.9
 
 ### Patch Changes

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

diff --git a/packages/g-webgpu/CHANGELOG.md b/packages/g-webgpu/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @antv/g-webgpu
 
+## 1.9.10
+
+### Patch Changes
+
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+-   Updated dependencies [d9e769f2]
+    -   @antv/g-plugin-device-renderer@1.9.9
+    -   @antv/g-plugin-webgpu-device@1.9.9
+
 ## 1.9.9
 
 ### Patch Changes

diff --git a/packages/g-webgpu/package.json b/packages/g-webgpu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@antv/g-webgpu",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "description": "A renderer implemented by WebGPU",
   "keywords": [
     "antv",