Spaces:
Running
Running
File size: 12,140 Bytes
365ca90 ebc809d b9c169f c7c8c1d e8b4797 c7c8c1d 8c64c02 c7c8c1d caacb2c 670d350 e5ab01e b9c169f 02dee86 32fe69b 670d350 32fe69b 670d350 32fe69b b9c169f 32fe69b 670d350 32fe69b 5b78773 b9c169f 5b78773 b9c169f 5b78773 b9c169f 32fe69b b9c169f 32fe69b b9c169f 32fe69b fdabf2a 32fe69b 9726aa9 32fe69b 02dee86 e5ab01e 670d350 f919bda 670d350 32fe69b b9c169f 32fe69b 02dee86 32fe69b e5ab01e 32fe69b 365ca90 32fe69b 365ca90 32fe69b 365ca90 e5ab01e 32fe69b a5e242c 236a054 a5e242c 32fe69b b9c169f 32fe69b b9c169f 32fe69b b9c169f 32fe69b b9c169f 32fe69b b6a8b79 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | // viewer.js
// ==============================
// --- Patch all window.Image to force crossOrigin="anonymous" ---
(function() {
const OriginalImage = window.Image;
window.Image = function(...args) {
const img = new OriginalImage(...args);
img.crossOrigin = "anonymous";
// Optionally log image loading for debugging
img.onload = function() {
console.log("[VIEWER DEBUG] Image loaded:", img.src, "crossOrigin:", img.crossOrigin);
};
img.onerror = function(e) {
console.error("[VIEWER DEBUG] Image load error:", img.src, e);
};
return img;
};
})();
let pc;
export let app = null;
let cameraEntity = null;
let modelEntity = null;
let viewerInitialized = false;
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 presentoirScaleX, presentoirScaleY, presentoirScaleZ;
let sogsUrl, glbUrl, presentoirUrl;
// --- Log user agent and page location ---
console.log("%c[VIEWER DEBUG] User Agent:", "color: #0074D9;", navigator.userAgent);
console.log("%c[VIEWER DEBUG] Page:", "color: #0074D9;", location.href);
export async function initializeViewer(config, instanceId) {
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 !== undefined) ? config.glb_url : "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/ressources/espace_expo/sol_blanc.glb";
presentoirUrl = (config.presentoir_url !== undefined) ? config.presentoir_url : "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/ressources/espace_expo/sol_blanc.glb";
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;
presentoirScaleX = (config.presentoirScaleX !== undefined) ? parseFloat(config.presentoirScaleX) : 0;
presentoirScaleY = (config.presentoirScaleY !== undefined) ? parseFloat(config.presentoirScaleY) : 0;
presentoirScaleZ = (config.presentoirScaleZ !== undefined) ? parseFloat(config.presentoirScaleZ) : 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 });
canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { 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;
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 }),
presentoir: new pc.Asset('presentoir', 'container', {url: presentoirUrl}),
};
// --- LOG: asset list and all URLs
console.log("%c[VIEWER DEBUG] About to load assets:", "color: #39CCCC;", JSON.stringify(
Object.fromEntries(Object.entries(assets).map(([k, v]) => [k, v && v.url]))
, null, 2));
Object.entries(assets).forEach(([name, asset]) => {
if (asset && asset.url) {
console.log(`[VIEWER DEBUG] Asset "${name}" loading from: ${asset.url}`);
}
});
for (const key in assets) app.assets.add(assets[key]);
// --- LOG: asset load or error events
Object.entries(assets).forEach(([name, asset]) => {
if (!asset) return;
asset.once('load', function(resource) {
console.log(`%c[VIEWER DEBUG] Asset loaded: "${name}"`, "color: #2ECC40;", asset.url, resource);
});
asset.once('error', function(err) {
console.error(`%c[VIEWER DEBUG] Asset failed to load: "${name}"`, "color: #FF4136;", asset.url, err);
});
});
const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
loader.load(() => {
console.log("%c[VIEWER DEBUG] All assets loaded, starting app", "color: #2ECC40;");
app.start();
progressDialog.style.display = 'none';
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);
if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
const glbEntity = assets.glb.resource.instantiateRenderEntity();
app.root.addChild(glbEntity);
}
const presentoirEntity =assets.presentoir.resource.instantiateRenderEntity();
presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
app.root.addChild(presentoirEntity);
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());
// 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) {
console.error("[VIEWER DEBUG] resetViewerCamera error", e);
}
}
|