@needle-tools/engine 3.2.1-alpha → 3.2.2-alpha

package/src/engine-components/SceneSwitcher.ts

@@ -47,14 +47,16 @@ export class SceneSwitcher extends Behaviour {
     private _currentScene: AssetReference | undefined = undefined;
     private _engineElementOverserver: MutationObserver | undefined = undefined;
 
-    start() {
-        if (!this.tryLoadFromQueryParam()) {
+    async start() {
+        if (this._currentIndex === -1 && !await this.tryLoadFromQueryParam()) {
             const value = this.context.domElement.getAttribute(ENGINE_ELEMENT_SCENE_ATTRIBUTE_NAME);
             // let locked = this.lock;
             try {
                 // this.lock = false;
-                if (value === null || !this.trySelectSceneFromValue(value))
-                    this.select(0);
+                if (value === null || !await this.trySelectSceneFromValue(value)) {
+                    if (this._currentIndex === -1)
+                        this.select(0);
+                }
             }
             finally {
                 // this.lock = locked;
@@ -202,10 +204,10 @@ export class SceneSwitcher extends Behaviour {
     }
 
     private tryLoadFromQueryParam() {
-        if (!this.queryParameterName?.length) return false;
+        if (!this.queryParameterName?.length) return couldNotLoadScenePromise;
         // try restore the scene from the url
         const value = getParam(this.queryParameterName);
-        if (typeof value === "boolean") return false;
+        if (typeof value === "boolean") return couldNotLoadScenePromise;
         return this.trySelectSceneFromValue(value);
     }
 
@@ -233,7 +235,7 @@ export class SceneSwitcher extends Behaviour {
             }
         }
 
-        if (isLocalNetwork()) console.warn("Unknown scene value or index: \"" + value + "\"", this)
+        if (isLocalNetwork()) console.warn("Can not find scene: \"" + value + "\"", this)
 
         return couldNotLoadScenePromise;
     }