fix: load asset container for scene @visibleAsAsset

Author: julien-moreau

tools/src/decorators/apply.ts

@@ -223,6 +223,7 @@ export function applyDecorators(scene: Scene, object: any, script: any, instance
 
 						switch (assetType) {
 							case "json":
+							case "scene":
 								instance[propertyKey] = data;
 								break;
 

tools/src/loading/loader.ts

@@ -132,7 +132,7 @@ export async function loadScene(rootUrl: any, sceneFilename: string, scene: Scen
 	}
 
 	if (!options?.skipAssetsPreload) {
-		await _preloadScriptsAssets(scene, rootUrl, scriptsMap, options);
+		await _preloadScriptsAssets(rootUrl, scene);
 	}
 
 	options?.onProgress?.(1);

tools/src/loading/script.ts

@@ -3,15 +3,17 @@ import { Scene } from "@babylonjs/core/scene";
 import { Observer } from "@babylonjs/core/Misc/observable";
 import { PointerInfo } from "@babylonjs/core/Events/pointerEvents";
 import { KeyboardInfo } from "@babylonjs/core/Events/keyboardEvents";
+import { LoadAssetContainerAsync } from "@babylonjs/core/Loading/sceneLoader";
+import { SceneLoaderFlags } from "@babylonjs/core/Loading/sceneLoaderFlags";
 import { IParticleSystem } from "@babylonjs/core/Particles/IParticleSystem";
 
 import { IScript } from "../script";
 
 import { applyDecorators } from "../decorators/apply";
 
-import { isAnyParticleSystem, isNode, isScene } from "../tools/guards";
+import { isAnyParticleSystem, isMesh, isNode, isScene } from "../tools/guards";
 
-import { loadScene, SceneLoaderOptions, ScriptMap } from "./loader";
+import { ScriptMap } from "./loader";
 
 /**
  * Defines the cache of all
@@ -21,7 +23,7 @@ export const scriptAssetsCache = new Map<string, any>();
 /**
  * @internal
  */
-export async function _preloadScriptsAssets(scene: Scene, rootUrl: string, scriptsMap: ScriptMap, options?: SceneLoaderOptions) {
+export async function _preloadScriptsAssets(rootUrl: string, scene: Scene) {
 	const nodes = [scene, ...scene.transformNodes, ...scene.meshes, ...scene.lights, ...scene.cameras];
 
 	const scripts = nodes
@@ -61,9 +63,19 @@ export async function _preloadScriptsAssets(scene: Scene, rootUrl: string, scrip
 						const filename = key.split("/").pop()!;
 						const sceneFilename = filename.replace(".scene", ".babylon");
 
-						scriptAssetsCache.set(key, "done");
+						// Load asset container
+						const container = await LoadAssetContainerAsync(`${rootUrl}${sceneFilename}`, scene, {
+							pluginExtension: ".babylon",
+						});
 
-						await loadScene(rootUrl, sceneFilename, scene, scriptsMap, options);
+						// Ensure all meshes perform their delay state check
+						if (SceneLoaderFlags.ForceFullSceneLoadingForIncremental) {
+							scene.meshes.forEach((m) => isMesh(m) && m._checkDelayState());
+						}
+
+						container.addAllToScene();
+
+						scriptAssetsCache.set(key, container);
 					} else {
 						const response = await fetch(`${rootUrl}${key}`);
 						const data = await response.json();

tools/test/decorators/apply.test.ts

@@ -120,6 +120,15 @@ jest.mock("@babylonjs/core/Particles/Node/nodeParticleSystemSet", () => ({
 	},
 }));
 
+jest.mock("@babylonjs/core/Loading/sceneLoaderFlags", () => ({
+	SceneLoaderFlags: {
+		ForceFullSceneLoadingForIncremental: 1,
+	},
+}));
+jest.mock("@babylonjs/core/Loading/sceneLoader", () => ({
+	LoadAssetContainerAsync: jest.fn(),
+}));
+
 import { Node } from "@babylonjs/core/node";
 import { Scene } from "@babylonjs/core/scene";
 import { Sound } from "@babylonjs/core/Audio/sound";

tools/test/loading/script.test.ts

@@ -18,6 +18,14 @@ jest.mock("@babylonjs/core/Particles/Node/nodeParticleSystemSet", () => ({
 jest.mock("@babylonjs/gui/2D/advancedDynamicTexture", () => ({
 	AdvancedDynamicTexture: class {},
 }));
+jest.mock("@babylonjs/core/Loading/sceneLoaderFlags", () => ({
+	SceneLoaderFlags: {
+		ForceFullSceneLoadingForIncremental: 1,
+	},
+}));
+jest.mock("@babylonjs/core/Loading/sceneLoader", () => ({
+	LoadAssetContainerAsync: jest.fn(),
+}));
 
 import { applyScriptOnObject } from "../../src/loading/script";