@babylonjs/core 8.44.1 → 8.45.1

package/scene.js

@@ -1460,6 +1460,15 @@ export class Scene {
             data: [],
             length: 0,
         };
+        /**
+         * An event triggered when the scene ready checks has timed out.
+         */
+        this.onReadyTimeoutObservable = new Observable();
+        /**
+         * Duration in milliseconds to wait before triggering the onReadyTimeoutObservable event.
+         */
+        this.onReadyTimeoutDuration = 2 * 60 * 1000; // 2 minutes by default
+        this._timeoutChecksStartTime = 0;
         this._floatingOriginScene = undefined;
         this._preventFreeActiveMeshesAndRenderingGroups = false;
         /** @internal */
@@ -2030,20 +2039,36 @@ export class Scene {
             }, checkRenderTargets);
         });
     }
+    _clearReadynessChecksData() {
+        this._timeoutChecksStartTime = 0;
+        this.onReadyTimeoutObservable.clear();
+        this.onReadyObservable.clear();
+        this._executeWhenReadyTimeoutId = null;
+    }
     /**
      * @internal
      */
     _checkIsReady(checkRenderTargets = false) {
         this._registerTransientComponents();
+        // Starts counting time from the first check for timeout purposes
+        if (this._timeoutChecksStartTime === 0) {
+            this._timeoutChecksStartTime = PrecisionDate.Now;
+        }
+        // Check for timeout
+        else if (this.onReadyTimeoutDuration > 0 && PrecisionDate.Now - this._timeoutChecksStartTime > this.onReadyTimeoutDuration) {
+            this.onReadyTimeoutObservable.notifyObservers(this);
+            this._clearReadynessChecksData();
+            return;
+        }
+        // Check for readyness
         if (this.isReady(checkRenderTargets)) {
             this.onReadyObservable.notifyObservers(this);
-            this.onReadyObservable.clear();
-            this._executeWhenReadyTimeoutId = null;
+            this._clearReadynessChecksData();
             return;
         }
+        // Clean up if the scene was disposed in the meantime
         if (this._isDisposed) {
-            this.onReadyObservable.clear();
-            this._executeWhenReadyTimeoutId = null;
+            this._clearReadynessChecksData();
             return;
         }
         this._executeWhenReadyTimeoutId = setTimeout(() => {
@@ -2313,8 +2338,8 @@ export class Scene {
             if (!toRemove.parent) {
                 toRemove._removeFromSceneRootNodes();
             }
+            this.onLightRemovedObservable.notifyObservers(toRemove);
         }
-        this.onLightRemovedObservable.notifyObservers(toRemove);
         return index;
     }
     /**