Release (#1562)

* feat: add onframe param on camera animation (#1560) * feat: add onframe param on goToLandmark * chore: commit changeset * chore(release): bump version (#1561) 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 · Oct 26, 2023 · 6d82b64 · 6d82b64
1 parent 4e4e8ef
commit 6d82b64
Show file tree

Hide file tree

Showing 22 changed files with 316 additions and 10 deletions.
diff --git a/demo/perf-nodes-edges.html b/demo/perf-nodes-edges.html
@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1,shrink-to-fit=no"
+    />
+    <title>Nodes & Edges</title>
+    <style>
+      * {
+        box-sizing: border-box;
+        margin: 0;
+        padding: 0;
+      }
+
+      html,
+      body {
+        height: 100%;
+      }
+
+      #container {
+        width: 100%;
+        height: 100%;
+      }
+    </style>
+  </head>
+
+  <body>
+    <div id="container"></div>
+    <script
+      src="../packages/g/dist/index.umd.min.js"
+      type="application/javascript"
+    ></script>
+    <script
+      src="../packages/g-webgl/dist/index.umd.min.js"
+      type="application/javascript"
+    ></script>
+    <script
+      src="../packages/g-plugin-dragndrop/dist/index.umd.min.js"
+      type="application/javascript"
+    ></script>
+    <script>
+      const { Circle, Line, Canvas, Text, CanvasEvent, runtime } = window.G;
+
+      const NODE_NUM = 200000;
+      const EDGE_NUM = 200000;
+
+      // disable CSS Parsing
+      runtime.enableCSSParsing = false;
+
+      // create a renderer
+      const webglRenderer = new window.G.WebGL.Renderer();
+      webglRenderer.registerPlugin(
+        new window.G.Dragndrop.Plugin({
+          isDocumentDraggable: true,
+          isDocumentDroppable: true,
+          dragstartDistanceThreshold: 10,
+          dragstartTimeThreshold: 100,
+        }),
+      );
+
+      // create a canvas
+      const canvas = new Canvas({
+        container: 'container',
+        width: 600,
+        height: 500,
+        renderer: webglRenderer,
+      });
+      const camera = canvas.getCamera();
+
+      canvas.addEventListener(CanvasEvent.READY, () => {
+        let nodes = [];
+        let texts = [];
+        let colors = [
+          '#965E04',
+          '#C89435',
+          '#F7A456',
+          '#AFCF8A',
+          '#7B39DE',
+          '#B095C0',
+          '#D24556',
+          '#93C2FA',
+          '#9DB09E',
+          '#F8C821',
+        ];
+        let num = Math.floor(Math.sqrt(NODE_NUM) + 0.5);
+
+        const sourceMap = new WeakMap();
+        const targetMap = new WeakMap();
+        for (let i = 0; i < NODE_NUM; i++) {
+          const fill = colors[Math.floor(Math.random() * colors.length) || 0];
+          const circle = new Circle({
+            style: {
+              cx: (i % num) * 10,
+              cy: Math.floor(i / num) * 10,
+              fill,
+              r: 4,
+              // draggable: true
+            },
+          });
+          nodes.push(circle);
+          sourceMap.set(circle, []);
+          targetMap.set(circle, []);
+
+          circle.addEventListener('mouseenter', () => {
+            circle.style.fill = 'red';
+            console.log('circle', i);
+          });
+          circle.addEventListener('mouseleave', () => {
+            circle.style.fill = fill;
+          });
+
+          // if (i === NODE_NUM - 1) {
+          //   const text = new Text({
+          //     style: {
+          //       x: (i % num) * 10,
+          //       y: Math.floor(i / num) * 10,
+          //       fontSize: 10,
+          //       fill: 'black',
+          //       text: `${i}`,
+          //     },
+          //   });
+          //   texts.push(text);
+          // }
+        }
+
+        for (let i = 0; i < EDGE_NUM; i++) {
+          const source = nodes[Math.floor(Math.random() * NODE_NUM)];
+          const target = nodes[Math.floor(Math.random() * NODE_NUM)];
+          const line = new Line({
+            style: {
+              x1: source.style.cx,
+              y1: source.style.cy,
+              x2: target.style.cx,
+              y2: target.style.cy,
+              lineWidth: 0.3,
+              stroke: 'grey',
+            },
+          });
+
+          const sourceEdges = sourceMap.get(source);
+          sourceEdges.push(line);
+          const targetEdges = targetMap.get(target);
+          targetEdges.push(line);
+
+          canvas.appendChild(line);
+
+          // line.addEventListener("mouseenter", () => {
+          //   line.style.stroke = "red";
+          // });
+          // line.addEventListener("mouseleave", () => {
+          //   line.style.stroke = "grey";
+          // });
+        }
+
+        nodes.forEach((node) => {
+          canvas.appendChild(node);
+        });
+        texts.forEach((text) => {
+          canvas.appendChild(text);
+        });
+
+        let shiftX = 0;
+        let shiftY = 0;
+        function moveAt(target, canvasX, canvasY) {
+          const x = canvasX - shiftX;
+          const y = canvasY - shiftY;
+          target.setPosition(x, y);
+          const sourceEdges = sourceMap.get(target);
+          const targetEdges = targetMap.get(target);
+          sourceEdges.forEach((edge) => {
+            edge.attr({
+              x1: x,
+              y1: y,
+            });
+          });
+          targetEdges.forEach((edge) => {
+            edge.attr({
+              x2: x,
+              y2: y,
+            });
+          });
+        }
+
+        canvas.addEventListener('dragstart', function (e) {
+          // if (e.target === canvas.document) {
+          // } else {
+          //   const [x, y] = e.target.getPosition();
+          //   shiftX = e.canvasX - x;
+          //   shiftY = e.canvasY - y;
+          //   moveAt(e.target, e.canvasX, e.canvasY);
+          // }
+        });
+        canvas.addEventListener('drag', function (e) {
+          // if (e.target === canvas.document) {
+          camera.pan(-e.dx * 10, -e.dy * 10);
+          // } else {
+          //   moveAt(e.target, e.canvasX, e.canvasY);
+          // }
+        });
+
+        // handle mouse wheel event
+        const bindWheelHandler = () => {
+          // update Camera's zoom
+          // @see https://github.com/mrdoob/three.js/blob/master/examples/jsm/controls/OrbitControls.js
+          const minZoom = 0;
+          const maxZoom = Infinity;
+          canvas
+            .getContextService()
+            .getDomElement() // g-canvas/webgl 为 <canvas>，g-svg 为 <svg>
+            .addEventListener(
+              'wheel',
+              (e) => {
+                // canvas.getConfig().disableHitTesting = true;
+                e.preventDefault();
+                let zoom;
+                if (e.deltaY < 0) {
+                  zoom = Math.max(
+                    minZoom,
+                    Math.min(maxZoom, camera.getZoom() / 0.95),
+                  );
+                } else {
+                  zoom = Math.max(
+                    minZoom,
+                    Math.min(maxZoom, camera.getZoom() * 0.95),
+                  );
+                }
+                camera.setZoom(zoom);
+              },
+              { passive: false },
+            );
+        };
+        bindWheelHandler();
+      });
+    </script>
+  </body>
+</html>
diff --git a/packages/g-camera-api/CHANGELOG.md b/packages/g-camera-api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @antv/g-camera-api
 
+## 1.2.16
+
+### Patch Changes
+
+-   d2ed3d6d: Add onframe param in gotoLandmark.
+
 ## 1.2.15
 
 ### 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": "1.2.15",
+  "version": "1.2.16",
   "description": "A simple implementation of Camera API.",
   "keywords": [
     "antv",

diff --git a/packages/g-camera-api/src/AdvancedCamera.ts b/packages/g-camera-api/src/AdvancedCamera.ts
@@ -198,6 +198,7 @@ export class AdvancedCamera extends Camera {
           easing: string;
           easingFunction: TypeEasingFunction;
           duration: number;
+          onframe: (t: number) => void;
           onfinish: () => void;
         }> = {},
   ) {
@@ -210,6 +211,7 @@ export class AdvancedCamera extends Camera {
         duration = 100,
         easingFunction = undefined,
         onfinish = undefined,
+        onframe = undefined,
       } = isNumber(options) ? { duration: options } : options;
       const epsilon = 0.01;
 
@@ -284,6 +286,9 @@ export class AdvancedCamera extends Camera {
         this.triggerUpdate();
 
         if (elapsed < duration) {
+          if (onframe) {
+            onframe(t);
+          }
           this.landmarkAnimationID = this.canvas.requestAnimationFrame(animate);
         }
       };

diff --git a/packages/g-mobile-webgl/CHANGELOG.md b/packages/g-mobile-webgl/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @antv/g-mobile-webgl
 
+## 0.9.27
+
+### Patch Changes
+
+-   Updated dependencies [d2ed3d6d]
+    -   @antv/g-plugin-device-renderer@1.9.23
+
 ## 0.9.26
 
 ### 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.26",
+  "version": "0.9.27",
   "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,12 @@
 # @antv/g-plugin-3d
 
+## 1.9.23
+
+### Patch Changes
+
+-   Updated dependencies [d2ed3d6d]
+    -   @antv/g-plugin-device-renderer@1.9.23
+
 ## 1.9.22
 
 ### 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.22",
+  "version": "1.9.23",
   "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,11 @@
 # @antv/g-plugin-device-renderer
 
+## 1.9.23
+
+### Patch Changes
+
+-   d2ed3d6d: Add onframe param in gotoLandmark.
+
 ## 1.9.22
 
 ### 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.22",
+  "version": "1.9.23",
   "description": "A G plugin of renderer implementation with GPUDevice",
   "keywords": [
     "antv",

diff --git a/packages/g-plugin-device-renderer/src/drawcalls/Instanced.ts b/packages/g-plugin-device-renderer/src/drawcalls/Instanced.ts
@@ -711,6 +711,10 @@ export abstract class Instanced {
     name: string,
     value: any,
   ) {
+    if (objects.length === 0) {
+      return;
+    }
+
     const stylePacked = [
       'opacity',
       'fillOpacity',

diff --git a/packages/g-plugin-device-renderer/src/renderer/Batch.ts b/packages/g-plugin-device-renderer/src/renderer/Batch.ts
@@ -5,7 +5,7 @@ import type { RenderInst } from '../render/RenderInst';
 /**
  * render order start from 0, our default camera's Z is 500
  */
-export const RENDER_ORDER_SCALE = 1 / 200;
+export const RENDER_ORDER_SCALE = 500 / 1000000;
 
 /**
  * A container for multiple display objects with the same `style`,

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.27
+
+### Patch Changes
+
+-   @antv/g-webgl@1.9.26
+
 ## 1.9.26
 
 ### 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.26",
+  "version": "1.9.27",
   "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,12 @@
 # @antv/g-webgl
 
+## 1.9.26
+
+### Patch Changes
+
+-   Updated dependencies [d2ed3d6d]
+    -   @antv/g-plugin-device-renderer@1.9.23
+
 ## 1.9.25
 
 ### Patch Changes