fix: fall back to mesh when Spark stalls

This commit is contained in:
eust-w 2026-07-12 08:51:53 +08:00
parent d3747e71f5
commit 9295661658
3 changed files with 24 additions and 5 deletions

View File

@ -1,4 +1,4 @@
const STATIC_VERSION = "20260712-motrix-spatial-v1";
const STATIC_VERSION = "20260712-motrix-spatial-v2";
const state = {
datasets: [],

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Real2Sim</title>
<link rel="icon" href="data:,">
<link rel="stylesheet" href="/static/styles.css?v=20260712-motrix-spatial-v1">
<link rel="stylesheet" href="/static/styles.css?v=20260712-motrix-spatial-v2">
</head>
<body>
<section id="authShell" class="auth-shell" aria-label="登录 Real2Sim">

View File

@ -225,7 +225,7 @@
status.textContent = `已添加资产 · ${selected.name || "asset"} · 与 MotrixSim 场景使用同一坐标`;
return;
}
loadAsset(selected, { manual: true }).then(() => loadSceneOverlays(assets)).catch(showError);
loadAssetWithSceneFallback(selected, assets, { manual: true }).then(() => loadSceneOverlays(assets)).catch(showError);
});
status.textContent = rendererStatusText(manifest, assets.length);
hint.textContent = viewerHint(assets, renderable);
@ -237,7 +237,7 @@
if (preferred) {
// Large 3DGS assets remain an explicit user action. Their real cover is
// a safer first frame than an automatically generated diagnostic mesh.
await loadAsset(preferred, { manual: preferred === previewImage });
await loadAssetWithSceneFallback(preferred, assets, { manual: preferred === previewImage });
await loadSceneOverlays(assets);
}
else if (renderable[0]) addPlaceholder(`可渲染大文件未自动加载:${renderable[0].name || "asset"} · ${renderable[0].size_label || "unknown size"} · 点击按钮手动加载`);
@ -297,7 +297,7 @@
} else if (suffix === "ply") {
await loadPlyFallback(asset);
} else if (["spz", "splat", "ksplat", "sog", "zip", "rad"].includes(suffix)) {
await withLoadingTimeout(loadSparkOrFallback(asset, suffix), `loading timed out: ${asset.name || "asset"}${size}`);
await withLoadingTimeout(loadSparkOrFallback(asset, suffix), `loading timed out: ${asset.name || "asset"}${size}`, 20000);
} else if (suffix === "glb" || suffix === "gltf") {
status.textContent = `Three.js fallback · loading ${asset.name}${size}`;
const { GLTFLoader } = await import("three/addons/loaders/GLTFLoader.js");
@ -327,6 +327,25 @@
}
}
async function loadAssetWithSceneFallback(asset, assets, options = {}) {
try {
await loadAsset(asset, options);
return;
} catch (error) {
const suffix = String(asset?.name || asset?.path || "").toLowerCase().split(".").pop();
const splatFormat = ["spz", "splat", "ksplat", "sog", "zip", "rad"].includes(suffix);
const fallback = splatFormat
? assets.find((item) => item?.role === "visual_fallback" && ["glb", "gltf", "obj"].includes(String(item?.name || item?.path || "").toLowerCase().split(".").pop()))
: null;
if (!fallback || fallback === asset) throw error;
const reason = error?.message || String(error);
debug.warnings.push(`Spark ${asset.name || "asset"}: ${reason}`);
status.textContent = `Spark 未就绪,正在切换 Three.js fallback · ${fallback.name || "mesh"}`;
await loadAsset(fallback, { manual: true });
status.textContent = `Three.js fallback · ${fallback.name || "mesh"} · SPZ 可手动重试`;
}
}
function isRenderableAsset(asset) {
if (asset?.role === "added_asset" && asset?.viewer_primitive) return true;
const suffix = String(asset?.name || asset?.path || "").toLowerCase().split(".").pop();