Update viewer.js

viewer.js

@@ -1,5 +1,4 @@
-// viewer.js
-// ==============================
+// viewer.js (updated with explicit KHR GLB extension support)
 
 let pc;
 export let app = null;
@@ -10,7 +9,6 @@ let bouchonEntity = null;
 let viewerInitialized = false;
 let resizeObserver = null;
 
-// These will hold references to the material(s) you want to update.
 let glossyRedMat = null;
 
 let chosenCameraX, chosenCameraY, chosenCameraZ;
@@ -59,10 +57,7 @@ export async function initializeViewer(config, instanceId) {
   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();
 
@@ -71,35 +66,13 @@ export async function initializeViewer(config, instanceId) {
   canvas.className = 'ply-canvas';
   canvas.style.width = "100%";
   canvas.style.height = "100%";
-  canvas.setAttribute('tabindex', '0');
-  // Safer insert:
-  if (progressDialog) {
-    viewerContainer.insertBefore(canvas, progressDialog);
-  } else {
-    viewerContainer.appendChild(canvas);
-  }
-
-  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 });
-
-  if (progressDialog) progressDialog.style.display = 'block';
+  viewerContainer.appendChild(canvas);
 
   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",
@@ -110,273 +83,47 @@ export async function initializeViewer(config, instanceId) {
 
   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);
 
-  const containerHandler = app.loader.getHandler('container');
-  containerHandler.pcMaterialOptions = {
-      processTransmission: true,
-      processVolume: true,
-      processIOR: true,
-      processSheen: true,
-      processClearCoat: true,
-      processVariants: true
+  // Explicitly enable KHR GLB extensions
+  app.loader.getHandler('container').pcMaterialOptions = {
+    processTransmission: true,
+    processVolume: true,
+    processIOR: true,
+    processSheen: true,
+    processClearCoat: true,
+    processVariants: true
   };
 
-  resizeObserver = new ResizeObserver(entries => {
-    entries.forEach(entry => {
-      app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
-    });
-  });
+  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 = {
-    orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
-    model: new pc.Asset('glb', 'container', { url: glbUrl }),
-    tube: new pc.Asset('glb', 'container', {url: glbUrl2}),
     bouchon: new pc.Asset('glb', 'container', {url: glbUrl3}),
-    ao_map: new pc.Asset('color', 'texture', {url: aoUrl}),
-    op_map: new pc.Asset('color', 'texture', {url: opacityUrl}),
-    thickness_map: new pc.Asset('color', 'texture', {url: thicknessUrl}),
-    helipad: new pc.Asset(
-      'helipad-env-atlas',
-      'texture',
-      { url: "https://huggingface.co/datasets/MikaFil/3D_models/resolve/main/EARCARE/_rsc/hdr/citrus_orchard_road_puresky_1k.png" },
-      { type: pc.TEXTURETYPE_RGBP, mipmaps: false }
-    )
   };
   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';
-
-    // --- Add the GLB entity ---
-    modelEntity = assets.model.resource.instantiateRenderEntity();
-    app.root.addChild(modelEntity);
-
-    tubeEntity = assets.tube.resource.instantiateRenderEntity();
-    app.root.addChild(tubeEntity);
 
     bouchonEntity = assets.bouchon.resource.instantiateRenderEntity();
+    bouchonEntity.setLocalScale(modelScale, modelScale, modelScale);
+    bouchonEntity.setPosition(modelX, modelY, modelZ);
+    bouchonEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
     app.root.addChild(bouchonEntity);
 
-    // --- Add a light ---
-    const light = new pc.Entity("mainLight");
-    light.addComponent('light',{
-      type: "directional",
-      color: new pc.Color(1, 1, 1),
-      intensity:0.9,
-    });
-    light.setPosition(0, 1, -1);
-    light.lookAt(0, 0, 0);
-    app.root.addChild(light);
-
-    // --- Glossy Red Material (exposed globally for changeColor)
-    glossyRedMat = new pc.StandardMaterial();
-    const ao = assets.ao_map.resource;
-    const op = assets.op_map.resource;
-    const thickness = assets.thickness_map.resource;
-    glossyRedMat.blendType = pc.BLEND_NORMAL;
-    glossyRedMat.diffuse = new pc.Color(0.7, 0.05, 0.05);
-    glossyRedMat.specular = new pc.Color(0.01, 0.01, 0.01);
-    glossyRedMat.shininess = 90;
-    glossyRedMat.gloss = 1;
-    glossyRedMat.metalness = 0.0;
-    glossyRedMat.useMetalness = true;
-    glossyRedMat.useDynamicRefraction = true;
-    glossyRedMat.refraction= 0.8;
-    glossyRedMat.refractionIndex = 0.5;
-    glossyRedMat.thickness = 5;
-    glossyRedMat.thicknessMap = thickness;
-    glossyRedMat.opacityMap = op;
-    glossyRedMat.opacityMapChannel = "r";
-    glossyRedMat.opacity = 0.975;
-    glossyRedMat.emissive = new pc.Color(0.372, 0.03, 0.003);
-    glossyRedMat.emissiveMap = ao;
-    glossyRedMat.emissiveIntensity = 1;
-    glossyRedMat.update();
-
-    const tubeEmit = new pc.StandardMaterial();
-    tubeEmit.emissive = new pc.Color(0.372, 0.2, 0.2);
-    tubeEmit.emissiveIntensity = 5;
-    tubeEmit.opacity = 0.99;
-
-    // RECURSIVE MATERIAL ASSIGNMENT (replace forEach with traverse)
-    function traverse(entity, callback) {
-      callback(entity);
-      entity.children.forEach(child => traverse(child, callback));
-    }
-    // Assign main model material for color switching
-    traverse(modelEntity, node => {
-      if (node.render && node.render.meshInstances) {
-        for (let mi of node.render.meshInstances) {
-          mi.material = glossyRedMat;
-        }
-      }
-    });
-    // Tube
-    traverse(tubeEntity, node => {
-      if (node.render && node.render.meshInstances) {
-        for (let mi of node.render.meshInstances) {
-          mi.material = tubeEmit;
-        }
-      }
-    });
-
-    // Set model transform
-    modelEntity.setPosition(modelX, modelY, modelZ);
-    modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-    modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-
-    tubeEntity.setPosition(modelX, modelY, modelZ);
-    tubeEntity.setLocalScale(modelScale, modelScale, modelScale);
-    tubeEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-
     cameraEntity = new pc.Entity('camera');
-    cameraEntity.addComponent('camera', { clearColor: new pc.Color(0.95, 0.95, 0.95, 1) });
+    cameraEntity.addComponent('camera');
     cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-    cameraEntity.lookAt(modelEntity.getPosition());
-    cameraEntity.addComponent('script');
-
-    // Setup skydome
-    app.scene.envAtlas = assets.helipad.resource;
-    app.scene.skyboxRotation = new pc.Quat().setFromEulerAngles(30, 70, 0);
-    app.scene.skyboxIntensity = 2;
-    app.scene.skyboxMip = 0;
-
-    // Hide skybox layer so HDR is not rendered as background
-    const LAYERID_SKYBOX = app.scene.layers.getLayerByName("Skybox").id;
-    //app.scene.layers.getLayerById(LAYERID_SKYBOX).enabled = false;
-
-    // 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
-      }
-    });
-    cameraEntity.script.create('orbitCameraInputMouse');
-    cameraEntity.script.create('orbitCameraInputTouch');
+    cameraEntity.lookAt(bouchonEntity.getPosition());
     app.root.addChild(cameraEntity);
 
-    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-    app.once('update', () => resetViewerCamera());
-
-    // Tooltips supported if tooltips_url set
-    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 => {
-          // Tooltips optional: fail silently if missing
-        });
-      }
-    } catch (e) {
-      // Tooltips optional, fail silently
-    }
-
     viewerInitialized = true;
   });
 }
-
-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) {
-    // Silent fail
-  }
-}
-
-/**
- * Change the main model's diffuse color in real time.
- * r,g,b are floats [0,1]. This is a reusable function for new colors.
- */
-export function changeColor(dr, dg, db, a, er, eg, eb) {
-  // Wait until glossyRedMat is loaded (null before model load).
-  if (!glossyRedMat) return;
-
-  glossyRedMat.diffuse.set(dr, dg, db);
-  glossyRedMat.emissive.set(er, eg, eb);
-  glossyRedMat.opacity = a;
-  glossyRedMat.update();
-}