@netless/window-manager 0.4.0-canary.32 → 0.4.0-canary.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.0-canary.32",
+  "version": "0.4.0-canary.33",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",

package/src/AppListener.ts

@@ -1,10 +1,10 @@
 import { callbacks, emitter } from "./index";
 import { Events, MagixEventName } from "./constants";
+import { isEqual, omit } from "lodash";
 import { setViewFocusScenePath } from "./Utils/Common";
-import type { Event } from "white-web-sdk";
+import type { AnimationMode, Camera, Event } from "white-web-sdk";
 import type { AppManager } from "./AppManager";
 import type { TeleBoxState } from "@netless/telebox-insider";
-
 export class AppListeners {
     private displayer = this.manager.displayer;
 
@@ -42,6 +42,10 @@ export class AppListeners {
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }
+                case Events.MoveCamera: {
+                    this.moveCameraHandler(data.payload);
+                    break;
+                }
                 case Events.MoveCameraToContain: {
                     this.moveCameraToContainHandler(data.payload);
                     break;
@@ -74,6 +78,13 @@ export class AppListeners {
         callbacks.emit("mainViewScenePathChange", nextScenePath);
     };
 
+    private moveCameraHandler = (
+        payload: Camera & { animationMode?: AnimationMode | undefined }
+    ) => {
+        if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
+        this.manager.mainView.moveCamera(payload);
+    };
+
     private moveCameraToContainHandler = (payload: any) => {
         this.manager.mainView.moveCameraToContain(payload);
     };

package/src/constants.ts

@@ -10,6 +10,7 @@ export enum Events {
     SetMainViewScenePath = "SetMainViewScenePath",
     SetMainViewSceneIndex = "SetMainViewSceneIndex",
     SwitchViewsToFreedom = "SwitchViewsToFreedom",
+    MoveCamera = "MoveCamera",
     MoveCameraToContain = "MoveCameraToContain",
     CursorMove = "CursorMove",
 }

package/src/index.ts

@@ -10,7 +10,7 @@ import { DEFAULT_CONTAINER_RATIO, Events } from "./constants";
 import { Fields } from "./AttributesDelegate";
 import { initDb } from "./Register/storage";
 import { InvisiblePlugin, isPlayer, isRoom, RoomPhase, ViewMode } from "white-web-sdk";
-import { isNull, isObject } from "lodash";
+import { isEqual, isNull, isObject, omit } from "lodash";
 import { log } from "./Utils/log";
 import { ReconnectRefresher } from "./ReconnectRefresher";
 import { replaceRoomFunction } from "./Utils/RoomHacker";
@@ -674,7 +674,14 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public moveCamera(
         camera: Partial<Camera> & { animationMode?: AnimationMode | undefined }
     ): void {
+        const pureCamera = omit(camera, ["animationMode"]);
+        const mainViewCamera = { ...this.mainView.camera };
+        if (isEqual({ ...mainViewCamera, ...pureCamera }, mainViewCamera)) return;
         this.mainView.moveCamera(camera);
+        this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
+        setTimeout(() => {
+            this.appManager?.mainViewProxy.setCameraAndSize();
+        }, 100);
     }
 
     public moveCameraToContain(
@@ -687,7 +694,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
         this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
-        }, 1000);
+        }, 100);
     }
 
     public convertToPointInWorld(point: Point): Point {