Update viewer.js

viewer.js

@@ -1,18 +1,18 @@
 // viewer.js
 // ==============================
 
-let pc;            
+let pc;
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
 let viewerInitialized = false;
 let resizeObserver = null;
+let galleryEntity = null;
 
 let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let plyUrl, glbUrl;
-let galleryEntity = null;
 
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
@@ -123,14 +123,13 @@ export async function initializeViewer(config, instanceId) {
   window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
   app.on('destroy', () => resizeObserver.disconnect());
 
-  // --- NEW: Add GLB and HDR asset ---
+  // --- Assets: Add GLB and HDR support ---
   const assets = {
     model: new pc.Asset('gsplat', 'gsplat', { url: plyUrl }),
     orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
     galerie: glbUrl ? new pc.Asset('galerie', 'container', { url: glbUrl }) : null,
     hdr: new pc.Asset('hdr', 'texture', { url: "https://huggingface.co/datasets/bilca/ply_files/resolve/main/galeries/blanc.png" }, { type: pc.TEXTURETYPE_RGBP, mipmaps: false })
   };
-  // filter out nulls for loader
   const assetArray = Object.values(assets).filter(a => !!a);
 
   const loader = new pc.AssetListLoader(assetArray, app.assets);
@@ -138,12 +137,7 @@ export async function initializeViewer(config, instanceId) {
     app.start();
     progressDialog.style.display = 'none';
 
-    // HDR environment
-    if (assets.hdr && assets.hdr.resource) {
-      app.scene.envAtlas = assets.hdr.resource;
-    }
-
-    // Model
+    // Add GSplat (PLY) first
     modelEntity = new pc.Entity('model');
     modelEntity.addComponent('gsplat', { asset: assets.model });
     modelEntity.setLocalPosition(modelX, modelY, modelZ);
@@ -151,12 +145,17 @@ export async function initializeViewer(config, instanceId) {
     modelEntity.setLocalScale(modelScale, modelScale, modelScale);
     app.root.addChild(modelEntity);
 
-    // GLB gallery
+    // Then add GLB gallery (if available)
     if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
       galleryEntity = assets.galerie.resource.instantiateRenderEntity();
       app.root.addChild(galleryEntity);
     }
 
+    // Set HDR environment (after app.start)
+    if (assets.hdr && assets.hdr.resource) {
+      app.scene.envAtlas = assets.hdr.resource;
+    }
+
     // Camera
     cameraEntity = new pc.Entity('camera');
     cameraEntity.addComponent('camera', { clearColor: new pc.Color(0.2, 0.2, 0.2, 1) });
@@ -183,7 +182,7 @@ export async function initializeViewer(config, instanceId) {
 
     app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
 
-    // Use Script B's camera reset logic after everything is ready
+    // Use Script B's robust camera reset logic after everything is ready
     app.once('update', () => resetViewerCamera());
 
     // Tooltips (if config.tooltips_url and tooltips.js available)
@@ -207,6 +206,7 @@ export async function initializeViewer(config, instanceId) {
   });
 }
 
+// Camera reset logic from Script B
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;