fix display stuck bug on scene changing (cocos#5260)

* add transformAffine() * remove duplicate code * fix display stuck bug on scene chaning
lm601927339 · Aug 27, 2019 · 8d39b4b · 8d39b4b
1 parent 74ca58d
commit 8d39b4b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/cocos/3d/framework/camera-component.ts b/cocos/3d/framework/camera-component.ts
@@ -381,6 +381,7 @@ export class CameraComponent extends Component {
             name: this.node.name,
             node: this.node,
             projection: this._projection,
+            window: cc.director.root.tempWindow,
             priority: this._priority,
         });
 

diff --git a/cocos/3d/framework/editor-camera-component.ts b/cocos/3d/framework/editor-camera-component.ts
@@ -134,6 +134,7 @@ export class EditorCameraComponent extends CameraComponent {
                 name: 'Editor UICamera',
                 node: this._camera.node,
                 projection: this._projection,
+                window: cc.director.root.mainWindow,
                 priority: this._priority,
                 isUI: true,
                 flows: ['UIFlow'],

diff --git a/cocos/core/root.ts b/cocos/core/root.ts
@@ -56,10 +56,26 @@ export class Root {
      * @zh
      * 当前窗口
      */
+    public set curWindow (window: GFXWindow | null) {
+        this._curWindow = window;
+    }
+
     public get curWindow (): GFXWindow | null {
         return this._curWindow;
     }
 
+    /**
+     * @zh
+     * 临时窗口（用于数据传输）
+     */
+    public set tempWindow (window: GFXWindow | null) {
+        this._tempWindow = window;
+    }
+
+    public get tempWindow (): GFXWindow | null {
+        return this._tempWindow;
+    }
+
     /**
      * @zh
      * 窗口列表
@@ -156,6 +172,7 @@ export class Root {
     private _windows: GFXWindow[] = [];
     private _mainWindow: GFXWindow | null = null;
     private _curWindow: GFXWindow | null = null;
+    private _tempWindow: GFXWindow | null = null;
     private _pipeline: RenderPipeline | null = null;
     private _ui: UI | null = null;
     private _scenes: RenderScene[] = [];