@preference-sl/pref-viewer 2.10.0-beta.9 → 2.11.0-beta.0

package/src/index.js

@@ -22,7 +22,7 @@
  *     style="width:800px; height:600px;">
  * </pref-viewer>
  * ```
- * 
+ *
  * Load scene a URL:
  * ```html
  * <pref-viewer
@@ -39,147 +39,112 @@
  * </pref-viewer>
  * ```
  */
-import { Engine, Scene, ArcRotateCamera, Vector3, Color4, HemisphericLight, DirectionalLight, PointLight, ShadowGenerator, LoadAssetContainerAsync, Tools, WebXRSessionManager, WebXRDefaultExperience, MeshBuilder, WebXRFeatureName } from "@babylonjs/core";
+import { Engine, Scene, ArcRotateCamera, Vector3, Color4, HemisphericLight, DirectionalLight, PointLight, ShadowGenerator, LoadAssetContainerAsync, Tools, WebXRSessionManager, WebXRDefaultExperience, MeshBuilder, WebXRFeatureName, HDRCubeTexture, IblShadowsRenderPipeline } from "@babylonjs/core";
 import "@babylonjs/loaders";
 import { USDZExportAsync, GLTF2Export } from "@babylonjs/serializers";
 import "@babylonjs/loaders/glTF/2.0/Extensions/KHR_draco_mesh_compression";
 import { DracoCompression } from "@babylonjs/core/Meshes/Compression/dracoCompression";
 import { initDb, loadModel } from "./gltf-storage.js";
+import { FileStorage } from "./file-storage.js";
+
+class PrefViewerTask {
+    static Types = Object.freeze({
+        Config: "config",
+        Environment: "environment",
+        Materials: "materials",
+        Model: "model",
+        Options: "options",
+    });
 
-class PrefViewer extends HTMLElement {
-    static LOG_PREFIX = "[PrefViewer]";
-    static LOG_LEVELS = { none: 0, error: 1, warn: 2, info: 3, debug: 4 };
-    // Por defecto NO loggear: control únicamente vía atributo `log-level`
-    static DEFAULT_LOG_LEVEL = "none";
+    /**
+     * value: any payload for the task
+     * type: must match one of PrefViewerTask.Types values (case-insensitive)
+     */
+    constructor(value, type) {
+        this.value = value;
+
+        const t = typeof type === "string" ? type.toLowerCase() : String(type).toLowerCase();
+        const allowed = Object.values(PrefViewerTask.Types);
+        if (!allowed.includes(t)) {
+            throw new TypeError(`PrefViewerTask: invalid type "${type}". Allowed types: ${allowed.join(", ")}`);
+        }
+        this.type = t;
 
-    #initialized = false;
-    #logLevel = PrefViewer.DEFAULT_LOG_LEVEL;
+        Object.freeze(this);
+    }
+}
+
+class PrefViewer extends HTMLElement {
+    initialized = false;
+    loaded = false;
+    loading = false;
+    #taskQueue = [];
+    #fileStorage = new FileStorage("PrefViewer", "Files");
 
     #data = {
         containers: {
             model: {
                 name: "model",
-                container: null,
+                assetContainer: null,
                 show: true,
                 storage: null,
                 visible: false,
                 size: null,
-                timestamp: null,
-                changed: false,
+                timeStamp: null,
+                changed: { pending: false, success: false },
             },
             environment: {
                 name: "environment",
-                container: null,
+                assetContainer: null,
                 show: true,
                 storage: null,
                 visible: false,
                 size: null,
-                timestamp: null,
-                changed: false,
+                timeStamp: null,
+                changed: { pending: false, success: false },
             },
             materials: {
                 name: "materials",
-                container: null,
+                assetContainer: null,
                 storage: null,
                 show: true,
                 visible: false,
                 size: null,
-                timestamp: null,
-                changed: false,
+                timeStamp: null,
+                changed: { pending: false, success: false },
             },
         },
         options: {
             camera: {
                 value: null,
                 locked: true,
-                changed: false,
+                changed: { pending: false, success: false },
             },
             materials: {
                 innerWall: {
                     value: null,
                     prefix: "innerWall",
-                    changed: false,
+                    changed: { pending: false, success: false },
                 },
                 outerWall: {
                     value: null,
                     prefix: "outerWall",
-                    changed: false,
+                    changed: { pending: false, success: false },
                 },
                 innerFloor: {
                     value: null,
                     prefix: "innerFloor",
-                    changed: false,
+                    changed: { pending: false, success: false },
                 },
                 outerFloor: {
                     value: null,
                     prefix: "outerFloor",
-                    changed: false,
+                    changed: { pending: false, success: false },
                 },
             },
         },
     };
 
-    #log(level, message, context) {
-        const levels = PrefViewer.LOG_LEVELS;
-        const current = levels[this.#logLevel] ?? levels[PrefViewer.DEFAULT_LOG_LEVEL];
-        const incoming = levels[level] ?? levels.info;
-        if (incoming > current || current === levels.none) return;
-
-        const logger = console[level] ?? console.log;
-        if (context !== undefined) {
-            logger(`${PrefViewer.LOG_PREFIX}: ${message}`, context);
-        } else {
-            logger(`${PrefViewer.LOG_PREFIX}: ${message}`);
-        }
-    }
-
-    #setLogLevel(level) {
-        const value = String(level || "").toLowerCase();
-        this.#logLevel = (value in PrefViewer.LOG_LEVELS) ? value : PrefViewer.DEFAULT_LOG_LEVEL;
-        this.#logInfo("Log level set", { level: this.#logLevel });
-    }
-
-    #logDebug(message, context) {
-        this.#log("debug", message, context);
-    }
-
-    #logInfo(message, context) {
-        this.#log("info", message, context);
-    }
-
-    #logWarn(message, context) {
-        this.#log("warn", message, context);
-    }
-
-    #logError(message, context) {
-        this.#log("error", message, context);
-    }
-
-    #summarizeValue(value) {
-        if (typeof value === "string" && value.length > 150) {
-            return `${value.slice(0, 150)}… (${value.length} chars)`;
-        }
-        return value;
-    }
-
-    #describeStorage(storage) {
-        if (!storage) {
-            return "none";
-        }
-        if (storage.db && storage.table && storage.id) {
-            return `IndexedDB(${storage.db}/${storage.table}#${storage.id})`;
-        }
-        if (typeof storage.url === "string") {
-            return storage.url.startsWith("data:") ? "data-url" : storage.url;
-        }
-        return "unknown";
-    }
-
-    static get observedAttributes() {
-        // Añadimos "log-level" para controlar logs fuera del objeto config
-        return ["config", "model", "scene", "show-model", "show-scene", "log-level"];
-    }
-
     // DOM elements
     #wrapper = null;
     #canvas = null;
@@ -196,7 +161,6 @@ class PrefViewer extends HTMLElement {
 
     constructor() {
         super();
-        this.#logDebug("Constructing PrefViewer instance");
         this.attachShadow({ mode: "open" });
         this.#createCanvas();
         this.#wrapCanvas();
@@ -212,13 +176,11 @@ class PrefViewer extends HTMLElement {
         };
     }
 
-    attributeChangedCallback(name, _old, value) {
-        if (name === "log-level") {
-            this.#setLogLevel(value);
-            return;
-        }
+    static get observedAttributes() {
+        return ["config", "model", "scene", "show-model", "show-scene"];
+    }
 
-        this.#logDebug("Attribute change detected", { name, value: this.#summarizeValue(value) });
+    attributeChangedCallback(name, _old, value) {
         let data = null;
         switch (name) {
             case "config":
@@ -230,10 +192,15 @@ class PrefViewer extends HTMLElement {
             case "scene":
                 this.loadScene(value);
                 break;
+            case "materials":
+                this.loadMaterials(value);
+                break;
+            case "options":
+                this.setOptions(value);
+                break;
             case "show-model":
                 data = value.toLowerCase?.() === "true";
-                this.#logDebug("Toggling model visibility from attribute", { visible: data, initialized: this.#initialized });
-                if (this.#initialized) {
+                if (this.initialized) {
                     data ? this.showModel() : this.hideModel();
                 } else {
                     this.#data.containers.model.show = data;
@@ -241,8 +208,7 @@ class PrefViewer extends HTMLElement {
                 break;
             case "show-scene":
                 data = value.toLowerCase?.() === "true";
-                this.#logDebug("Toggling scene visibility from attribute", { visible: data, initialized: this.#initialized });
-                if (this.#initialized) {
+                if (this.initialized) {
                     data ? this.showScene() : this.hideScene();
                 } else {
                     this.#data.containers.environment.show = data;
@@ -254,33 +220,30 @@ class PrefViewer extends HTMLElement {
     connectedCallback() {
         if (!this.hasAttribute("config")) {
             const error = 'PrefViewer: provide "models" as array of model and environment';
-            this.#logError("Missing required config attribute", { error });
+            console.error(error);
             this.dispatchEvent(
-                new CustomEvent("model-error", {
-                    detail: { error: new Error(error) },
+                new CustomEvent("scene-error", {
                     bubbles: true,
+                    cancelable: false,
                     composed: true,
+                    detail: { error: new Error(error) },
                 })
             );
             return false;
         }
 
-        this.#logDebug("Connected to DOM, initializing Babylon");
         this.#initializeBabylon();
-        this.#loadContainers(true, true, true);
-        this.#initialized = true;
-        this.#logInfo("Initialization completed", { initialized: this.#initialized });
+        this.initialized = true;
+        this.#processNextTask();
     }
 
     disconnectedCallback() {
-        this.#logDebug("Disconnected from DOM, disposing resources");
         this.#disposeEngine();
         this.#canvasResizeObserver.disconnect();
     }
 
     // Web Component
     #createCanvas() {
-        this.#logDebug("Creating rendering canvas");
         this.#canvas = document.createElement("canvas");
         Object.assign(this.#canvas.style, {
             width: "100%",
@@ -288,11 +251,9 @@ class PrefViewer extends HTMLElement {
             display: "block",
             outline: "none",
         });
-        this.#logDebug("Canvas element created and styled");
     }
 
     #wrapCanvas() {
-        this.#logDebug("Wrapping canvas inside container div");
         this.#wrapper = document.createElement("div");
         Object.assign(this.#wrapper.style, {
             width: "100%",
@@ -301,94 +262,171 @@ class PrefViewer extends HTMLElement {
         });
         this.#wrapper.appendChild(this.#canvas);
         this.shadowRoot.append(this.#wrapper);
-        this.#logDebug("Canvas wrapper appended to shadow DOM");
+    }
+
+    #setStatusLoading() {
+        this.loaded = false;
+        this.loading = true;
+        if (this.hasAttribute("loaded")) {
+            this.removeAttribute("loaded");
+        }
+        this.setAttribute("loading", "");
+        this.dispatchEvent(
+            new CustomEvent("scene-loading", {
+                bubbles: true,
+                cancelable: false,
+                composed: true,
+            })
+        );
+        this.#engine.stopRenderLoop(this.#renderLoop);
+    }
+
+    async #setStatusLoaded() {
+        const toLoadDetail = {
+            container_model: !!this.#data.containers.model.changed.pending,
+            container_environment: !!this.#data.containers.environment.changed.pending,
+            container_materials: !!this.#data.containers.materials.changed.pending,
+            options_camera: !!this.#data.options.camera.changed.pending,
+            options_innerWallMaterial: !!this.#data.options.materials.innerWall.changed.pending,
+            options_outerWallMaterial: !!this.#data.options.materials.outerWall.changed.pending,
+            options_innerFloorMaterial: !!this.#data.options.materials.innerFloor.changed.pending,
+            options_outerFloorMaterial: !!this.#data.options.materials.outerFloor.changed.pending,
+        };
+        const loadedDetail = {
+            container_model: !!this.#data.containers.model.changed.success,
+            container_environment: !!this.#data.containers.environment.changed.success,
+            container_materials: !!this.#data.containers.materials.changed.success,
+            options_camera: !!this.#data.options.camera.changed.success,
+            options_innerWallMaterial: !!this.#data.options.materials.innerWall.changed.success,
+            options_outerWallMaterial: !!this.#data.options.materials.outerWall.changed.success,
+            options_innerFloorMaterial: !!this.#data.options.materials.innerFloor.changed.success,
+            options_outerFloorMaterial: !!this.#data.options.materials.outerFloor.changed.success,
+        };
+        const detail = {
+            tried: toLoadDetail,
+            success: loadedDetail,
+        };
+
+        this.dispatchEvent(
+            new CustomEvent("scene-loaded", {
+                bubbles: true,
+                cancelable: false,
+                composed: true,
+                detail: detail,
+            })
+        );
+
+        await this.#scene.whenReadyAsync();
+        this.#engine.runRenderLoop(this.#renderLoop);
+
+        this.#resetChangedFlags();
+
+        if (this.hasAttribute("loading")) {
+            this.removeAttribute("loading");
+        }
+        this.setAttribute("loaded", "");
+
+        this.loaded = true;
+        this.loading = false;
+
+        this.#processNextTask();
     }
 
     // Data
     #checkCameraChanged(options) {
         if (!options || !options.camera) {
-            this.#logDebug("Camera options not provided or unchanged");
             return false;
         }
-        this.#data.options.camera.changed = options.camera && options.camera !== this.#data.options.camera.value ? true : false;
-        this.#data.options.camera.value = this.#data.options.camera.changed ? options.camera : this.#data.options.camera.value;
-        this.#logDebug("Camera option processed", { changed: this.#data.options.camera.changed, value: this.#data.options.camera.value });
-        return this.#data.options.camera.changed;
+        const prev = this.#data.options.camera.value;
+        const changed = options.camera !== prev;
+
+        this.#data.options.camera.changed.pending = changed;
+        this.#data.options.camera.changed.success = false;
+        if (changed) {
+            this.#data.options.camera.changed.value = prev;
+            this.#data.options.camera.changed.locked = this.#data.options.camera.locked;
+            this.#data.options.camera.value = options.camera;
+        }
+        return changed;
     }
 
     #checkMaterialsChanged(options) {
         if (!options) {
-            this.#logDebug("Material options not provided");
             return false;
         }
         let someChanged = false;
         Object.keys(this.#data.options.materials).forEach((material) => {
             const key = `${material}Material`;
-            this.#data.options.materials[material].changed = options[key] && options[key] !== this.#data.options.materials[material].value ? true : false;
-            this.#data.options.materials[material].value = this.#data.options.materials[material].changed ? options[key] : this.#data.options.materials[material].value;
-            someChanged = someChanged || this.#data.options.materials[material].changed;
-        });
-        this.#logDebug("Material options processed", {
-            changed: someChanged,
-            values: Object.entries(this.#data.options.materials).reduce((acc, [key, entry]) => {
-                acc[key] = { value: entry.value, changed: entry.changed };
-                return acc;
-            }, {}),
+            const state = this.#data.options.materials[material];
+            const prev = state.value;
+            const incoming = options[key];
+            const changed = !!incoming && incoming !== prev;
+
+            state.changed.pending = changed;
+            state.changed.success = false;
+            if (changed) {
+                state.changed.value = prev;
+                state.value = incoming;
+            }
+            someChanged = someChanged || changed;
         });
         return someChanged;
     }
 
-    #storeChangedFlagsForContainer(container) {
-        container.timestamp = container.changed.timestamp;
-        container.size = container.changed.size;
-        this.#logDebug("Stored change flags for container", { name: container.name, timestamp: container.timestamp, size: container.size });
+    #storeChangedFlagsForContainer(container, success) {
+        if (success) {
+            container.timeStamp = container.changed.timeStamp;
+            container.size = container.changed.size;
+            container.changed.success = true;
+        } else {
+            container.changed.success = false;
+        }
     }
 
     #resetChangedFlags() {
-        Object.values(this.#data.containers).forEach((container) => (container.changed = false));
-        Object.values(this.#data.options.materials).forEach((material) => (material.changed = false));
-        this.#data.options.camera.changed = false;
-        this.#logDebug("Reset change flags across containers and options");
+        const reset = (node) => {
+            node.changed = { pending: false, success: false };
+        };
+        Object.values(this.#data.containers).forEach(reset);
+        Object.values(this.#data.options.materials).forEach(reset);
+        reset(this.#data.options.camera);
     }
 
     // Babylon.js
     async #initializeBabylon() {
-        this.#logInfo("Initializing Babylon engine and scene");
         this.#engine = new Engine(this.#canvas, true, { alpha: true });
+        this.#engine.disableUniformBuffers = true;
         this.#scene = new Scene(this.#engine);
         this.#scene.clearColor = new Color4(1, 1, 1, 1);
         this.#createCamera();
         this.#createLights();
         this.#setupInteraction();
-
-        this.#engine.runRenderLoop(() => this.#scene && this.#scene.render());
-        this.#canvasResizeObserver.observe(this.#canvas);
-        this.#logDebug("Engine render loop started and resize observer attached");
-
         await this.#createXRExperience();
-        this.#logInfo("Babylon initialization finished", { xrEnabled: !!this.#XRExperience });
+        this.#engine.runRenderLoop(this.#renderLoop);
+        this.#canvasResizeObserver.observe(this.#canvas);
     }
 
-    addStylesToARButton() {
-        this.#logDebug("Adding styles to AR button");
+    // If this function is defined as '#renderLoop() {}' it is not executed in 'this.#engine.runRenderLoop(this.#renderLoop)'
+    #renderLoop = () => {
+        this.#scene && this.#scene.render();
+    };
+
+    #addStylesToARButton() {
         const css = '.babylonVRicon { color: #868686; border-color: #868686; border-style: solid; margin-left: 10px; height: 50px; width: 80px; background-color: rgba(51,51,51,0.7); background-image: url(data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%222048%22%20height%3D%221152%22%20viewBox%3D%220%200%202048%201152%22%20version%3D%221.1%22%3E%3Cpath%20transform%3D%22rotate%28180%201024%2C576.0000000000001%29%22%20d%3D%22m1109%2C896q17%2C0%2030%2C-12t13%2C-30t-12.5%2C-30.5t-30.5%2C-12.5l-170%2C0q-18%2C0%20-30.5%2C12.5t-12.5%2C30.5t13%2C30t30%2C12l170%2C0zm-85%2C256q59%2C0%20132.5%2C-1.5t154.5%2C-5.5t164.5%2C-11.5t163%2C-20t150%2C-30t124.5%2C-41.5q23%2C-11%2042%2C-24t38%2C-30q27%2C-25%2041%2C-61.5t14%2C-72.5l0%2C-257q0%2C-123%20-47%2C-232t-128%2C-190t-190%2C-128t-232%2C-47l-81%2C0q-37%2C0%20-68.5%2C14t-60.5%2C34.5t-55.5%2C45t-53%2C45t-53%2C34.5t-55.5%2C14t-55.5%2C-14t-53%2C-34.5t-53%2C-45t-55.5%2C-45t-60.5%2C-34.5t-68.5%2C-14l-81%2C0q-123%2C0%20-232%2C47t-190%2C128t-128%2C190t-47%2C232l0%2C257q0%2C68%2038%2C115t97%2C73q54%2C24%20124.5%2C41.5t150%2C30t163%2C20t164.5%2C11.5t154.5%2C5.5t132.5%2C1.5zm939%2C-298q0%2C39%20-24.5%2C67t-58.5%2C42q-54%2C23%20-122%2C39.5t-143.5%2C28t-155.5%2C19t-157%2C11t-148.5%2C5t-129.5%2C1.5q-59%2C0%20-130%2C-1.5t-148%2C-5t-157%2C-11t-155.5%2C-19t-143.5%2C-28t-122%2C-39.5q-34%2C-14%20-58.5%2C-42t-24.5%2C-67l0%2C-257q0%2C-106%2040.5%2C-199t110%2C-162.5t162.5%2C-109.5t199%2C-40l81%2C0q27%2C0%2052%2C14t50%2C34.5t51%2C44.5t55.5%2C44.5t63.5%2C34.5t74%2C14t74%2C-14t63.5%2C-34.5t55.5%2C-44.5t51%2C-44.5t50%2C-34.5t52%2C-14l14%2C0q37%2C0%2070%2C0.5t64.5%2C4.5t63.5%2C12t68%2C23q71%2C30%20128.5%2C78.5t98.5%2C110t63.5%2C133.5t22.5%2C149l0%2C257z%22%20fill%3D%22white%22%20/%3E%3C/svg%3E%0A); background-size: 80%; background-repeat:no-repeat; background-position: center; border: none; outline: none; transition: transform 0.125s ease-out } .babylonVRicon:hover { transform: scale(1.05) } .babylonVRicon:active {background-color: rgba(51,51,51,1) } .babylonVRicon:focus {background-color: rgba(51,51,51,1) }.babylonVRicon.vrdisplaypresenting { background-image: none;} .vrdisplaypresenting::after { content: "EXIT"} .xr-error::after { content: "ERROR"}';
         const style = document.createElement("style");
         style.appendChild(document.createTextNode(css));
         this.#wrapper.appendChild(style);
-        this.#logDebug("AR button styles applied");
     }
 
     async #createXRExperience() {
         if (this.#XRExperience) {
-            this.#logDebug("XR experience already created, skipping");
             return true;
         }
 
-        this.#logDebug("Attempting to create XR experience");
         const sessionMode = "immersive-ar";
         const sessionSupported = await WebXRSessionManager.IsSessionSupportedAsync(sessionMode);
         if (!sessionSupported) {
-            this.#logInfo("WebXR session mode not supported", { sessionMode });
+            console.info("PrefViewer: WebXR in mode AR is not supported");
             return false;
         }
 
@@ -407,7 +445,6 @@ class PrefViewer extends HTMLElement {
             };
 
             this.#XRExperience = await WebXRDefaultExperience.CreateAsync(this.#scene, options);
-            this.#logInfo("XR experience created successfully", { sessionMode });
 
             const featuresManager = this.#XRExperience.baseExperience.featuresManager;
             featuresManager.enableFeature(WebXRFeatureName.TELEPORTATION, "stable", {
@@ -415,50 +452,41 @@ class PrefViewer extends HTMLElement {
                 floorMeshes: [ground],
                 timeToTeleport: 1500,
             });
-            this.#logDebug("XR teleportation feature enabled");
 
             this.#XRExperience.baseExperience.sessionManager.onXRReady.add(() => {
                 // Set the initial position of xrCamera: use nonVRCamera, which contains a copy of the original this.#scene.activeCamera before entering XR
                 this.#XRExperience.baseExperience.camera.setTransformationFromNonVRCamera(this.#XRExperience.baseExperience._nonVRCamera);
                 this.#XRExperience.baseExperience.camera.setTarget(Vector3.Zero());
                 this.#XRExperience.baseExperience.onInitialXRPoseSetObservable.notifyObservers(this.#XRExperience.baseExperience.camera);
-                this.#logDebug("XR session ready and camera transformed");
             });
 
-            this.addStylesToARButton();
+            this.#addStylesToARButton();
         } catch (error) {
-            this.#logWarn("Failed to create XR experience", { error });
+            console.warn("PrefViewer: failed to create WebXR experience", error);
             this.#XRExperience = null;
         }
     }
 
-    #canvasResizeObserver = new ResizeObserver(() => {
-        if (this.#engine) {
-            this.#logDebug("Resize observer triggered");
-            this.#engine.resize();
-        }
-    });
+    #canvasResizeObserver = new ResizeObserver(() => this.#engine && this.#engine.resize());
 
     #createCamera() {
-        this.#logDebug("Creating default camera");
         this.#camera = new ArcRotateCamera("camera", (3 * Math.PI) / 2, Math.PI * 0.47, 10, Vector3.Zero(), this.#scene);
         this.#camera.upperBetaLimit = Math.PI * 0.48;
         this.#camera.lowerBetaLimit = Math.PI * 0.25;
         this.#camera.lowerRadiusLimit = 5;
         this.#camera.upperRadiusLimit = 20;
-        this.#camera.metadata = { locked: false }
-        this.#camera = this.#camera;
+        this.#camera.metadata = { locked: false };
         this.#camera.attachControl(this.#canvas, true);
-        this.#logDebug("Camera created", {
-            upperBetaLimit: this.#camera.upperBetaLimit,
-            lowerBetaLimit: this.#camera.lowerBetaLimit,
-            lowerRadiusLimit: this.#camera.lowerRadiusLimit,
-            upperRadiusLimit: this.#camera.upperRadiusLimit,
-        });
+        this.#scene.activeCamera = this.#camera;
     }
 
     #createLights() {
-        this.#logDebug("Creating scene lights");
+        this.#initEnvironmentTexture();
+
+        if (this.#scene.environmentTexture) {
+            return true;
+        }
+
         // 1) Stronger ambient fill
         this.#hemiLight = new HemisphericLight("hemiLight", new Vector3(-10, 10, -10), this.#scene);
         this.#hemiLight.intensity = 0.6;
@@ -468,7 +496,7 @@ class PrefViewer extends HTMLElement {
         this.#dirLight.position = new Vector3(5, 4, 5); // light is IN FRONT + ABOVE + to the RIGHT
         this.#dirLight.intensity = 0.6;
 
-        // 3) Soft shadows
+        // // 3) Soft shadows
         this.#shadowGen = new ShadowGenerator(1024, this.#dirLight);
         this.#shadowGen.useBlurExponentialShadowMap = true;
         this.#shadowGen.blurKernel = 16;
@@ -478,52 +506,120 @@ class PrefViewer extends HTMLElement {
         this.#cameraLight = new PointLight("pl", this.#camera.position, this.#scene);
         this.#cameraLight.parent = this.#camera;
         this.#cameraLight.intensity = 0.3;
-        this.#logDebug("Scene lights configured", {
-            hemiIntensity: this.#hemiLight.intensity,
-            dirIntensity: this.#dirLight.intensity,
-            pointIntensity: this.#cameraLight.intensity,
-            shadowKernel: this.#shadowGen.blurKernel,
+    }
+
+    #initEnvironmentTexture() {
+        return false;
+        if (this.#scene.environmentTexture) {
+            return true;
+        }
+        const hdrTextureURI = "../src/environments/noon_grass.hdr";
+        const hdrTexture = new HDRCubeTexture(hdrTextureURI, this.#scene, 128);
+        hdrTexture.gammaSpace = true;
+        hdrTexture._noMipmap = false;
+        hdrTexture.level = 2.0;
+        this.#scene.environmentTexture = hdrTexture;
+    }
+
+    #initIBLShadows() {
+        if (!this.#scene.environmentTexture) {
+            return false;
+        }
+
+        let createIBLShadowPipeline = function (scene) {
+            const pipeline = new IblShadowsRenderPipeline(
+                "iblShadowsPipeline",
+                scene,
+                {
+                    resolutionExp: 7,
+                    sampleDirections: 2,
+                    ssShadowsEnabled: true,
+                    shadowRemanence: 0.8,
+                    triPlanarVoxelization: true,
+                    shadowOpacity: 0.8,
+                },
+                [scene.activeCamera]
+            );
+            pipeline.allowDebugPasses = false;
+            pipeline.gbufferDebugEnabled = true;
+            pipeline.importanceSamplingDebugEnabled = false;
+            pipeline.voxelDebugEnabled = false;
+            pipeline.voxelDebugDisplayMip = 1;
+            pipeline.voxelDebugAxis = 2;
+            pipeline.voxelTracingDebugEnabled = false;
+            pipeline.spatialBlurPassDebugEnabled = false;
+            pipeline.accumulationPassDebugEnabled = false;
+            return pipeline;
+        };
+
+        let iblShadowsPipeline = createIBLShadowPipeline(this.#scene);
+
+        this.#scene.meshes.forEach((mesh) => {
+            if (mesh.id.startsWith("__root__") || mesh.name === "hdri") {
+                return false;
+            }
+            iblShadowsPipeline.addShadowCastingMesh(mesh);
+            iblShadowsPipeline.updateSceneBounds();
+        });
+
+        this.#scene.materials.forEach((material) => {
+            iblShadowsPipeline.addShadowReceivingMaterial(material);
         });
     }
 
+    #initShadows() {
+        if (!this.#scene.environmentTexture) {
+            this.#initIBLShadows();
+            return true;
+        }
+
+        this.#scene.meshes.forEach((mesh) => {
+            if (mesh.id.startsWith("__root__")) {
+                return false;
+            }
+            mesh.receiveShadows = true;
+            if (!mesh.name === "hdri") {
+                this.#shadowGen.addShadowCaster(mesh, true);
+            }
+        });
+    }
+
+    #setMaxSimultaneousLights() {
+        let lightsNumber = 1; // Como mínimo una luz correspondiente a la textura de environmentTexture
+        this.#scene.lights.forEach((light) => {
+            if (light.isEnabled()) {
+                ++lightsNumber;
+            }
+        });
+        if (this.#scene.materials) {
+            this.#scene.materials.forEach((material) => (material.maxSimultaneousLights = lightsNumber));
+        }
+    }
+
     #setupInteraction() {
-        this.#logDebug("Setting up canvas interaction listeners");
         this.#canvas.addEventListener("wheel", (event) => {
             if (!this.#scene || !this.#camera) {
-                this.#logWarn("Wheel interaction ignored; scene or camera missing");
                 return false;
             }
             //const pick = this.#scene.pick(this.#scene.pointerX, this.#scene.pointerY);
             //this.#camera.target = pick.hit ? pick.pickedPoint.clone() : this.#camera.target;
             if (!this.#scene.activeCamera.metadata?.locked) {
                 this.#scene.activeCamera.inertialRadiusOffset -= event.deltaY * this.#scene.activeCamera.wheelPrecision * 0.001;
-                this.#logDebug("Processed wheel interaction", {
-                    deltaY: event.deltaY,
-                    inertialRadiusOffset: this.#scene.activeCamera.inertialRadiusOffset,
-                });
-            } else {
-                this.#logDebug("Wheel interaction ignored because camera is locked");
             }
             event.preventDefault();
         });
     }
 
     #disposeEngine() {
-        if (!this.#engine) {
-            this.#logDebug("Dispose engine called but engine already null");
-            return;
-        }
-        this.#logDebug("Disposing Babylon resources");
+        if (!this.#engine) return;
         this.#engine.dispose();
         this.#engine = this.#scene = this.#camera = null;
         this.#hemiLight = this.#dirLight = this.#cameraLight = null;
         this.#shadowGen = null;
-        this.#logDebug("Babylon resources disposed");
     }
 
     // Utility methods for loading gltf/glb
     async #getServerFileDataHeader(uri) {
-        this.#logDebug("Requesting server file header", { uri });
         return new Promise((resolve) => {
             const xhr = new XMLHttpRequest();
             xhr.open("HEAD", uri, true);
@@ -531,17 +627,14 @@ class PrefViewer extends HTMLElement {
             xhr.onload = () => {
                 if (xhr.status === 200) {
                     const size = parseInt(xhr.getResponseHeader("Content-Length"));
-                    const timestamp = new Date(xhr.getResponseHeader("Last-Modified")).toISOString();
-                    this.#logDebug("Received server file header", { uri, size, timestamp });
-                    resolve(size, timestamp);
+                    const timeStamp = new Date(xhr.getResponseHeader("Last-Modified")).toISOString();
+                    resolve([size, timeStamp]);
                 } else {
-                    this.#logWarn("Failed to retrieve server file header", { uri, status: xhr.status });
-                    resolve(0, null);
+                    resolve([0, null]);
                 }
             };
             xhr.onerror = () => {
-                this.#logError("Error requesting server file header", { uri });
-                resolve(0, null);
+                resolve([0, null]);
             };
             xhr.send();
         });
@@ -549,14 +642,11 @@ class PrefViewer extends HTMLElement {
 
     #transformUrl(url) {
         return new Promise((resolve) => {
-            const transformed = url.replace(/^blob:[^/]+\//i, "").replace(/\\/g, "/");
-            this.#logDebug("Transformed URL", { original: url, transformed });
-            resolve(transformed);
+            resolve(url.replace(/^blob:[^/]+\//i, "").replace(/\\/g, "/"));
         });
     }
 
     #decodeBase64(base64) {
-        this.#logDebug("Decoding Base64 payload", { length: base64 ? base64.length : 0 });
         const [, payload] = base64.split(",");
         const raw = payload || base64;
         let decoded = "";
@@ -566,7 +656,6 @@ class PrefViewer extends HTMLElement {
         try {
             decoded = atob(raw);
         } catch {
-            this.#logWarn("Failed to decode Base64 string");
             return { blob, extension, size };
         }
         let isJson = false;
@@ -578,62 +667,44 @@ class PrefViewer extends HTMLElement {
         const type = isJson ? "model/gltf+json" : "model/gltf-binary";
         const array = Uint8Array.from(decoded, (c) => c.charCodeAt(0));
         blob = new Blob([array], { type });
-        this.#logDebug("Decoded Base64 payload", { isJson, size, extension });
         return { blob, extension, size };
     }
 
     async #initStorage(db, table) {
-        this.#logDebug("Initializing storage access", { db, table });
         if (window.gltfDB && window.gltfDB.name === db && window.gltfDB.objectStoreNames.contains(table)) {
-            this.#logDebug("Reusing existing IndexedDB connection", { db, table });
             return true;
         }
         await initDb(db, table);
-        this.#logDebug("IndexedDB initialized", { db, table });
     }
 
     // Methods for managing Asset Containers
     #setVisibilityOfWallAndFloorInModel(show) {
         if (!this.#data.containers.model.assetContainer || !this.#data.containers.model.visible) {
-            this.#logDebug("Skipping wall/floor visibility update", {
-                hasModel: !!this.#data.containers.model.assetContainer,
-                modelVisible: this.#data.containers.model.visible,
-            });
             return false;
         }
         show = show !== undefined ? show : this.#data.containers.environment.visible;
         const prefixes = Object.values(this.#data.options.materials).map((material) => material.prefix);
         this.#data.containers.model.assetContainer.meshes.filter((meshToFilter) => prefixes.some((prefix) => meshToFilter.name.startsWith(prefix))).forEach((mesh) => mesh.setEnabled(show));
-        this.#logDebug("Updated wall and floor visibility", { show });
     }
 
     #setOptionsMaterial(optionMaterial) {
         if (!optionMaterial || !optionMaterial.prefix || !optionMaterial.value) {
-            this.#logWarn("Material option invalid", { optionMaterial });
             return false;
         }
 
-        this.#logDebug("Applying material option", {
-            prefix: optionMaterial.prefix,
-            value: optionMaterial.value,
-            changed: optionMaterial.changed,
-        });
-
         const material = this.#data.containers.materials.assetContainer?.materials.find((mat) => mat.name === optionMaterial.value) || null;
         if (!material) {
-            this.#logWarn("Requested material not found", { value: optionMaterial.value });
             return false;
         }
 
         const containers = [];
-        if (this.#data.containers.model.assetContainer && (this.#data.containers.model.assetContainer.changed || optionMaterial.changed)) {
+        if (this.#data.containers.model.assetContainer && (this.#data.containers.model.changed.pending || this.#data.containers.materials.changed.pending || optionMaterial.changed.pending)) {
             containers.push(this.#data.containers.model.assetContainer);
         }
-        if (this.#data.containers.environment.assetContainer && (this.#data.containers.environment.assetContainer.changed || optionMaterial.changed)) {
+        if (this.#data.containers.environment.assetContainer && (this.#data.containers.environment.changed.pending || this.#data.containers.materials.changed.pending || optionMaterial.changed.pending)) {
             containers.push(this.#data.containers.environment.assetContainer);
         }
         if (containers.length === 0) {
-            this.#logDebug("No containers required material update", { prefix: optionMaterial.prefix });
             return false;
         }
 
@@ -644,145 +715,204 @@ class PrefViewer extends HTMLElement {
                 .forEach((mesh) => {
                     mesh.material = material;
                     someSetted = true;
-                    this.#logDebug("Assigned material to mesh", { mesh: mesh.name, material: material.name });
                 })
         );
 
-        this.#logDebug("Material option applied", {
-            prefix: optionMaterial.prefix,
-            value: optionMaterial.value,
-            applied: someSetted,
-            containers: containers.map((container) => container.name),
-        });
+        if (someSetted) {
+            optionMaterial.changed.success = true;
+        } else if (optionMaterial.changed.pending) {
+            optionMaterial.value = optionMaterial.changed.value;
+            optionMaterial.changed.success = false;
+        }
 
         return someSetted;
     }
 
     #setOptionsMaterials() {
-        if (!this.#data.containers.materials.assetContainer) {
-            this.#logDebug("Skipping materials update; materials container is missing");
-            return false;
-        }
-
-        this.#logDebug("Applying material options batch");
         let someSetted = false;
         Object.values(this.#data.options.materials).forEach((material) => {
             let settedMaterial = this.#setOptionsMaterial(material);
             someSetted = someSetted || settedMaterial;
         });
-        this.#logDebug("Material batch processing finished", { appliedAny: someSetted });
         return someSetted;
     }
 
     #setOptionsCamera() {
-        if (!this.#data.options.camera.value || (!this.#data.options.camera.changed && !this.#data.containers.model.assetContainer.changed)) {
-            this.#logDebug("No camera option update necessary", {
-                value: this.#data.options.camera.value,
-                changed: this.#data.options.camera.changed,
-                modelChanged: this.#data.containers.model.assetContainer?.changed,
-            });
+        if (!this.#data.options.camera.value && !this.#data.options.camera.changed.pending && !this.#data.containers.model.changed.pending && !this.#data.containers.environment.changed.pending) {
             return false;
         }
 
-        let camera = this.#data.containers.model.assetContainer?.cameras.find((cam) => cam.name === this.#data.options.camera.value) || null;
+        let camera = this.#data.containers.model.assetContainer?.cameras.find((thisCamera) => thisCamera.name === this.#data.options.camera.value) || this.#data.containers.environment.assetContainer?.cameras.find((thisCamera) => thisCamera.name === this.#data.options.camera.value) || null;
         if (!camera) {
-            this.#logWarn("Requested camera not found", { name: this.#data.options.camera.value });
-            return false;
+            if (this.#data.options.camera.changed.value && this.#data.options.camera.changed.value !== this.#data.options.camera.value) {
+                camera = this.#data.containers.model.assetContainer?.cameras.find((thisCamera) => thisCamera.name === this.#data.options.camera.changed.value) || this.#data.containers.environment.assetContainer?.cameras.find((thisCamera) => thisCamera.name === this.#data.options.camera.changed.value) || null;
+            }
+            if (camera) {
+                camera.metadata = { locked: this.#data.options.camera.changed.locked };
+                this.#data.options.camera.value = this.#data.options.camera.changed.value;
+                this.#data.options.camera.locked = this.#data.options.camera.changed.locked;
+                this.#data.options.camera.changed.success = false;
+            } else {
+                camera = this.#camera;
+                this.#data.options.camera.value = null;
+                this.#data.options.camera.locked = this.#camera.metadata.locked;
+                this.#data.options.camera.changed.success = false;
+            }
+        } else {
+            camera.metadata = { locked: this.#data.options.camera.locked };
+            if (this.#data.options.camera.changed.pending) {
+                this.#data.options.camera.changed.success = true;
+            }
         }
-
-        camera.metadata = { locked: this.#data.options.camera.locked };
-        if (!this.#data.options.camera.locked) {
+        if (!this.#data.options.camera.locked && this.#data.options.camera.value !== null) {
             camera.attachControl(this.#canvas, true);
-            this.#logDebug("Attached unlocked camera control", { camera: camera.name });
-        } else {
-            this.#logDebug("Using locked camera configuration", { camera: camera.name });
         }
         this.#scene.activeCamera = camera;
-        this.#logDebug("Active camera set", { camera: camera.name });
-
         return true;
     }
 
     #addContainer(container) {
-        if (container.assetContainer && !container.visible && container.show) {
-            container.assetContainer.addAllToScene();
-            container.visible = true;
-            this.#logDebug("Added container to scene", { name: container.name });
-        } else {
-            this.#logDebug("Skipped adding container", {
-                name: container?.name,
-                hasAssetContainer: !!container?.assetContainer,
-                visible: container?.visible,
-                show: container?.show,
-            });
+        if (!container.assetContainer || container.visible || !container.show) {
+            return false;
         }
+
+        container.assetContainer.addAllToScene();
+        container.visible = true;
+        return true;
     }
 
     #removeContainer(container) {
-        if (container.assetContainer && container.visible) {
-            container.assetContainer.removeAllFromScene();
-            container.visible = false;
-            this.#logDebug("Removed container from scene", { name: container.name });
-        } else {
-            this.#logDebug("Skipped removing container", {
-                name: container?.name,
-                hasAssetContainer: !!container?.assetContainer,
-                visible: container?.visible,
-            });
+        if (!container.assetContainer || !container.visible) {
+            return false;
         }
+
+        container.assetContainer.removeAllFromScene();
+        container.visible = false;
+        return true;
     }
 
     #replaceContainer(container, newAssetContainer) {
-        this.#logDebug("Replacing container asset", { name: container.name });
-        this.#removeContainer(container);
+        if (container.assetContainer) {
+            this.#removeContainer(container);
+            container.assetContainer.dispose();
+            container.assetContainer = null;
+        }
+        this.#scene.getEngine().releaseEffects();
         container.assetContainer = newAssetContainer;
-        container.assetContainer.meshes.forEach((mesh) => {
-            mesh.receiveShadows = true;
-            this.#shadowGen.addShadowCaster(mesh, true);
-            this.#logDebug("Configured mesh for shadows", { container: container.name, mesh: mesh.name });
-        });
         this.#addContainer(container);
-        this.#logDebug("Container replacement complete", {
-            name: container.name,
-            meshCount: container.assetContainer.meshes.length,
+        return true;
+    }
+
+    /**
+     * Replace internal URIs in a glTF AssetContainer JSON with URLs pointing to files stored in IndexedDB.
+     * @param {JSON} assetContainerJSON AssetContainer in glTF (JSON) (modified in-place).
+     * @param {URL} [assetContainerURL] Optional URL of the AssetContainer. Used as the base path to resolve relative URIs.
+     * @returns {Promise<void>} Resolves when all applicable URIs have been resolved/replaced.
+     * @description
+     * - When provided, assetContainerURL is used as the base path for other scene files (binary buffers and all images).
+     *   If not provided (null/undefined), it is because it is the assetContainer of the model or materials whose URIs are absolute.
+     * - According to the glTF 2.0 spec, only items inside the "buffers" and "images" arrays may have a "uri" property.
+     * - Data URIs (embedded base64) are ignored and left unchanged.
+     * - Matching asset URIs are normalized (backslashes converted to forward slashes) and passed to the FileStorage layer
+     *   to obtain a usable URL (object URL or cached URL).
+     * - The function performs replacements in parallel and waits for all lookups to complete.
+     * - The JSON is updated in-place with the resolved URLs.
+     * @see {@link https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#uris|glTF™ 2.0 Specification - URIs}
+     */
+    async #replaceSceneURIAsync(assetContainerJSON, assetContainerURL) {
+        if (!assetContainerJSON) {
+            return;
+        }
+
+        let sceneURLBase = assetContainerURL;
+
+        if (typeof assetContainerURL === "string") {
+            const lastIndexOfSlash = assetContainerURL.lastIndexOf("/");
+            if (lastIndexOfSlash !== -1) {
+                sceneURLBase = assetContainerURL.substring(0, lastIndexOfSlash + 1);
+            }
+        }
+
+        const arrayOfAssetsWithURI = [];
+
+        /**
+         * Check whether a value is a syntactically absolute URL.
+         * @param {string} url Value to test.
+         * @returns {boolean} True when `url` is a string that can be parsed by the global URL constructor (i.e. a syntactically absolute URL); false otherwise.
+         * @description
+         *  - Returns false for non-string inputs.
+         *  - Uses the browser's URL parser, so protocol-relative URLs ("//host/...") and relative paths are considered non-absolute.
+         *  - This is a syntactic check only — it does not perform network requests or validate reachability/CORS.
+         */
+        var isURLAbsolute = function (url) {
+            if (typeof url !== "string") {
+                return false;
+            }
+            try {
+                new URL(url);
+                return true;
+            } catch {
+                return false;
+            }
+        };
+
+        /**
+         * Collect asset entries that have an external URI (non-data URI) and store a normalized absolute/relative-resolved URI for later replacement.
+         * @param {Object} asset glTF asset entry (an element of buffers[] or images[]).
+         * @param {number} index Index of the asset within its parent array.
+         * @param {Array}  array Reference to the parent array (buffers or images).
+         * @returns {void} Side-effect: pushes a record into arrayOfAssetsWithURI when applicable { parent: <array>, index: <number>, uri: <string> }.
+         */
+        var saveAssetData = function (asset, index, array) {
+            if (asset.uri && !asset.uri.startsWith("data:")) {
+                const assetData = {
+                    parent: array,
+                    index: index,
+                    uri: `${!isURLAbsolute(asset.uri) && sceneURLBase ? sceneURLBase : ""}${asset.uri}`.replace(/\\\\|\\|\/\\/g, "/"),
+                };
+                arrayOfAssetsWithURI.push(assetData);
+            }
+        };
+
+        if (assetContainerJSON.buffers) {
+            assetContainerJSON.buffers.forEach((asset, index, array) => saveAssetData(asset, index, array));
+        }
+        if (assetContainerJSON.images) {
+            assetContainerJSON.images.forEach((asset, index, array) => saveAssetData(asset, index, array));
+        }
+
+        // Replace parallel URIs so that if files are not stored yet, they are downloaded in parallel
+        const promisesArray = arrayOfAssetsWithURI.map(async (asset) => {
+            const uri = await this.#fileStorage.getURL(asset.uri);
+            if (uri) {
+                asset.parent[asset.index].uri = uri;
+            }
         });
+        await Promise.all(promisesArray);
     }
 
     async #loadAssetContainer(container) {
-        const storage = container?.storage;
-        this.#logDebug("Requested asset container load", {
-            container: container?.name,
-            storage: this.#describeStorage(storage),
-        });
+        let storage = container?.storage;
 
         if (!storage) {
-            this.#logWarn("No storage configuration provided for container", { container: container?.name });
             return false;
         }
 
         let source = storage.url || null;
 
         if (storage.db && storage.table && storage.id) {
-            this.#logDebug("Loading container from IndexedDB", {
-                container: container.name,
-                db: storage.db,
-                table: storage.table,
-                id: storage.id,
-            });
             await this.#initStorage(storage.db, storage.table);
             const object = await loadModel(storage.id, storage.table);
             source = object.data;
-            if (object.timestamp === container.timestamp) {
-                this.#logDebug("IndexedDB model unchanged; skipping reload", { container: container.name });
+            if (object.timeStamp === container.timeStamp) {
+                container.changed = { pending: false, success: false };
                 return false;
             } else {
-                container.changed = { timestamp: object.timestamp, size: object.size };
-                this.#logDebug("IndexedDB model marked as changed", { container: container.name, metadata: container.changed });
+                container.changed = { pending: true, size: object.size, success: false, timeStamp: object.timeStamp };
             }
         }
 
         if (!source) {
-            this.#logWarn("No source resolved for container", { container: container.name });
             return false;
         }
 
@@ -790,139 +920,180 @@ class PrefViewer extends HTMLElement {
 
         let { blob, extension, size } = this.#decodeBase64(source);
         if (blob && extension) {
-            this.#logDebug("Source detected as Base64", { container: container.name, extension });
-            file = new File([blob], `${container.name}${extension}`, {
-                type: blob.type,
-            });
-            if (!container.changed) {
-                if (container.timestamp === null && container.size === size) {
-                    this.#logDebug("Base64 model unchanged; skipping reload", { container: container.name, size });
+            if ((container.name === "model" || container.name === "materials") && extension === ".gltf") {
+                const assetContainerJSON = JSON.parse(await blob.text());
+                await this.#replaceSceneURIAsync(assetContainerJSON, source);
+                source = `data:${JSON.stringify(assetContainerJSON)}`;
+            } else {
+                file = new File([blob], `${container.name}${extension}`, {
+                    type: blob.type,
+                });
+            }
+            if (!container.changed.pending) {
+                if (container.timeStamp === null && container.size === size) {
+                    container.changed = { pending: false, success: false };
                     return false;
                 } else {
-                    container.changed = { timestamp: null, size: size };
-                    this.#logDebug("Base64 model marked as changed", { container: container.name, size });
+                    container.changed = { pending: true, size: size, success: false, timeStamp: null };
                 }
             }
         } else {
             const extMatch = source.match(/\.(gltf|glb)(\?|#|$)/i);
             extension = extMatch ? `.${extMatch[1].toLowerCase()}` : ".gltf";
-            const { fileSize, fileTimestamp } = await this.#getServerFileDataHeader(source);
-            if (container.timestamp === fileTimestamp && container.size === fileSize) {
-                this.#logDebug("Remote model unchanged; skipping reload", {
-                    container: container.name,
-                    fileTimestamp,
-                    fileSize,
-                });
+            let [fileSize, fileTimeStamp] = [await this.#fileStorage.getSize(source), await this.#fileStorage.getTimeStamp(source)];
+            if (container.size === fileSize && container.timeStamp === fileTimeStamp) {
+                container.changed = { pending: false, success: false };
                 return false;
             } else {
-                container.changed = { timestamp: fileTimestamp, size: fileSize };
-                this.#logDebug("Remote model marked as changed", { container: container.name, metadata: container.changed });
+                container.changed = { pending: true, size: fileSize, success: false, timeStamp: fileTimeStamp };
+                if (extension === ".gltf") {
+                    const assetContainerBlob = await this.#fileStorage.getBlob(source);
+                    const assetContainerJSON = JSON.parse(await assetContainerBlob.text());
+                    await this.#replaceSceneURIAsync(assetContainerJSON, source);
+                    source = `data:${JSON.stringify(assetContainerJSON)}`;
+                } else {
+                    source = await this.#fileStorage.getURL(source);
+                }
             }
         }
 
+        // https://doc.babylonjs.com/typedoc/interfaces/BABYLON.LoadAssetContainerOptions
         let options = {
             pluginExtension: extension,
             pluginOptions: {
                 gltf: {
+                    compileMaterials: true,
                     loadAllMaterials: true,
-                    preprocessUrlAsync: this.#transformUrl,
+                    loadOnlyMaterials: container.name === "materials",
+                    //preprocessUrlAsync: this.#transformUrl,
                 },
             },
         };
 
-        this.#logInfo("Loading asset container", { container: container.name, extension });
         return LoadAssetContainerAsync(file || source, this.#scene, options);
     }
 
     async #loadContainers(loadModel = true, loadEnvironment = true, loadMaterials = true) {
-        this.#logInfo("Starting container load", { loadModel, loadEnvironment, loadMaterials });
+        this.#engine.stopRenderLoop(this.#renderLoop);
+
         const promiseArray = [];
         promiseArray.push(loadModel ? this.#loadAssetContainer(this.#data.containers.model) : false);
         promiseArray.push(loadEnvironment ? this.#loadAssetContainer(this.#data.containers.environment) : false);
         promiseArray.push(loadMaterials ? this.#loadAssetContainer(this.#data.containers.materials) : false);
 
         Promise.allSettled(promiseArray)
-            .then(async (values) => {
+            .then((values) => {
                 const modelContainer = values[0];
                 const environmentContainer = values[1];
                 const materialsContainer = values[2];
 
                 if (modelContainer.status === "fulfilled" && modelContainer.value) {
+                    modelContainer.value.lights = [];
                     this.#replaceContainer(this.#data.containers.model, modelContainer.value);
-                    this.#storeChangedFlagsForContainer(this.#data.containers.model);
-                    this.#logInfo("Model container loaded successfully");
+                    this.#storeChangedFlagsForContainer(this.#data.containers.model, true);
                 } else {
-                    this.#data.containers.model.show ? this.#addContainer(this.#data.containers.model) : this.#removeContainer(this.#data.containers.model);
-                    this.#logDebug("Model container load skipped or failed", { status: modelContainer.status });
+                    if (this.#data.containers.model.assetContainer && this.#data.containers.model.show !== this.#data.containers.model.visible) {
+                        this.#data.containers.model.show ? this.#addContainer(this.#data.containers.model) : this.#removeContainer(this.#data.containers.model);
+                    }
+                    this.#storeChangedFlagsForContainer(this.#data.containers.model, false);
                 }
 
                 if (environmentContainer.status === "fulfilled" && environmentContainer.value) {
                     this.#replaceContainer(this.#data.containers.environment, environmentContainer.value);
-                    this.#storeChangedFlagsForContainer(this.#data.containers.environment);
-                    this.#logInfo("Environment container loaded successfully");
+                    this.#storeChangedFlagsForContainer(this.#data.containers.environment, true);
                 } else {
-                    this.#data.containers.environment.show ? this.#addContainer(this.#data.containers.environment) : this.#removeContainer(this.#data.containers.environment);
-                    this.#logDebug("Environment container load skipped or failed", { status: environmentContainer.status });
+                    if (this.#data.containers.environment.assetContainer && this.#data.containers.environment.show !== this.#data.containers.environment.visible) {
+                        this.#data.containers.environment.show ? this.#addContainer(this.#data.containers.environment) : this.#removeContainer(this.#data.containers.environment);
+                    }
+                    this.#storeChangedFlagsForContainer(this.#data.containers.environment, false);
                 }
 
                 if (materialsContainer.status === "fulfilled" && materialsContainer.value) {
                     this.#replaceContainer(this.#data.containers.materials, materialsContainer.value);
-                    this.#storeChangedFlagsForContainer(this.#data.containers.materials);
-                    this.#logInfo("Materials container loaded successfully");
+                    this.#storeChangedFlagsForContainer(this.#data.containers.materials, true);
                 } else {
-                    this.#logDebug("Materials container load skipped or failed", { status: materialsContainer.status });
+                    this.#storeChangedFlagsForContainer(this.#data.containers.materials, false);
                 }
 
                 this.#setOptionsMaterials();
                 this.#setOptionsCamera();
                 this.#setVisibilityOfWallAndFloorInModel();
-
-                this.#resetChangedFlags();
-
-                this.#logInfo("Containers load routine completed");
-                this.dispatchEvent(
-                    new CustomEvent("model-loaded", {
-                        detail: { success: "" },
-                        bubbles: true,
-                        composed: true,
-                    })
-                );
-                this.#logDebug("Dispatched model-loaded event");
             })
             .catch((error) => {
-                this.#logError("Failed to load containers", { error });
+                this.loaded = true;
+                console.error("PrefViewer: failed to load model", error);
                 this.dispatchEvent(
-                    new CustomEvent("model-error", {
-                        detail: { error: error },
+                    new CustomEvent("scene-error", {
                         bubbles: true,
+                        cancelable: false,
                         composed: true,
+                        detail: { error: error },
                     })
                 );
+            })
+            .finally(async () => {
+                this.#setMaxSimultaneousLights();
+                this.#initShadows();
+                await this.#setStatusLoaded();
             });
     }
 
-    // Public Methods
-    loadConfig(config) {
-        this.#logInfo("loadConfig called", { initialized: this.#initialized, inputType: typeof config });
-        if (typeof config === "string") {
-            try {
-                config = JSON.parse(config);
-            } catch (error) {
-                this.#logError("Failed to parse config JSON", { error });
-                throw error;
-            }
+    // Tasks
+    #addTaskToQueue(value, type) {
+        this.#taskQueue.push(new PrefViewerTask(value, type));
+        if (this.initialized && !this.loading) {
+            this.#processNextTask();
         }
-        if (!config) {
-            this.#logWarn("No config provided");
+    }
+
+    #processNextTask() {
+        if (!this.#taskQueue.length) {
             return false;
         }
+        const task = this.#taskQueue[0];
+        this.#taskQueue.shift();
+        switch (task.type) {
+            case PrefViewerTask.Types.Config:
+                this.#processConfig(task.value);
+                break;
+            case PrefViewerTask.Types.Model:
+                this.#processModel(task.value);
+                break;
+            case PrefViewerTask.Types.Environment:
+                this.#processEnvironment(task.value);
+                break;
+            case PrefViewerTask.Types.Materials:
+                this.#processMaterials(task.value);
+                break;
+            case PrefViewerTask.Types.Options:
+                this.#processOptions(task.value);
+                break;
+        }
+    }
+
+    #processConfig(config) {
+        this.#setStatusLoading();
 
         // Containers
-        this.#data.containers.model.storage = config.model?.storage || null;
+        const loadModel = !!config.model?.storage;
+        this.#data.containers.model.changed.pending = loadModel;
+        this.#data.containers.model.changed.success = false;
+        this.#data.containers.model.changed.storage = this.#data.containers.model.storage;
+        this.#data.containers.model.storage = loadModel ? config.model.storage : this.#data.containers.model.storage;
         this.#data.containers.model.show = config.model?.visible !== undefined ? config.model.visible : this.#data.containers.model.show;
-        this.#data.containers.environment.storage = config.scene?.storage || null;
+
+        const loadEnvironment = !!config.scene?.storage;
+        this.#data.containers.environment.changed.pending = loadEnvironment;
+        this.#data.containers.environment.changed.success = false;
+        this.#data.containers.environment.changed.storage = this.#data.containers.environment.storage;
+        this.#data.containers.environment.storage = loadEnvironment ? config.scene.storage : this.#data.containers.environment.storage;
         this.#data.containers.environment.show = config.scene?.visible !== undefined ? config.scene.visible : this.#data.containers.environment.show;
-        this.#data.containers.materials.storage = config.materials?.storage || null;
+
+        const loadMaterials = !!config.materials?.storage;
+        this.#data.containers.materials.changed.pending = loadMaterials;
+        this.#data.containers.materials.changed.success = false;
+        this.#data.containers.materials.changed.storage = this.#data.containers.materials.storage;
+        this.#data.containers.materials.storage = loadMaterials ? config.materials.storage : this.#data.containers.materials.storage;
 
         // Options
         if (config.options) {
@@ -930,145 +1101,152 @@ class PrefViewer extends HTMLElement {
             this.#checkMaterialsChanged(config.options);
         }
 
-        this.#logDebug("Config applied", {
-            modelStorage: this.#describeStorage(this.#data.containers.model.storage),
-            environmentStorage: this.#describeStorage(this.#data.containers.environment.storage),
-        });
+        this.#loadContainers(loadModel, loadEnvironment, loadMaterials);
+    }
+
+    #processModel(model) {
+        this.#setStatusLoading();
+
+        const loadModel = !!model.storage;
+        this.#data.containers.model.changed.pending = loadModel;
+        this.#data.containers.model.changed.success = false;
+        this.#data.containers.model.changed.storage = this.#data.containers.model.storage;
+        this.#data.containers.model.storage = loadModel ? model.storage : this.#data.containers.model.storage;
+        this.#data.containers.model.show = model.visible !== undefined ? model.visible : this.#data.containers.model.show;
 
-        this.#initialized && this.#loadContainers(true, true, true);
+        this.initialized && this.#loadContainers(loadModel, false, false);
     }
 
-    setOptions(options) {
-        this.#logInfo("setOptions called", { optionsProvided: !!options });
-        if (!options) {
-            this.#logWarn("setOptions called without options");
-            return false;
-        }
+    #processEnvironment(environment) {
+        this.#setStatusLoading();
+
+        const loadEnvironment = !!environment.storage;
+        this.#data.containers.environment.changed.pending = loadEnvironment;
+        this.#data.containers.environment.changed.success = false;
+        this.#data.containers.environment.changed.storage = this.#data.containers.environment.storage;
+        this.#data.containers.environment.storage = loadEnvironment ? environment.storage : this.#data.containers.environment.storage;
+        this.#data.containers.environment.show = environment.visible !== undefined ? environment.visible : this.#data.containers.environment.show;
+
+        this.#loadContainers(false, loadEnvironment, false);
+    }
+
+    #processMaterials(materials) {
+        this.#setStatusLoading();
+
+        const loadMaterials = !!materials.storage;
+        this.#data.containers.materials.changed.pending = loadMaterials;
+        this.#data.containers.materials.changed.success = false;
+        this.#data.containers.materials.changed.storage = this.#data.containers.materials.storage;
+        this.#data.containers.materials.storage = loadMaterials ? materials.storage : this.#data.containers.materials.storage;
+
+        this.#loadContainers(false, false, loadMaterials);
+    }
+
+    async #processOptions(options) {
+        this.#setStatusLoading();
+
         let someSetted = false;
         if (this.#checkCameraChanged(options)) {
-            this.#logDebug("Camera options changed via setOptions");
             someSetted = someSetted || this.#setOptionsCamera();
         }
         if (this.#checkMaterialsChanged(options)) {
-            this.#logDebug("Material options changed via setOptions");
             someSetted = someSetted || this.#setOptionsMaterials();
         }
-        this.#resetChangedFlags();
-        this.#logDebug("setOptions completed", { appliedAny: someSetted });
-        debugger;
+
+        await this.#setStatusLoaded();
+
         return someSetted;
     }
 
-    loadModel(model) {
-        this.#logInfo("loadModel called", { initialized: this.#initialized, inputType: typeof model });
-        if (typeof model === "string") {
-            try {
-                model = JSON.parse(model);
-            } catch (error) {
-                this.#logError("Failed to parse model JSON", { error });
-                throw error;
-            }
+    // Public Methods
+    loadConfig(config) {
+        config = typeof config === "string" ? JSON.parse(config) : config;
+        if (!config) {
+            return false;
         }
+        this.#addTaskToQueue(config, "config");
+    }
+
+    loadModel(model) {
+        model = typeof model === "string" ? JSON.parse(model) : model;
         if (!model) {
-            this.#logWarn("No model payload provided");
             return false;
         }
-        this.#data.containers.model.storage = model.storage || null;
-        this.#data.containers.model.show = model.visible !== undefined ? model.visible : this.#data.containers.model.show;
-        this.#logDebug("Model configuration updated", {
-            storage: this.#describeStorage(this.#data.containers.model.storage),
-            show: this.#data.containers.model.show,
-        });
-        this.#initialized && this.#loadContainers(true, false, false);
+        this.#addTaskToQueue(model, "model");
     }
 
     loadScene(scene) {
-        this.#logInfo("loadScene called", { initialized: this.#initialized, inputType: typeof scene });
-        if (typeof scene === "string") {
-            try {
-                scene = JSON.parse(scene);
-            } catch (error) {
-                this.#logError("Failed to parse scene JSON", { error });
-                throw error;
-            }
-        }
+        scene = typeof scene === "string" ? JSON.parse(scene) : scene;
         if (!scene) {
-            this.#logWarn("No scene payload provided");
             return false;
         }
-        this.#data.containers.environment.storage = scene.storage || null;
-        this.#data.containers.environment.show = scene.visible !== undefined ? scene.visible : this.#data.containers.environment.show;
-        this.#logDebug("Scene configuration updated", {
-            storage: this.#describeStorage(this.#data.containers.environment.storage),
-            show: this.#data.containers.environment.show,
-        });
-        this.#initialized && this.#loadContainers(false, true, false);
+        this.#addTaskToQueue(scene, "environment");
+    }
+
+    loadMaterials(materials) {
+        materials = typeof materials === "string" ? JSON.parse(materials) : materials;
+        if (!materials) {
+            return false;
+        }
+        this.#addTaskToQueue(materials, "materials");
+    }
+
+    setOptions(options) {
+        options = typeof options === "string" ? JSON.parse(options) : options;
+        if (!options) {
+            return false;
+        }
+        this.#addTaskToQueue(options, "options");
     }
 
     showModel() {
         this.#data.containers.model.show = true;
         this.#addContainer(this.#data.containers.model);
-        this.#logInfo("Model visibility set to true");
     }
 
     hideModel() {
         this.#data.containers.model.show = false;
         this.#removeContainer(this.#data.containers.model);
-        this.#logInfo("Model visibility set to false");
     }
 
     showScene() {
         this.#data.containers.environment.show = true;
         this.#addContainer(this.#data.containers.environment);
         this.#setVisibilityOfWallAndFloorInModel();
-        this.#logInfo("Scene visibility set to true");
     }
 
     hideScene() {
         this.#data.containers.environment.show = false;
         this.#removeContainer(this.#data.containers.environment);
         this.#setVisibilityOfWallAndFloorInModel();
-        this.#logInfo("Scene visibility set to false");
     }
 
     downloadModelGLB() {
         const fileName = "model";
-        this.#logInfo("Initiating GLB download for model", { fileName });
-        GLTF2Export.GLBAsync(this.#data.containers.model.assetContainer, fileName, { exportWithoutWaitingForScene: true }).then((glb) => {
-            this.#logDebug("Model GLB export ready", { fileName });
-            glb.downloadFiles();
-        });
+        GLTF2Export.GLBAsync(this.#data.containers.model.assetContainer, fileName, { exportWithoutWaitingForScene: true }).then((glb) => glb.downloadFiles());
     }
 
     downloadModelUSDZ() {
         const fileName = "model";
-        this.#logInfo("Initiating USDZ download for model", { fileName });
         USDZExportAsync(this.#data.containers.model.assetContainer).then((response) => {
             if (response) {
                 Tools.Download(new Blob([response], { type: "model/vnd.usdz+zip" }), `${fileName}.usdz`);
-                this.#logDebug("Model USDZ export ready", { fileName });
             }
         });
     }
 
     downloadModelAndSceneUSDZ() {
         const fileName = "scene";
-        this.#logInfo("Initiating USDZ download for scene", { fileName });
         USDZExportAsync(this.#scene).then((response) => {
             if (response) {
                 Tools.Download(new Blob([response], { type: "model/vnd.usdz+zip" }), `${fileName}.usdz`);
-                this.#logDebug("Scene USDZ export ready", { fileName });
             }
         });
     }
 
     downloadModelAndSceneGLB() {
         const fileName = "scene";
-        this.#logInfo("Initiating GLB download for scene", { fileName });
-        GLTF2Export.GLBAsync(this.#scene, fileName, { exportWithoutWaitingForScene: true }).then((glb) => {
-            this.#logDebug("Scene GLB export ready", { fileName });
-            glb.downloadFiles();
-        });
+        GLTF2Export.GLBAsync(this.#scene, fileName, { exportWithoutWaitingForScene: true }).then((glb) => glb.downloadFiles());
     }
 }