Update viewer.js

viewer.js

@@ -14,196 +14,263 @@ let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, min
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 
 export async function initializeViewer(config, instanceId) {
-    if (viewerInitialized) return;
-
-    // Params
-    const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
-    const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-
-    // URLs and config
-    const sogsUrl = config.sogs_json_url;
-    if (!sogsUrl) {
-        alert('Missing SOGS (meta.json) URL in config.sogs_json_url.');
-        return;
-    }
-
-    minZoom = parseFloat(config.minZoom || "1");
-    maxZoom = parseFloat(config.maxZoom || "20");
-    minAngle = parseFloat(config.minAngle || "-45");
-    maxAngle = parseFloat(config.maxAngle || "90");
-    minAzimuth = (config.minAzimuth !== undefined) ? parseFloat(config.minAzimuth) : -360;
-    maxAzimuth = (config.maxAzimuth !== undefined) ? parseFloat(config.maxAzimuth) : 360;
-    minPivotY = parseFloat(config.minPivotY || "0");
-    minY = (config.minY !== undefined) ? parseFloat(config.minY) : 0;
-
-    modelX = (config.modelX !== undefined) ? parseFloat(config.modelX) : 0;
-    modelY = (config.modelY !== undefined) ? parseFloat(config.modelY) : 0;
-    modelZ = (config.modelZ !== undefined) ? parseFloat(config.modelZ) : 0;
-    modelScale = (config.modelScale !== undefined) ? parseFloat(config.modelScale) : 1;
-    modelRotationX = (config.modelRotationX !== undefined) ? parseFloat(config.modelRotationX) : 0;
-    modelRotationY = (config.modelRotationY !== undefined) ? parseFloat(config.modelRotationY) : 0;
-    modelRotationZ = (config.modelRotationZ !== undefined) ? parseFloat(config.modelRotationZ) : 0;
-
-    const cameraX = (config.cameraX !== undefined) ? parseFloat(config.cameraX) : 0;
-    const cameraY = (config.cameraY !== undefined) ? parseFloat(config.cameraY) : 2;
-    const cameraZ = (config.cameraZ !== undefined) ? parseFloat(config.cameraZ) : 5;
-    const cameraXPhone = (config.cameraXPhone !== undefined) ? parseFloat(config.cameraXPhone) : cameraX;
-    const cameraYPhone = (config.cameraYPhone !== undefined) ? parseFloat(config.cameraYPhone) : cameraY;
-    const cameraZPhone = (config.cameraZPhone !== undefined) ? parseFloat(config.cameraZPhone) : (cameraZ * 1.5);
-
-    chosenCameraX = isMobile ? cameraXPhone : cameraX;
-    chosenCameraY = isMobile ? cameraYPhone : cameraY;
-    chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
-
-    // DOM Elements
-    const canvasId = 'canvas-' + instanceId;
-    const progressDialog = document.getElementById('progress-dialog-' + instanceId);
-    const viewerContainer = document.getElementById('viewer-container-' + instanceId);
-
-    // Remove old canvas if any
-    let oldCanvas = document.getElementById(canvasId);
-    if (oldCanvas) oldCanvas.remove();
-
-    // Create and add canvas
-    const canvas = document.createElement('canvas');
-    canvas.id = canvasId;
-    canvas.className = 'ply-canvas';
-    canvas.style.width = "100%";
-    canvas.style.height = "100%";
-    canvas.setAttribute('tabindex', '0');
-    viewerContainer.insertBefore(canvas, progressDialog);
-    canvas.style.touchAction = "none";
-    canvas.style.webkitTouchCallout = "none";
-    canvas.addEventListener('gesturestart', e => e.preventDefault());
-    canvas.addEventListener('gesturechange', e => e.preventDefault());
-    canvas.addEventListener('gestureend', e => e.preventDefault());
-    canvas.addEventListener('dblclick', e => e.preventDefault());
-    canvas.addEventListener('touchstart', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
-    canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { passive: false });
-
-    progressDialog.style.display = 'block';
-
-    // --- PlayCanvas Graphics Device ---
-    const device = await pc.createGraphicsDevice(canvas, {
-        deviceTypes: ["webgl2"],
-        antialias: false,
-        glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-        twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js"
-    });
-    device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-
-    // --- PlayCanvas AppBase (modern, 2.8.1+) ---
-    const appOpts = new pc.AppOptions();
-    appOpts.graphicsDevice = device;
-    appOpts.mouse = new pc.Mouse(canvas);
-    appOpts.touch = new pc.TouchDevice(canvas);
-    appOpts.componentSystems = [
-        pc.RenderComponentSystem,
-        pc.CameraComponentSystem,
-        pc.LightComponentSystem,
-        pc.ScriptComponentSystem,
-        pc.GSplatComponentSystem
-    ];
-    appOpts.resourceHandlers = [
-        pc.TextureHandler,
-        pc.ContainerHandler,
-        pc.ScriptHandler,
-        pc.GSplatHandler
-    ];
-
-    app = new pc.AppBase(canvas);
-    app.init(appOpts);
-
-    // Fill/resize
-    app.setCanvasFillMode(pc.FILLMODE_NONE);
-    app.setCanvasResolution(pc.RESOLUTION_AUTO);
-
-    resizeObserver = new ResizeObserver(entries => {
-        entries.forEach(entry => {
-            app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
-        });
-    });
-    resizeObserver.observe(viewerContainer);
-
-    window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
-    app.on('destroy', () => resizeObserver.disconnect());
-
-    // --- ASSETS (GSplat + Orbit camera) ---
-    const assets = {
-        model: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
-        orbit: new pc.Asset('orbit', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
-        // Optionally add other assets here if you want
-    };
-    for (const key in assets) app.assets.add(assets[key]);
-
-    const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
-    loader.load(() => {
-        app.start();
-        progressDialog.style.display = 'none';
-
-        // --- Add GSplat Model ---
-        modelEntity = new pc.Entity('model');
-        modelEntity.addComponent('gsplat', { asset: assets.model });
-        modelEntity.setLocalPosition(modelX, modelY, modelZ);
-        modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-        modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-        app.root.addChild(modelEntity);
-
-        // --- Camera ---
-        cameraEntity = new pc.Entity('camera');
-        cameraEntity.addComponent('camera', {
-            clearColor: new pc.Color(1, 1, 1, 1)
+    try {
+        alert('viewer.js: initializeViewer called');
+        if (viewerInitialized) {
+            alert('viewer.js: already initialized');
+            return;
+        }
+        if (!config) {
+            alert('viewer.js: config is missing!');
+            return;
+        }
+
+        // Params
+        const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+        const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+
+        // URLs and config
+        const sogsUrl = config.sogs_json_url;
+        if (!sogsUrl) {
+            alert('Missing SOGS (meta.json) URL in config.sogs_json_url.');
+            return;
+        }
+        alert('sogsUrl: ' + sogsUrl);
+
+        minZoom = parseFloat(config.minZoom || "1");
+        maxZoom = parseFloat(config.maxZoom || "20");
+        minAngle = parseFloat(config.minAngle || "-45");
+        maxAngle = parseFloat(config.maxAngle || "90");
+        minAzimuth = (config.minAzimuth !== undefined) ? parseFloat(config.minAzimuth) : -360;
+        maxAzimuth = (config.maxAzimuth !== undefined) ? parseFloat(config.maxAzimuth) : 360;
+        minPivotY = parseFloat(config.minPivotY || "0");
+        minY = (config.minY !== undefined) ? parseFloat(config.minY) : 0;
+
+        modelX = (config.modelX !== undefined) ? parseFloat(config.modelX) : 0;
+        modelY = (config.modelY !== undefined) ? parseFloat(config.modelY) : 0;
+        modelZ = (config.modelZ !== undefined) ? parseFloat(config.modelZ) : 0;
+        modelScale = (config.modelScale !== undefined) ? parseFloat(config.modelScale) : 1;
+        modelRotationX = (config.modelRotationX !== undefined) ? parseFloat(config.modelRotationX) : 0;
+        modelRotationY = (config.modelRotationY !== undefined) ? parseFloat(config.modelRotationY) : 0;
+        modelRotationZ = (config.modelRotationZ !== undefined) ? parseFloat(config.modelRotationZ) : 0;
+
+        const cameraX = (config.cameraX !== undefined) ? parseFloat(config.cameraX) : 0;
+        const cameraY = (config.cameraY !== undefined) ? parseFloat(config.cameraY) : 2;
+        const cameraZ = (config.cameraZ !== undefined) ? parseFloat(config.cameraZ) : 5;
+        const cameraXPhone = (config.cameraXPhone !== undefined) ? parseFloat(config.cameraXPhone) : cameraX;
+        const cameraYPhone = (config.cameraYPhone !== undefined) ? parseFloat(config.cameraYPhone) : cameraY;
+        const cameraZPhone = (config.cameraZPhone !== undefined) ? parseFloat(config.cameraZPhone) : (cameraZ * 1.5);
+
+        chosenCameraX = isMobile ? cameraXPhone : cameraX;
+        chosenCameraY = isMobile ? cameraYPhone : cameraY;
+        chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
+
+        // DOM Elements
+        const canvasId = 'canvas-' + instanceId;
+        const progressDialog = document.getElementById('progress-dialog-' + instanceId);
+        const viewerContainer = document.getElementById('viewer-container-' + instanceId);
+
+        alert('viewer.js: DOM elements - canvasId: ' + canvasId);
+
+        if (!viewerContainer) {
+            alert('viewer.js: viewerContainer not found!');
+            return;
+        }
+
+        // Remove old canvas if any
+        let oldCanvas = document.getElementById(canvasId);
+        if (oldCanvas) oldCanvas.remove();
+
+        // Create and add canvas
+        const canvas = document.createElement('canvas');
+        canvas.id = canvasId;
+        canvas.className = 'ply-canvas';
+        canvas.style.width = "100%";
+        canvas.style.height = "100%";
+        canvas.setAttribute('tabindex', '0');
+        viewerContainer.insertBefore(canvas, progressDialog);
+        canvas.style.touchAction = "none";
+        canvas.style.webkitTouchCallout = "none";
+        canvas.addEventListener('gesturestart', e => e.preventDefault());
+        canvas.addEventListener('gesturechange', e => e.preventDefault());
+        canvas.addEventListener('gestureend', e => e.preventDefault());
+        canvas.addEventListener('dblclick', e => e.preventDefault());
+        canvas.addEventListener('touchstart', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
+        canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { passive: false });
+
+        alert('viewer.js: Canvas created and inserted.');
+
+        if (progressDialog) {
+            progressDialog.style.display = 'block';
+        } else {
+            alert('viewer.js: progressDialog not found!');
+        }
+
+        // --- PlayCanvas Graphics Device ---
+        alert('viewer.js: creating graphics device...');
+        const device = await pc.createGraphicsDevice(canvas, {
+            deviceTypes: ["webgl2"],
+            antialias: false,
+            glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+            twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js"
         });
-        cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-        cameraEntity.lookAt(modelEntity.getPosition());
-        cameraEntity.addComponent('script');
-        cameraEntity.script.create('orbitCamera', {
-            attributes: {
-                focusEntity: modelEntity,
-                inertiaFactor: 0.2,
-                distanceMax: maxZoom,
-                distanceMin: minZoom,
-                pitchAngleMax: maxAngle,
-                pitchAngleMin: minAngle,
-                yawAngleMax: maxAzimuth,
-                yawAngleMin: minAzimuth,
-                minY: minY,
-                frameOnStart: false
-            }
+        device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
+        alert('viewer.js: Graphics device created!');
+
+        // --- PlayCanvas AppBase (modern, 2.8.1+) ---
+        alert('viewer.js: Creating AppBase...');
+        const appOpts = new pc.AppOptions();
+        appOpts.graphicsDevice = device;
+        appOpts.mouse = new pc.Mouse(canvas);
+        appOpts.touch = new pc.TouchDevice(canvas);
+        appOpts.componentSystems = [
+            pc.RenderComponentSystem,
+            pc.CameraComponentSystem,
+            pc.LightComponentSystem,
+            pc.ScriptComponentSystem,
+            pc.GSplatComponentSystem
+        ];
+        appOpts.resourceHandlers = [
+            pc.TextureHandler,
+            pc.ContainerHandler,
+            pc.ScriptHandler,
+            pc.GSplatHandler
+        ];
+
+        app = new pc.AppBase(canvas);
+        app.init(appOpts);
+
+        alert('viewer.js: AppBase created and initialized!');
+
+        // Fill/resize
+        app.setCanvasFillMode(pc.FILLMODE_NONE);
+        app.setCanvasResolution(pc.RESOLUTION_AUTO);
+
+        resizeObserver = new ResizeObserver(entries => {
+            entries.forEach(entry => {
+                app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
+            });
         });
-        cameraEntity.script.create('orbitCameraInputMouse');
-        cameraEntity.script.create('orbitCameraInputTouch');
-        app.root.addChild(cameraEntity);
-
-        app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-        app.once('update', () => resetViewerCamera());
-
-        // --- Tooltips ---
-        try {
-            if (config.tooltips_url) {
-                import('./tooltips.js').then(tooltipsModule => {
-                    tooltipsModule.initializeTooltips({
-                        app,
-                        cameraEntity,
-                        modelEntity,
-                        tooltipsUrl: config.tooltips_url,
-                        defaultVisible: !!config.showTooltipsDefault,
-                        moveDuration: config.tooltipMoveDuration || 0.6
+        resizeObserver.observe(viewerContainer);
+
+        window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+        app.on('destroy', () => resizeObserver.disconnect());
+
+        // --- ASSETS (GSplat + Orbit camera) ---
+        alert('viewer.js: Creating GSplat and orbit assets...');
+        const assets = {
+            model: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
+            orbit: new pc.Asset('orbit', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
+        };
+        for (const key in assets) app.assets.add(assets[key]);
+
+        alert('viewer.js: Assets created, starting AssetListLoader...');
+
+        const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+
+        loader.load(() => {
+            alert('viewer.js: AssetListLoader finished loading assets!');
+            app.start();
+            if (progressDialog) progressDialog.style.display = 'none';
+
+            // --- Add GSplat Model ---
+            alert('viewer.js: Creating modelEntity and adding gsplat...');
+            modelEntity = new pc.Entity('model');
+            modelEntity.addComponent('gsplat', { asset: assets.model });
+            modelEntity.setLocalPosition(modelX, modelY, modelZ);
+            modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+            modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+            app.root.addChild(modelEntity);
+
+            // --- Camera ---
+            alert('viewer.js: Creating camera entity...');
+            cameraEntity = new pc.Entity('camera');
+            cameraEntity.addComponent('camera', {
+                clearColor: new pc.Color(1, 1, 1, 1)
+            });
+            cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+            cameraEntity.lookAt(modelEntity.getPosition());
+            cameraEntity.addComponent('script');
+            cameraEntity.script.create('orbitCamera', {
+                attributes: {
+                    focusEntity: modelEntity,
+                    inertiaFactor: 0.2,
+                    distanceMax: maxZoom,
+                    distanceMin: minZoom,
+                    pitchAngleMax: maxAngle,
+                    pitchAngleMin: minAngle,
+                    yawAngleMax: maxAzimuth,
+                    yawAngleMin: minAzimuth,
+                    minY: minY,
+                    frameOnStart: false
+                }
+            });
+            cameraEntity.script.create('orbitCameraInputMouse');
+            cameraEntity.script.create('orbitCameraInputTouch');
+            app.root.addChild(cameraEntity);
+
+            alert('viewer.js: Camera entity created and added.');
+
+            app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+            app.once('update', () => {
+                alert('viewer.js: calling resetViewerCamera');
+                resetViewerCamera();
+            });
+
+            // --- Tooltips ---
+            try {
+                if (config.tooltips_url) {
+                    import('./tooltips.js').then(tooltipsModule => {
+                        alert('viewer.js: tooltips.js loaded!');
+                        tooltipsModule.initializeTooltips({
+                            app,
+                            cameraEntity,
+                            modelEntity,
+                            tooltipsUrl: config.tooltips_url,
+                            defaultVisible: !!config.showTooltipsDefault,
+                            moveDuration: config.tooltipMoveDuration || 0.6
+                        });
+                    }).catch(e => {
+                        alert('viewer.js: Error loading tooltips.js: ' + e);
+                        console.error(e);
                     });
-                }).catch(e => {});
+                }
+            } catch (e) {
+                alert('viewer.js: Exception importing tooltips: ' + e);
             }
-        } catch (e) {}
 
-        viewerInitialized = true;
-    });
+            viewerInitialized = true;
+            alert('viewer.js: viewerInitialized = true!');
+        });
+
+        loader.on('error', function(err, asset) {
+            alert('viewer.js: Asset loader error: ' + err + (asset ? ' for asset: ' + asset.name : ''));
+            console.error('Asset loader error:', err, asset);
+        });
+
+        loader.on('progress', function(loaded, total) {
+            console.log(`viewer.js: Asset loader progress: ${loaded} / ${total}`);
+        });
+
+    } catch (e) {
+        alert('viewer.js: FATAL exception: ' + (e.message || e));
+        console.error(e);
+    }
 }
 
 // Reset camera helper
 export function resetViewerCamera() {
     try {
-        if (!cameraEntity || !modelEntity || !app) return;
+        alert('viewer.js: resetViewerCamera called');
+        if (!cameraEntity || !modelEntity || !app) {
+            alert('resetViewerCamera: cameraEntity/modelEntity/app missing');
+            return;
+        }
         const orbitCam = cameraEntity.script.orbitCamera;
-        if (!orbitCam) return;
+        if (!orbitCam) {
+            alert('resetViewerCamera: orbitCamera script not found!');
+            return;
+        }
 
         const modelPos = modelEntity.getPosition();
         const tempEnt = new pc.Entity();
@@ -240,7 +307,9 @@ export function resetViewerCamera() {
         if (orbitCam._updatePosition) orbitCam._updatePosition();
 
         tempEnt.destroy();
+        alert('resetViewerCamera: success');
     } catch (e) {
+        alert('resetViewerCamera: Exception: ' + (e.message || e));
         // Silent fail
     }
 }