Update js_scripts/index.js

js_scripts/index.js

@@ -1,6 +1,36 @@
+// Store the current script reference before the async function runs
+const currentScriptTag = document.currentScript;
+
 (async function() {
-  // Retrieve the current script tag and load the JSON configuration file from the data-config attribute.
-  const scriptTag = document.currentScript;
+  // Import PlayCanvas
+  const pc = await import("https://cdn.skypack.dev/[email protected]");
+  window.pc = pc;
+  
+  // Find the script tag using a more reliable method
+  let scriptTag = currentScriptTag;
+  
+  // Fallback method if currentScriptTag is null
+  if (!scriptTag) {
+    const scripts = document.getElementsByTagName('script');
+    for (let i = 0; i < scripts.length; i++) {
+      if (scripts[i].src.includes('index.js') && scripts[i].hasAttribute('data-config')) {
+        scriptTag = scripts[i];
+        break;
+      }
+    }
+    
+    // If still not found, try the last script on the page
+    if (!scriptTag && scripts.length > 0) {
+      scriptTag = scripts[scripts.length - 1];
+    }
+  }
+  
+  // Check if we found a script tag
+  if (!scriptTag) {
+    console.error("Could not find the script tag with data-config attribute.");
+    return;
+  }
+  
   const configUrl = scriptTag.getAttribute("data-config");
   let config = {};
   if (configUrl) {
@@ -24,12 +54,10 @@
     document.head.appendChild(linkEl);
   }
 
-  // --- Outer scope variables for camera state ---
-  let cameraInstance = null;
-  let controlsInstance = null;
-  let initialCameraPosition = null;
-  let initialCameraRotation = null;
-  let SPLAT = null; // We'll save the imported SPLAT module here.
+  // --- Outer scope variables ---
+  let cameraEntity = null;
+  let app = null;
+  let modelEntity = null;
   
   // Generate a unique identifier for this widget instance.
   const instanceId = Math.random().toString(36).substr(2, 8);
@@ -37,31 +65,45 @@
   // Read configuration values from the JSON file.
   const gifUrl = config.gif_url;
   const plyUrl = config.ply_url;
-  const minZoom = parseFloat(config.minZoom || "0");
+  
+  // Camera constraint parameters
+  const minZoom = parseFloat(config.minZoom || "1");
   const maxZoom = parseFloat(config.maxZoom || "20");
-  const minAngle = parseFloat(config.minAngle || "0");
-  const maxAngle = parseFloat(config.maxAngle || "360");
-  const minAzimuth = config.minAzimuth !== undefined ? parseFloat(config.minAzimuth) : -Infinity;
-  const maxAzimuth = config.maxAzimuth !== undefined ? parseFloat(config.maxAzimuth) : Infinity;
+  const minAngle = parseFloat(config.minAngle || "-45");
+  const maxAngle = parseFloat(config.maxAngle || "90");
+  const minAzimuth = config.minAzimuth !== undefined ? parseFloat(config.minAzimuth) : -360;
+  const maxAzimuth = config.maxAzimuth !== undefined ? parseFloat(config.maxAzimuth) : 360;
+  
+  // Model position, scale, and rotation parameters
+  const modelX = config.modelX !== undefined ? parseFloat(config.modelX) : 0;
+  const modelY = config.modelY !== undefined ? parseFloat(config.modelY) : 0;
+  const modelZ = config.modelZ !== undefined ? parseFloat(config.modelZ) : 0;
+  
+  const modelScale = config.modelScale !== undefined ? parseFloat(config.modelScale) : 1;
+  
+  const modelRotationX = config.modelRotationX !== undefined ? parseFloat(config.modelRotationX) : 0;
+  const modelRotationY = config.modelRotationY !== undefined ? parseFloat(config.modelRotationY) : 0;
+  const modelRotationZ = config.modelRotationZ !== undefined ? parseFloat(config.modelRotationZ) : 0;
+  
+  // Direct camera coordinates
+  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;
   
-  // Read initial orbit parameters for desktop.
-  const initAlphaDesktop = config.initAlpha !== undefined ? parseFloat(config.initAlpha) : 0.5;
-  const initBetaDesktop  = config.initBeta  !== undefined ? parseFloat(config.initBeta)  : 0.5;
-  const initRadiusDesktop = config.initRadius !== undefined ? parseFloat(config.initRadius) : 5;
-  // Read initial orbit parameters for phone.
-  const initAlphaPhone = config.initAlphaPhone !== undefined ? parseFloat(config.initAlphaPhone) : initAlphaDesktop;
-  const initBetaPhone  = config.initBetaPhone  !== undefined ? parseFloat(config.initBetaPhone)  : initBetaDesktop;
-  const initRadiusPhone = config.initRadiusPhone !== undefined ? parseFloat(config.initRadiusPhone) : initRadiusDesktop;
+  // Camera coordinates for mobile devices
+  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;
 
   // Detect if the device is iOS.
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   // Also detect Android devices.
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
   
-  // Choose the appropriate initial orbit values based on device type.
-  const chosenInitAlpha = isMobile ? initAlphaPhone : initAlphaDesktop;
-  const chosenInitBeta  = isMobile ? initBetaPhone  : initBetaDesktop;
-  const chosenInitRadius = isMobile ? initRadiusPhone : initRadiusDesktop;
+  // Choose the appropriate coordinates based on device type
+  const chosenCameraX = isMobile ? cameraXPhone : cameraX;
+  const chosenCameraY = isMobile ? cameraYPhone : cameraY;
+  const chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
   
   // Determine the aspect ratio.
   let aspectPercent = "100%";
@@ -234,42 +276,76 @@
     menuContent.style.display = (menuContent.style.display === 'block') ? 'none' : 'block';
   });
   
-  // --- Camera Reset Function ---
+  // --- Camera Reset Function - FIXED TO PRESERVE CAMERA MOVEMENT ---
   function resetCamera() {
-    console.log("Resetting camera to initial position.");
-    if (cameraInstance && initialCameraPosition && initialCameraRotation) {
-      cameraInstance.position = initialCameraPosition.clone();
-      cameraInstance.rotation = initialCameraRotation.clone();
-      if (typeof cameraInstance.update === 'function') {
-        cameraInstance.update();
-      }
-      if (controlsInstance && typeof controlsInstance.dispose === 'function') {
-        controlsInstance.dispose();
+    if (!cameraEntity || !modelEntity || !app) return;
+    
+    try {
+      // Get the orbit camera script
+      const orbitCam = cameraEntity.script.orbitCamera;
+      if (!orbitCam) return;
+      
+      // Store model position
+      const modelPos = modelEntity.getPosition();
+      
+      // 1. We'll create a temporary entity to help us calculate new values
+      const tempEntity = new pc.Entity();
+      tempEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+      tempEntity.lookAt(modelPos);
+      
+      // 2. Calculate the distance between camera and model
+      const distance = new pc.Vec3().sub2(
+        new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
+        modelPos
+      ).length();
+      
+      // 3. Set camera position
+      cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+      cameraEntity.lookAt(modelPos);
+      
+      // 4. Create and apply a new transform for the orbit camera
+      orbitCam.pivotPoint = new pc.Vec3(modelPos.x, modelPos.y, modelPos.z);
+      
+      // 5. Set the distance and remove inertia
+      orbitCam._targetDistance = distance;
+      orbitCam._distance = distance;
+      
+      // 6. Reset internal yaw and pitch values (this is critical)
+      // Get the current camera rotation
+      const rotation = tempEntity.getRotation();
+      const tempForward = new pc.Vec3();
+      rotation.transformVector(pc.Vec3.FORWARD, tempForward);
+      
+      // Calculate yaw from the forward vector
+      const yaw = Math.atan2(-tempForward.x, -tempForward.z) * pc.math.RAD_TO_DEG;
+      
+      // Calculate pitch
+      const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
+      const rotWithoutYaw = new pc.Quat().mul2(yawQuat, rotation);
+      const forwardWithoutYaw = new pc.Vec3();
+      rotWithoutYaw.transformVector(pc.Vec3.FORWARD, forwardWithoutYaw);
+      const pitch = Math.atan2(forwardWithoutYaw.y, -forwardWithoutYaw.z) * pc.math.RAD_TO_DEG;
+      
+      // Set yaw and pitch directly on the internal variables
+      orbitCam._targetYaw = yaw;
+      orbitCam._yaw = yaw;
+      orbitCam._targetPitch = pitch;
+      orbitCam._pitch = pitch;
+      
+      // 7. Force an update of the camera position
+      if (typeof orbitCam._updatePosition === 'function') {
+        orbitCam._updatePosition();
       }
-      controlsInstance = new SPLAT.OrbitControls(
-        cameraInstance,
-        canvas,
-        0.5,
-        0.5,
-        5,
-        true,
-        new SPLAT.Vector3(),
-        chosenInitAlpha,
-        chosenInitBeta,
-        chosenInitRadius
-      );
-      controlsInstance.maxZoom = maxZoom;
-      controlsInstance.minZoom = minZoom;
-      controlsInstance.minAngle = minAngle;
-      controlsInstance.maxAngle = maxAngle;
-      controlsInstance.minAzimuth = minAzimuth;
-      controlsInstance.maxAzimuth = maxAzimuth;
-      controlsInstance.panSpeed = isMobile ? 0.5 : 1.2;
-      controlsInstance.update();
+      
+      // Clean up
+      tempEntity.destroy();
+      
+    } catch (error) {
+      console.error("Error resetting camera:", error);
     }
   }
   
-  resetCameraBtn.addEventListener('click', async function() {
+  resetCameraBtn.addEventListener('click', function() {
     console.log("Reset camera button clicked.");
     resetCamera();
   });
@@ -294,70 +370,190 @@
     }
   });
   
-  // --- Initialize the 3D PLY Viewer ---
+  // --- Initialize the 3D PLY Viewer using PlayCanvas ---
   async function initializeViewer() {
-    SPLAT = await import("https://bilca-gsplat-library.static.hf.space/dist/index.js");
     progressDialog.style.display = 'block';
-    const renderer = new SPLAT.WebGLRenderer(canvas);
-    const scene = new SPLAT.Scene();
     
-    const camera = new SPLAT.Camera();
-    
-    controlsInstance = new SPLAT.OrbitControls(
-      camera,
-      canvas,
-      0.5,
-      0.5,
-      5,
-      true,
-      new SPLAT.Vector3(),
-      chosenInitAlpha,
-      chosenInitBeta,
-      chosenInitRadius
-    );
-  
-    cameraInstance = camera;
-    initialCameraPosition = camera.position.clone();
-    initialCameraRotation = camera.rotation.clone();
-  
-    canvas.style.background = config.canvas_background || "#FEFEFD";
+    // Initialize PlayCanvas
+    const deviceType = "webgl2";
+    const gfxOptions = {
+      deviceTypes: [deviceType],
+      glslangUrl: `https://playcanvas.vercel.app/static/lib/glslang/glslang.js`,
+      twgslUrl: `https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js`,
+      antialias: false
+    };
     
-    controlsInstance.maxZoom = maxZoom;
-    controlsInstance.minZoom = minZoom;
-    controlsInstance.minAngle = minAngle;
-    controlsInstance.maxAngle = maxAngle;
-    controlsInstance.minAzimuth = minAzimuth;
-    controlsInstance.maxAzimuth = maxAzimuth;
-    controlsInstance.panSpeed = isMobile ? 0.5 : 1.2;
-  
-    controlsInstance.update();
-  
     try {
-      await SPLAT.PLYLoader.LoadAsync(
-        plyUrl,
-        scene,
-        (progress) => {
-          progressIndicator.value = progress * 100;
+      // Create graphics device
+      const device = await pc.createGraphicsDevice(canvas, gfxOptions);
+      device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
+      
+      // Create app
+      const createOptions = new pc.AppOptions();
+      createOptions.graphicsDevice = device;
+      createOptions.mouse = new pc.Mouse(document.body);
+      createOptions.touch = new pc.TouchDevice(document.body);
+      createOptions.componentSystems = [
+        pc.RenderComponentSystem,
+        pc.CameraComponentSystem,
+        pc.LightComponentSystem,
+        pc.ScriptComponentSystem,
+        pc.GSplatComponentSystem
+      ];
+      createOptions.resourceHandlers = [
+        pc.TextureHandler,
+        pc.ContainerHandler,
+        pc.ScriptHandler,
+        pc.GSplatHandler
+      ];
+      
+      app = new pc.AppBase(canvas);
+      app.init(createOptions);
+      
+      // Set canvas fill mode to match the container
+      app.setCanvasFillMode(pc.FILLMODE_NONE);
+      app.setCanvasResolution(pc.RESOLUTION_AUTO);
+      
+      // Set scene options
+      app.scene.exposure = 0.8;
+      app.scene.toneMapping = pc.TONEMAP_ACES;
+      
+      // Handle window resizing
+      const resize = () => {
+        if (app) {
+          app.resizeCanvas(canvas.clientWidth, canvas.clientHeight);
         }
-      );
-      progressDialog.style.display = 'none';
+      };
+      window.addEventListener('resize', resize);
+      app.on('destroy', () => window.removeEventListener('resize', resize));
+      
+      // Load required assets
+      const assets = {
+        model: new pc.Asset('gsplat', 'gsplat', { url: plyUrl }),
+        orbit: new pc.Asset('script', 'script', { url: `https://bilca-visionneur-play-canva-2.static.hf.space/orbit-camera.js` })
+      };
+      
+      // Create asset loader with progress tracking
+      const assetListLoader = new pc.AssetListLoader(Object.values(assets), app.assets);
+      
+      // Handle asset loading progress
+      let lastProgress = 0;
+      assets.model.on('load', (asset) => {
+        progressDialog.style.display = 'none';
+      });
+      
+      assets.model.on('error', (err) => {
+        console.error("Error loading PLY file:", err);
+        progressDialog.innerHTML = `<p style="color: red">Error loading model: ${err}</p>`;
+      });
+      
+      // Set up progress monitoring
+      const checkProgress = () => {
+        if (app && assets.model.resource) {
+          progressIndicator.value = 100;
+          clearInterval(progressChecker);
+          progressDialog.style.display = 'none';
+        } else if (assets.model.loading) {
+          // Increment progress for visual feedback
+          lastProgress += 2;
+          if (lastProgress > 90) lastProgress = 90; // Cap at 90% until fully loaded
+          progressIndicator.value = lastProgress;
+        }
+      };
+      
+      const progressChecker = setInterval(checkProgress, 100);
+      
+      // Load assets and set up scene
+      assetListLoader.load(() => {
+        app.start();
+        
+        // Create model entity
+        modelEntity = new pc.Entity('model');
+        modelEntity.addComponent('gsplat', {
+          asset: assets.model
+        });
+        
+        // Position the model using JSON parameters
+        modelEntity.setLocalPosition(modelX, modelY, modelZ);
+        modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+        modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+        
+        app.root.addChild(modelEntity);
+        
+        // Create camera entity
+        cameraEntity = new pc.Entity('camera');
+        cameraEntity.addComponent('camera', {
+          clearColor: new pc.Color(
+            config.canvas_background ? parseInt(config.canvas_background.substr(1, 2), 16) / 255 : 0,
+            config.canvas_background ? parseInt(config.canvas_background.substr(3, 2), 16) / 255 : 0,
+            config.canvas_background ? parseInt(config.canvas_background.substr(5, 2), 16) / 255 : 0
+          ),
+          toneMapping: pc.TONEMAP_ACES
+        });
+        
+        // Set camera position directly using X, Y, Z coordinates from config
+        cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+        cameraEntity.lookAt(modelEntity.getPosition());
+        
+        // Add orbit camera script for interactive navigation
+        cameraEntity.addComponent('script');
+        cameraEntity.script.create('orbitCamera', {
+          attributes: {
+            inertiaFactor: 0.2,
+            focusEntity: modelEntity,
+            distanceMax: maxZoom,
+            distanceMin: minZoom,
+            pitchAngleMax: maxAngle,
+            pitchAngleMin: minAngle,
+            yawAngleMax: maxAzimuth,
+            yawAngleMin: minAzimuth,
+            frameOnStart: false // Don't auto-frame since we're setting position directly
+          }
+        });
+        
+        // Initialize the orbit controller to match our direct coordinates
+        setTimeout(() => {
+          if (cameraEntity.script.orbitCamera) {
+            // Calculate distance from camera to model
+            const modelPos = modelEntity.getPosition();
+            const camPos = cameraEntity.getPosition();
+            const distanceVec = new pc.Vec3();
+            distanceVec.sub2(camPos, modelPos);
+            const distance = distanceVec.length();
+            
+            // Set up the orbit controller
+            cameraEntity.script.orbitCamera.pivotPoint.copy(modelPos);
+            cameraEntity.script.orbitCamera.distance = distance;
+            cameraEntity.script.orbitCamera._removeInertia();
+          }
+        }, 100);
+        
+        // Add input controllers
+        cameraEntity.script.create('orbitCameraInputMouse', {
+          attributes: {
+            orbitSensitivity: isMobile ? 0.6 : 0.3,
+            distanceSensitivity: isMobile ? 0.5 : 0.4
+          }
+        });
+        cameraEntity.script.create('orbitCameraInputTouch', {
+          attributes: {
+            orbitSensitivity: 0.6,
+            distanceSensitivity: 0.5
+          }
+        });
+        
+        app.root.addChild(cameraEntity);
+        
+        // Initial resize to match container
+        resize();
+        
+        // Hide progress dialog when everything is set up
+        progressDialog.style.display = 'none';
+      });
+      
     } catch (error) {
-      console.error("Error loading PLY file:", error);
-      progressDialog.innerHTML = `<p style="color: red">Error loading model: ${error.message}</p>`;
+      console.error("Error initializing PlayCanvas viewer:", error);
+      progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error.message}</p>`;
     }
-  
-    const frame = () => {
-      controlsInstance.update();
-      renderer.render(scene, camera);
-      requestAnimationFrame(frame);
-    };
-  
-    const handleResize = () => {
-      renderer.setSize(canvas.clientWidth, canvas.clientHeight);
-    };
-  
-    handleResize();
-    window.addEventListener("resize", handleResize);
-    requestAnimationFrame(frame);
   }
-})();
+})();