Update viewer.js

viewer.js

@@ -1,7 +1,7 @@
 // viewer.js
 // ==============================
 
-let pc;
+let pc;            
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
@@ -11,344 +11,247 @@ let resizeObserver = null;
 let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
-let sogsMetaUrl, gsosBaseUrl, glbUrl;
-
-// --- Core function to load an image and decode RGBA data as typed array ---
-async function loadImageAsArray(url, dtype = "float32") {
-    const img = await new Promise((resolve, reject) => {
-        const image = new window.Image();
-        image.crossOrigin = "anonymous";
-        image.onload = () => resolve(image);
-        image.onerror = reject;
-        image.src = url;
-    });
-
-    // Draw to canvas and extract pixel data
-    const canvas = document.createElement('canvas');
-    canvas.width = img.width;
-    canvas.height = img.height;
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(img, 0, 0);
-    const { data } = ctx.getImageData(0, 0, img.width, img.height);
-
-    // Reinterpret as correct type
-    if (dtype === "float32") {
-        // Each 4 bytes is a float (big-endian RGBA) -- adjust if your packing is different!
-        const buffer = new ArrayBuffer(data.length);
-        const buf8 = new Uint8Array(buffer);
-        buf8.set(data);
-        return new Float32Array(buffer);
-    } else if (dtype === "uint8") {
-        return new Uint8Array(data.buffer, data.byteOffset, data.length);
-    } else {
-        throw new Error("Unknown dtype: " + dtype);
-    }
-}
-
-// --- Helper to concatenate arrays (typed) ---
-function concatenate(arrays, dtype) {
-    if (dtype === "float32") {
-        let len = arrays.reduce((sum, arr) => sum + arr.length, 0);
-        let out = new Float32Array(len);
-        let offset = 0;
-        for (let arr of arrays) {
-            out.set(arr, offset);
-            offset += arr.length;
-        }
-        return out;
-    } else if (dtype === "uint8") {
-        let len = arrays.reduce((sum, arr) => sum + arr.length, 0);
-        let out = new Uint8Array(len);
-        let offset = 0;
-        for (let arr of arrays) {
-            out.set(arr, offset);
-            offset += arr.length;
-        }
-        return out;
-    }
-}
-
-// --- Load all GSOS data blocks from meta.json and webp images ---
-async function loadGSOSMeta(metaUrl, baseUrl) {
-    const meta = await fetch(metaUrl).then(r => r.json());
-    const blocks = {};
-
-    for (const [key, block] of Object.entries(meta)) {
-        const dtype = block.dtype;
-        const files = block.files || [];
-        let arrays = [];
-        for (const fname of files) {
-            const arr = await loadImageAsArray(baseUrl + '/' + fname, dtype);
-            arrays.push(arr);
-        }
-        blocks[key] = arrays.length === 1 ? arrays[0] : concatenate(arrays, dtype);
-    }
-    // Attach all block meta info
-    blocks._meta = meta;
-    return blocks;
-}
+let sogsUrl, glbUrl;
 
-// --- MAIN VIEWER ---
 export async function initializeViewer(config, instanceId) {
-    if (viewerInitialized) return;
-
-    // Parse config and model params
-    sogsMetaUrl = config.sogs_json_url; // e.g. .../meta.json
-    glbUrl = config.glb_url;
-    // Derive the base URL for images
-    gsosBaseUrl = sogsMetaUrl.substring(0, sogsMetaUrl.lastIndexOf('/'));
-
-    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 isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
-    const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-
-    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;
-
-    const canvasId = 'canvas-' + instanceId;
-    const progressDialog = document.getElementById('progress-dialog-' + instanceId);
-    const viewerContainer = document.getElementById('viewer-container-' + instanceId);
-
-    let oldCanvas = document.getElementById(canvasId);
-    if (oldCanvas) oldCanvas.remove();
-
-    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 });
-
-    if (progressDialog) progressDialog.style.display = 'block';
-
-    // --- PlayCanvas Engine load ---
-    if (!pc) {
-        pc = await import("https://esm.run/playcanvas");
-        window.pc = pc;
+  if (viewerInitialized) return;
+
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+  const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+
+  sogsUrl = config.sogs_json_url;
+  glbUrl = config.glb_url;
+  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;
+
+  const canvasId = 'canvas-' + instanceId;
+  const progressDialog = document.getElementById('progress-dialog-' + instanceId);
+  const progressIndicator = document.getElementById('progress-indicator-' + instanceId);
+  const viewerContainer = document.getElementById('viewer-container-' + instanceId);
+
+  let oldCanvas = document.getElementById(canvasId);
+  if (oldCanvas) oldCanvas.remove();
+
+  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 });
+
+  // --- The following line attaches mouse wheel suppression to canvas only ---
+  canvas.addEventListener('wheel', (e) => {
+    e.preventDefault(); // Only block page scroll if mouse is over viewer
+  }, { passive: false });
+
+  progressDialog.style.display = 'block';
+
+  if (!pc) {
+    pc = await import("https://esm.run/playcanvas");
+    window.pc = pc;
+  }
+
+  // Create app first
+  const device = await pc.createGraphicsDevice(canvas, {
+    deviceTypes: ["webgl2"],
+    glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+    twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+    antialias: false
+  });
+  device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
+
+  const opts = new pc.AppOptions();
+  opts.graphicsDevice = device;
+  // Attach input only to canvas
+  opts.mouse = new pc.Mouse(canvas);
+  opts.touch = new pc.TouchDevice(canvas);
+  opts.componentSystems = [
+    pc.RenderComponentSystem,
+    pc.CameraComponentSystem,
+    pc.LightComponentSystem,
+    pc.ScriptComponentSystem,
+    pc.GSplatComponentSystem,
+    pc.CollisionComponentSystem,
+    pc.RigidbodyComponentSystem
+  ];
+  opts.resourceHandlers = [
+    pc.TextureHandler,
+    pc.ContainerHandler,
+    pc.ScriptHandler,
+    pc.GSplatHandler
+  ];
+
+  app = new pc.Application(canvas, opts);
+  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 after app exists
+  const assets = {
+    sogs: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
+    orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
+    glb: new pc.Asset('glb', 'container', { url: glbUrl }),
+  };
+  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 PLY/GSplat model
+    modelEntity = new pc.Entity('model');
+    modelEntity.addComponent('gsplat', { asset: assets.sogs });
+    modelEntity.setLocalPosition(modelX, modelY, modelZ);
+    modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+    modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+    app.root.addChild(modelEntity);
+
+    // --- Add the GLB entity ---
+    if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
+      const glbEntity = assets.glb.resource.instantiateRenderEntity();
+      app.root.addChild(glbEntity);
     }
 
-    // --- Graphics device/app setup ---
-    const device = await pc.createGraphicsDevice(canvas, {
-        deviceTypes: ["webgl2", "webgl1"],
-        glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-        twgslUrl:   "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
-        antialias: false
-    });
-    device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-
-    const opts = new pc.AppOptions();
-    opts.graphicsDevice = device;
-    opts.mouse = new pc.Mouse(canvas);
-    opts.touch = new pc.TouchDevice(canvas);
-    opts.componentSystems = [
-        pc.RenderComponentSystem,
-        pc.CameraComponentSystem,
-        pc.LightComponentSystem,
-        pc.ScriptComponentSystem,
-        pc.GSplatComponentSystem,
-        pc.CollisionComponentSystem,
-        pc.RigidbodyComponentSystem
-    ];
-    opts.resourceHandlers = [
-        pc.TextureHandler,
-        pc.ContainerHandler,
-        pc.ScriptHandler,
-        pc.GSplatHandler
-    ];
-
-    app = new pc.Application(canvas, opts);
-    app.setCanvasFillMode(pc.FILLMODE_NONE);
-    app.setCanvasResolution(pc.RESOLUTION_AUTO);
-
-    // --- Responsive resize ---
-    resizeObserver = new ResizeObserver(entries => {
-        entries.forEach(entry => {
-            app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
-        });
+    cameraEntity = new pc.Entity('camera');
+    // PURE WHITE BACKGROUND
+    cameraEntity.addComponent('camera', { clearColor: new pc.Color(1, 1, 1, 1) }); // White RGBA
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    cameraEntity.lookAt(modelEntity.getPosition());
+    cameraEntity.addComponent('script');
+
+    // === MAIN FIX: Pass ALL relevant attributes including minY ===
+    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
+      }
     });
-    resizeObserver.observe(viewerContainer);
-    window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
-    app.on('destroy', () => resizeObserver.disconnect());
+    cameraEntity.script.create('orbitCameraInputMouse');
+    cameraEntity.script.create('orbitCameraInputTouch');
+    app.root.addChild(cameraEntity);
+
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+
+    app.once('update', () => resetViewerCamera());
 
-    // --- LOAD GSOS/GSplat DATA ---
-    let gsosBlocks = null;
+    // Tooltips supported if tooltips_url set
     try {
-        gsosBlocks = await loadGSOSMeta(sogsMetaUrl, gsosBaseUrl);
+      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
+          });
+        }).catch(e => {
+          // Tooltips optional: fail silently if missing
+        });
+      }
     } catch (e) {
-        console.error("Failed to load GSOS meta/images:", e);
-        if (progressDialog) progressDialog.style.display = 'none';
-        return;
+      // Tooltips optional, fail silently
     }
 
-    // --- Assets: GLB, orbit camera, etc ---
-    const assets = {
-        orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
-    };
-    if (glbUrl) {
-        assets.glb = new pc.Asset('glb', 'container', { url: glbUrl });
-    }
-    for (const key in assets) app.assets.add(assets[key]);
-
-    const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
-    loader.load(() => {
-        app.start();
-        if (progressDialog) progressDialog.style.display = 'none';
-
-        // --- Create GSplat entity from blocks ---
-        // You'll need to adapt this to your PlayCanvas GSplat API!
-        // Below is a skeleton; you'll need a custom GSplatComponent, or render using a Mesh/Shader, etc.
-        modelEntity = new pc.Entity('gsos-model');
-
-        // Here is where you would plug in your GSplat/GSOS loader logic:
-        // (Below assumes you have a 'GSplatComponent' or similar)
-        if (pc && pc.GSplatComponent && modelEntity.addComponent) {
-            // Replace this with the actual GSplat API for your PlayCanvas fork/module!
-            modelEntity.addComponent('gsplat', {
-                means: gsosBlocks.means,
-                scales: gsosBlocks.scales,
-                quats: gsosBlocks.quats,
-                sh0: gsosBlocks.sh0,
-                meta: gsosBlocks._meta
-            });
-        } else {
-            // Otherwise: custom point rendering, or just dump the arrays for debug
-            console.warn("No GSplatComponent found! Model will not be visible.");
-            window._gsosBlocks = gsosBlocks;
-        }
-        modelEntity.setLocalPosition(modelX, modelY, modelZ);
-        modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-        modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-        app.root.addChild(modelEntity);
-
-        // --- Add the GLB entity if provided ---
-        if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
-            const glbEntity = assets.glb.resource.instantiateRenderEntity();
-            app.root.addChild(glbEntity);
-        }
-
-        // --- Camera setup ---
-        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);
-
-        app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-        app.once('update', () => resetViewerCamera());
-
-        // --- Optional: Tooltips support ---
-        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
-                    });
-                }).catch(e => { });
-            }
-        } catch (e) { }
-
-        viewerInitialized = true;
-    });
+    viewerInitialized = true;
+  });
 }
 
-// --- Camera reset helper ---
 export function resetViewerCamera() {
-    try {
-        if (!cameraEntity || !modelEntity || !app) return;
-        const orbitCam = cameraEntity.script.orbitCamera;
-        if (!orbitCam) return;
-
-        const modelPos = modelEntity.getPosition();
-        const tempEnt = new pc.Entity();
-        tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-        tempEnt.lookAt(modelPos);
-
-        const dist = new pc.Vec3().sub2(
-            new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
-            modelPos
-        ).length();
-
-        cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-        cameraEntity.lookAt(modelPos);
-
-        orbitCam.pivotPoint = modelPos.clone();
-        orbitCam._targetDistance = dist;
-        orbitCam._distance       = dist;
-
-        const rot = tempEnt.getRotation();
-        const fwd = new pc.Vec3();
-        rot.transformVector(pc.Vec3.FORWARD, fwd);
-
-        const yaw = Math.atan2(-fwd.x, -fwd.z) * pc.math.RAD_TO_DEG;
-        const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
-        const rotNoYaw = new pc.Quat().mul2(yawQuat, rot);
-        const fNoYaw = new pc.Vec3();
-        rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
-        const pitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
-
-        orbitCam._targetYaw   = yaw;
-        orbitCam._yaw         = yaw;
-        orbitCam._targetPitch = pitch;
-        orbitCam._pitch       = pitch;
-        if (orbitCam._updatePosition) orbitCam._updatePosition();
-
-        tempEnt.destroy();
-    } catch (e) { }
+  try {
+    if (!cameraEntity || !modelEntity || !app) return;
+    const orbitCam = cameraEntity.script.orbitCamera;
+    if (!orbitCam) return;
+
+    const modelPos = modelEntity.getPosition();
+    const tempEnt = new pc.Entity();
+    tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    tempEnt.lookAt(modelPos);
+
+    const dist = new pc.Vec3().sub2(
+      new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
+      modelPos
+    ).length();
+
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    cameraEntity.lookAt(modelPos);
+
+    orbitCam.pivotPoint = modelPos.clone();
+    orbitCam._targetDistance = dist;
+    orbitCam._distance       = dist;
+
+    const rot = tempEnt.getRotation();
+    const fwd = new pc.Vec3();
+    rot.transformVector(pc.Vec3.FORWARD, fwd);
+
+    const yaw = Math.atan2(-fwd.x, -fwd.z) * pc.math.RAD_TO_DEG;
+    const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
+    const rotNoYaw = new pc.Quat().mul2(yawQuat, rot);
+    const fNoYaw = new pc.Vec3();
+    rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
+    const pitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
+
+    orbitCam._targetYaw   = yaw;
+    orbitCam._yaw         = yaw;
+    orbitCam._targetPitch = pitch;
+    orbitCam._pitch       = pitch;
+    if (orbitCam._updatePosition) orbitCam._updatePosition();
+
+    tempEnt.destroy();
+  } catch (e) {
+    // Silent fail
+  }
 }