@babylonjs/core 8.53.1 → 8.54.0

package/Loading/Plugins/babylonFileLoader.js

@@ -151,8 +151,36 @@ export function LoadAssetContainerFromSerializedScene(scene, serializedScene, ro
 }
 const LoadAssetContainer = (scene, data, rootUrl, onError, addToScene = false) => {
     const container = new AssetContainer(scene);
+    // When loading into a container (not directly into the scene), suppress entity-added
+    // observables to prevent scene events during loading. Entities still get added to scene
+    // arrays (so the linking code can find them), but no events fire.
+    // They are removed from the scene at the end via container.removeAllFromScene().
+    let savedObservables;
     if (!addToScene) {
-        scene._blockEntityCollection = true;
+        savedObservables = {
+            mesh: scene.onNewMeshAddedObservable,
+            transformNode: scene.onNewTransformNodeAddedObservable,
+            light: scene.onNewLightAddedObservable,
+            camera: scene.onNewCameraAddedObservable,
+            material: scene.onNewMaterialAddedObservable,
+            multiMaterial: scene.onNewMultiMaterialAddedObservable,
+            texture: scene.onNewTextureAddedObservable,
+            skeleton: scene.onNewSkeletonAddedObservable,
+            geometry: scene.onNewGeometryAddedObservable,
+            animationGroup: scene.onNewAnimationGroupAddedObservable,
+            particleSystem: scene.onNewParticleSystemAddedObservable,
+        };
+        scene.onNewMeshAddedObservable = new Observable();
+        scene.onNewTransformNodeAddedObservable = new Observable();
+        scene.onNewLightAddedObservable = new Observable();
+        scene.onNewCameraAddedObservable = new Observable();
+        scene.onNewMaterialAddedObservable = new Observable();
+        scene.onNewMultiMaterialAddedObservable = new Observable();
+        scene.onNewTextureAddedObservable = new Observable();
+        scene.onNewSkeletonAddedObservable = new Observable();
+        scene.onNewGeometryAddedObservable = new Observable();
+        scene.onNewAnimationGroupAddedObservable = new Observable();
+        scene.onNewParticleSystemAddedObservable = new Observable();
     }
     // Entire method running in try block, so ALWAYS logs as far as it got, only actually writes details
     // when SceneLoader.debugLogging = true (default), or exception encountered.
@@ -341,17 +369,7 @@ const LoadAssetContainer = (scene, data, rootUrl, onError, addToScene = false) =
             if (vertexData !== undefined && vertexData !== null) {
                 for (index = 0, cache = vertexData.length; index < cache; index++) {
                     const parsedVertexData = vertexData[index];
-                    // Geometies are found by loadedUniqueId when imported
-                    // So we need to temporarily unblock the entity collection to add them to the scene
-                    scene._blockEntityCollection = false;
-                    // Temporarily replace the onNewGeometryAddedObservable to avoid multiple notifications
-                    const onNewGeometryAddedObservable = scene.onNewGeometryAddedObservable;
-                    scene.onNewGeometryAddedObservable = new Observable();
                     addedGeometry.push(Geometry.Parse(parsedVertexData, scene, rootUrl));
-                    // Restore the onNewGeometryAddedObservable
-                    scene.onNewGeometryAddedObservable = onNewGeometryAddedObservable;
-                    // Restore the previous state of entity collection blocking
-                    scene._blockEntityCollection = !addToScene;
                 }
             }
             for (const g of addedGeometry) {
@@ -655,10 +673,22 @@ const LoadAssetContainer = (scene, data, rootUrl, onError, addToScene = false) =
         TempMorphTargetManagerIndexContainer = {};
         TempSkeletonIndexContainer = {};
         if (!addToScene) {
-            // Removes any breadcrumb left during the loading like geometries
+            // Restore observables before removing from scene
+            if (savedObservables) {
+                scene.onNewMeshAddedObservable = savedObservables.mesh;
+                scene.onNewTransformNodeAddedObservable = savedObservables.transformNode;
+                scene.onNewLightAddedObservable = savedObservables.light;
+                scene.onNewCameraAddedObservable = savedObservables.camera;
+                scene.onNewMaterialAddedObservable = savedObservables.material;
+                scene.onNewMultiMaterialAddedObservable = savedObservables.multiMaterial;
+                scene.onNewTextureAddedObservable = savedObservables.texture;
+                scene.onNewSkeletonAddedObservable = savedObservables.skeleton;
+                scene.onNewGeometryAddedObservable = savedObservables.geometry;
+                scene.onNewAnimationGroupAddedObservable = savedObservables.animationGroup;
+                scene.onNewParticleSystemAddedObservable = savedObservables.particleSystem;
+            }
+            // Removes entities from scene arrays and moves them to the container
             container.removeAllFromScene();
-            // Unblock entity collection
-            scene._blockEntityCollection = false;
         }
         if (log !== null && SceneLoaderFlags.loggingLevel !== 0) {
             Logger.Log(logOperation("loadAssets", parsedData ? parsedData.producer : "Unknown") + (SceneLoaderFlags.loggingLevel !== 1 ? log : ""));