@netless/window-manager 1.0.13-test.18 → 1.0.13-test.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.13-test.18",
+  "version": "1.0.13-test.19",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/AppManager.ts

@@ -923,7 +923,6 @@ export class AppManager {
     }
 
     private dispatchSetMainViewScenePath(scenePath: string): void {
-        console.log("[window-manager] dispatchSetMainViewScenePath  " + scenePath);
         this.dispatchInternalEvent(Events.SetMainViewScenePath, { nextScenePath: scenePath });
         callbacks.emit("mainViewScenePathChange", scenePath);
         // 兼容 15 的 SDK, 需要 room 的当前 ScenePath

package/src/Utils/Common.ts

@@ -34,7 +34,6 @@ export const setScenePath = (room: Room | undefined, scenePath: string) => {
     if (room && room.isWritable) {
         if (room.state.sceneState.scenePath !== scenePath) {
             const nextScenePath = scenePath === "/" ? "" : scenePath;
-            console.log("[window-manager] real setScenePath for current room " + nextScenePath);
             room.setScenePath(nextScenePath);
         }
     }

package/src/Utils/RoomHacker.ts

@@ -37,10 +37,24 @@ export const replaceRoomFunction = (room: Room | Player, manager: WindowManager)
         room.scalePptToFit = (...args) => {
             _scalePptToFit.call(room, ...args);
             if (manager.appManager?.mainViewProxy) {
-                console.log("[window-manager] scalePptToFit " + JSON.stringify(args));
                 manager.appManager.mainViewProxy.setCameraAndSize();
             }
         };
+        const _putScenes = room.putScenes;
+        room.putScenes = (...args) => {
+            const [path, scenes] = args;
+            const currentScenePath = manager.mainView.focusScenePath;
+            if (currentScenePath && path && scenes) {
+                console.log("[window-manager] putScenes " + JSON.stringify(args));
+                for (const scene of scenes) {
+                    if (`${path}${scene.name}` === currentScenePath) {
+                        console.error(`[window-manager] putScenes: scene name can not be the same as the current scene path: ${currentScenePath}`);
+                        return;
+                    }
+                }
+            }
+            return _putScenes.call(room, ...args);
+        };
         room.moveCamera = (camera: Camera) => manager.moveCamera(camera);
         room.moveCameraToContain = (...args) => manager.moveCameraToContain(...args);
         room.convertToPointInWorld = (...args) => manager.mainView.convertToPointInWorld(...args);

package/src/View/MainView.ts

@@ -380,7 +380,7 @@ export class MainViewProxy {
 
     private syncMainView = (room: Room) => {
         if (room.isWritable) {
-            console.log("[window-manager] syncMainView  ");
+            console.log("[window-manager] syncMainView ");
             room.syncMainView(this.mainView);
         }
     };