完善渐隐场景转换

source/src/Graphics/Transitions/SceneTransition.ts

@@ -2,6 +2,7 @@
  * SceneTransition用于从一个场景过渡到另一个场景或在一个有效果的场景中过渡
  */
 abstract class SceneTransition {
+    private _hasPreviousSceneRender: boolean;
     /** 是否加载新场景的标志 */
     public loadsNewScene: boolean;
     /** 
@@ -9,33 +10,15 @@ abstract class SceneTransition {
      * 对于场景过渡，isNewSceneLoaded应该在中点设置为true，这就标识一个新的场景被加载了。
      */
     public isNewSceneLoaded: boolean;
-    /** 
-     * 如果为true
-     * 会将之前的场景渲染到previousSceneRender中，这样你就可以在转换时使用它 
-     */
-    public wantsPreviousSceneRender: boolean;
     /** 返回新加载场景的函数 */
     protected sceneLoadAction: Function;
-    /** 包含上一个场景的最后渲染。可以用来在加载新场景时模糊屏幕。 */
-    public previousSceneRender: egret.RenderTexture;
     /** 在loadNextScene执行时调用。这在进行场景间过渡时很有用，这样你就知道什么时候可以更多地使用相机或者重置任何实体 */
     public onScreenObscured: Function;
     /** 当转换完成执行时调用，以便可以调用其他工作，比如启动另一个转换。 */
     public onTransitionCompleted: Function;
-    public progress: number = 0;
 
-    constructor(sceneLoadAction: Function, wantsPreviousSceneRender: boolean = true) {
-        this.sceneLoadAction = sceneLoadAction;
-        this.wantsPreviousSceneRender = wantsPreviousSceneRender;
-        this.loadsNewScene = sceneLoadAction != null;
-
-        if (wantsPreviousSceneRender)
-            this.previousSceneRender = new egret.RenderTexture();
-    }
-
-    private _hasPreviousSceneRender;
-    public get hasPreviousSceneRender() {
-        if (!this._hasPreviousSceneRender) {
+    public get hasPreviousSceneRender(){
+        if (!this._hasPreviousSceneRender){
             this._hasPreviousSceneRender = true;
             return false;
         }
@@ -43,44 +26,39 @@ abstract class SceneTransition {
         return true;
     }
 
-    public preRender() { }
-
-    public render(){
-        
+    constructor(sceneLoadAction: Function) {
+        this.sceneLoadAction = sceneLoadAction;
+        this.loadsNewScene = sceneLoadAction != null;
     }
 
-    public onBeginTransition(): Promise<any> {
-        return new Promise((resolve) => {
-            resolve(this.loadScene());
-            this.transitionComplete();
-        });
+    public preRender() { }
+
+    public render() {
+
+    }
+
+    public onBeginTransition() {
+        this.loadNextScene();
+        this.transitionComplete();
     }
 
     protected transitionComplete() {
         SceneManager.sceneTransition = null;
 
-        if (this.previousSceneRender){
-            this.previousSceneRender.dispose();
-            this.previousSceneRender = null;
-        }
-
-        if (this.onTransitionCompleted){
+        if (this.onTransitionCompleted) {
             this.onTransitionCompleted();
         }
     }
 
-    protected loadScene(): Promise<any> {
-        return new Promise(async (resolve) => {
-            if (this.onScreenObscured)
-                this.onScreenObscured();
+    protected loadNextScene() {
+        if (this.onScreenObscured)
+            this.onScreenObscured();
 
-            if (!this.loadsNewScene) {
-                this.isNewSceneLoaded = true;
-                resolve();
-            }
-
-            SceneManager.scene = await this.sceneLoadAction();
+        if (!this.loadsNewScene) {
             this.isNewSceneLoaded = true;
-        });
+        }
+
+        SceneManager.scene = this.sceneLoadAction();
+        this.isNewSceneLoaded = true;
     }
 }