feat(pointcloud): Sync zoom when dragging +add zoom event in scheduler

open-mmlab · May 8, 2023 · acc6b64 · acc6b64
1 parent 636aa06
commit acc6b64
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/packages/lb-annotation/src/core/scheduler.ts b/packages/lb-annotation/src/core/scheduler.ts
@@ -80,13 +80,13 @@ export class ToolScheduler implements IToolSchedulerOperation {
   private imgNode?: HTMLImageElement;
 
   constructor(props: IToolSchedulerProps) {
-    this.init();
-
     this.container = props.container;
     this.size = props.size;
     this.imgNode = props.imgNode;
     this.config = props.config ?? JSON.stringify(getConfig(HybridToolUtils.getTopToolName(props.toolName))); // 设置默认操作
     this.style = props.style ?? styleDefaultConfig; // 设置默认操作
+    this.onWheel = this.onWheel.bind(this);
+    this.init();
   }
 
   public setImgNode(
@@ -346,5 +346,30 @@ export class ToolScheduler implements IToolSchedulerOperation {
   public init() {
     this.toolOperationList = [];
     this.toolOperationDom = [];
+    this.eventBinding();
+  }
+
+  public destroy() {
+    this.destroyAllLayer();
+    this.eventUnBinding();
+  }
+
+  public eventBinding() {
+    // this event will be touched when the remark layer blocks the onWheel events in specific operations, otherwise it will be blocked by the onWheel events inside
+    this.container.addEventListener('wheel', this.onWheel);
+  }
+
+  public eventUnBinding() {
+    this.container.removeEventListener('wheel', this.onWheel);
+  }
+
+  public onWheel(e: MouseEvent) {
+    e.preventDefault();
+    e.stopPropagation();
+    if (this.toolOperationList.length !== 0) {
+      const lastOneIndex = this.toolOperationDom.length - 1;
+      // the last one operation is the active one
+      this.toolOperationList[lastOneIndex].onWheel(e);
+    }
   }
 }
diff --git a/packages/lb-components/src/components/pointCloudView/PointCloudTopView.tsx b/packages/lb-components/src/components/pointCloudView/PointCloudTopView.tsx
@@ -382,6 +382,7 @@ const PointCloudTopView: React.FC<IProps> = ({
       const { x, y, z } = pointCloud.initCameraPosition;
       pointCloud.camera.position.set(x + offsetY, y - offsetX, z);
       pointCloud.render();
+      syncTopviewToolZoom(currentPos, zoom, size);
       setAnnotationPos({ zoom, currentPos });
     });
   }, [size, ptCtx.topViewInstance, ptCtx.topViewInstance?.toolInstance]);

diff --git a/packages/lb-utils/src/constant/pointCloud.ts b/packages/lb-utils/src/constant/pointCloud.ts
@@ -15,8 +15,8 @@ export enum EPerspectiveView {
 }
 
 export const DEFAULT_SPHERE_PARAMS = {
-  radius: 3,
+  radius: 0.3,
   widthSegments: 32,
   heightSegments: 16,
-  defaultZ: 5,
+  defaultZ: 1,
 }