perf: reduce idle scene composition rendering

This commit is contained in:
eust-w 2026-07-13 03:08:57 +08:00
parent 74af0bd139
commit 3145fb35a2
3 changed files with 123 additions and 12 deletions

View File

@ -1,4 +1,4 @@
const STATIC_VERSION = "20260712-scene-composition-v5";
const STATIC_VERSION = "20260713-scene-composition-performance-v6";
const state = {
datasets: [],
@ -37,6 +37,8 @@ const state = {
hydratedSceneId: "",
hydratingSceneId: "",
hydrationError: "",
previewQuality: "performance",
lastPostedSignature: "",
},
};
@ -98,7 +100,9 @@ async function bootstrap() {
await refresh();
startTaskEvents();
clearInterval(state.refreshTimer);
state.refreshTimer = setInterval(() => refresh({ quiet: true }).catch((error) => console.warn(error)), 15000);
state.refreshTimer = setInterval(() => {
if (!document.hidden) refresh({ quiet: true }).catch((error) => console.warn(error));
}, 45000);
state.initialized = true;
}
@ -106,11 +110,12 @@ function startTaskEvents() {
state.taskEvents?.close();
state.taskEvents = new EventSource("/api/events/tasks");
state.taskEvents.addEventListener("tasks", (event) => {
const previousComposition = compositionTaskSignature(state.tasks);
const previousTerminal = new Set(state.tasks.filter((task) => terminalStatus(task.status)).map((task) => task.id));
state.tasks = JSON.parse(event.data);
renderScopedTaskLists();
renderOverview();
renderComposition();
if (activePageId() === "overview") renderOverview();
if (activePageId() === "compose" && previousComposition !== compositionTaskSignature(state.tasks)) renderComposition();
if (state.selectedTaskId && $("taskDrawer")?.classList.contains("open")) showTask(state.selectedTaskId, { preservePreview: true }).catch(console.warn);
if (state.tasks.some((task) => terminalStatus(task.status) && !previousTerminal.has(task.id))) refresh({ quiet: true }).catch(console.warn);
});
@ -121,6 +126,17 @@ function terminalStatus(status) {
return ["succeeded", "failed", "failed_recovered", "canceled"].includes(status);
}
function activePageId() {
return document.querySelector(".page.active")?.id || "";
}
function compositionTaskSignature(tasks) {
return tasks
.filter((task) => taskScopes.compositionTaskList.includes(task.type))
.map((task) => `${task.id}:${task.status}:${task.progress ?? ""}:${task.stage ?? ""}:${task.updated_at ?? ""}`)
.join("|");
}
function roleLabel(role) {
return { admin: "管理员", engineer: "工程师", viewer: "只读" }[role] || "本地模式";
}
@ -182,7 +198,7 @@ function renderAll() {
renderDatasetList();
renderReconstructDatasetCards();
renderSceneList();
renderComposition();
if (activePageId() === "compose") renderComposition();
renderPreflightSummary();
renderCollectionDatasets();
renderModelList();
@ -216,6 +232,9 @@ function setActionAvailability(id, enabled, reason) {
function switchTab(tabId) {
document.querySelectorAll(".tab").forEach((button) => button.classList.toggle("active", button.dataset.tab === tabId));
document.querySelectorAll(".page").forEach((page) => page.classList.toggle("active", page.id === tabId));
document.querySelectorAll("iframe").forEach((frame) => {
frame.contentWindow?.postMessage({ type: "real2sim-viewer-visibility", visible: frame.closest(".page")?.id === tabId }, location.origin);
});
refreshSelectionBars();
if (tabId === "compose") renderComposition();
}
@ -399,6 +418,7 @@ function resetCompositionForScene(sceneId) {
hydratedSceneId: "",
hydratingSceneId: "",
hydrationError: "",
lastPostedSignature: "",
});
}
@ -472,6 +492,11 @@ function renderComposition() {
if (!$("composeRobotList")) return;
ensureCompositionDraft();
const draft = state.composition;
document.querySelectorAll("[data-compose-quality]").forEach((button) => {
const active = button.dataset.composeQuality === draft.previewQuality;
button.classList.toggle("active", active);
button.setAttribute("aria-pressed", String(active));
});
const baseScene = state.scenes.find((scene) => scene.id === draft.baseSceneId);
const baseSelect = $("composeBaseScene");
if (baseSelect && baseScene) baseSelect.value = baseScene.id;
@ -531,14 +556,21 @@ function renderComposition() {
function renderCompositionPreview(baseScene) {
const iframe = $("compositionPreview");
if (!iframe) return;
if (activePageId() !== "compose") return;
if (!baseScene) {
iframe.removeAttribute("src");
iframe.dataset.previewKey = "";
state.composition.lastPostedSignature = "";
return;
}
if (state.composition.previewSceneId !== baseScene.id || !iframe.src.includes(STATIC_VERSION)) {
const previewQuality = state.composition.previewQuality === "full" ? "full" : "performance";
const previewKey = `${baseScene.id}:${previewQuality}`;
if (iframe.dataset.previewKey !== previewKey || !iframe.src.includes(STATIC_VERSION)) {
state.composition.previewSceneId = baseScene.id;
iframe.src = `/static/scene-viewer.html?v=${STATIC_VERSION}&embedded=1&composer=1&scene_id=${encodeURIComponent(baseScene.id)}`;
iframe.onload = () => postCompositionDraft();
iframe.dataset.previewKey = previewKey;
state.composition.lastPostedSignature = "";
iframe.src = `/static/scene-viewer.html?v=${STATIC_VERSION}&embedded=1&composer=1&quality=${previewQuality}&scene_id=${encodeURIComponent(baseScene.id)}`;
iframe.onload = () => postCompositionDraft({ force: true });
loadCompositionBounds(baseScene.id).catch((error) => console.warn(error));
} else {
postCompositionDraft();
@ -553,10 +585,19 @@ async function loadCompositionBounds(sceneId) {
state.composition.bounds = min.length === 3 && max.length === 3 && [...min, ...max].every(Number.isFinite) ? { min, max } : null;
}
function postCompositionDraft() {
function postCompositionDraft({ force = false } = {}) {
const iframe = $("compositionPreview");
if (!iframe?.contentWindow) return;
const draft = state.composition;
const signature = JSON.stringify({
quality: draft.previewQuality,
robotId: draft.robotId,
robotTransform: draft.robotTransform,
assets: draft.assets,
selectedId: draft.selectedId,
tool: draft.tool,
});
if (!force && signature === draft.lastPostedSignature) return;
const robot = state.robots.find((item) => item.id === draft.robotId);
const robotPayload = robot ? {
...robot,
@ -593,6 +634,7 @@ function postCompositionDraft() {
selected_id: draft.selectedId,
tool: draft.tool,
}, location.origin);
draft.lastPostedSignature = signature;
}
function selectedCompositionObject() {
@ -2306,6 +2348,18 @@ async function handleBodyClick(event) {
const composeRemove = event.target.closest("[data-compose-remove]");
if (composeRemove) removeCompositionObject(composeRemove.dataset.composeRemove);
const composeQuality = event.target.closest("[data-compose-quality]");
if (composeQuality) {
const quality = composeQuality.dataset.composeQuality === "full" ? "full" : "performance";
if (state.composition.previewQuality !== quality) {
state.composition.previewQuality = quality;
state.composition.previewSceneId = "";
state.composition.lastPostedSignature = "";
renderComposition();
toast(quality === "full" ? "已切换精细预览,将加载完整真实 3DGS" : "已切换流畅预览,使用真实轻量视觉资产");
}
}
const composeTool = event.target.closest("[data-compose-tool]");
if (composeTool) {
state.composition.tool = composeTool.dataset.composeTool;

View File

@ -422,6 +422,11 @@
<span class="toolbar-separator"></span>
<button id="composeUndo" type="button">撤销</button>
<button id="composeRedo" type="button">重做</button>
<span class="toolbar-separator"></span>
<div class="composition-quality" role="group" aria-label="预览质量">
<button type="button" data-compose-quality="performance" class="active" aria-pressed="true" title="使用场景包中的真实轻量视觉资产,适合布置和拖拽">流畅</button>
<button type="button" data-compose-quality="full" aria-pressed="false" title="加载完整真实 3DGS 资产,适合检查重建细节">精细</button>
</div>
<span id="composeStageStatus" class="composition-stage-status">等待基础场景</span>
</div>
<div id="compositionCanvasWrap" class="composition-canvas-wrap">

View File

@ -76,6 +76,14 @@
const coverMode = params.get("cover") === "1";
const coverView = params.get("cover_view") || "hero";
const probeFull = params.get("probe_full") === "1";
const qualityMode = params.get("quality") === "full" ? "full" : composerMode ? "performance" : "full";
let parentVisible = true;
let renderActiveUntil = performance.now() + 3500;
let lastRenderAt = 0;
let renderedFrames = 0;
let frameWindowStart = performance.now();
let frameWindowCount = 0;
document.body.dataset.viewerQuality = qualityMode;
if (coverMode || composerMode) document.getElementById("hud").style.display = "none";
setupHudPanel();
if (embeddedMode || innerWidth <= 640) setHudCollapsed(true);
@ -102,6 +110,9 @@
const controls = new OrbitControls(camera, renderer.domElement);
controls.target.set(0, 0, 0);
controls.enableDamping = true;
controls.addEventListener("start", () => wakeRenderer(60000));
controls.addEventListener("change", () => wakeRenderer(500));
controls.addEventListener("end", () => wakeRenderer(1000));
const gridHelper = new THREE.GridHelper(4, 16, 0x2f6d68, 0x24313a);
const axesHelper = new THREE.AxesHelper(1.2);
@ -140,9 +151,16 @@
errors: [],
warnings: [],
canvas: { width: 0, height: 0 },
qualityMode,
renderStats: { fps: 0, renderedFrames: 0, targetFps: composerMode ? 10 : 20 },
};
window.real2simViewerDebug = debug;
window.real2simViewerDebug.snapshot = () => ({ ...debug, canvas: { ...debug.canvas } });
addEventListener("message", (event) => {
if (event.origin !== location.origin || event.data?.type !== "real2sim-viewer-visibility") return;
parentVisible = event.data.visible !== false;
if (parentVisible) wakeRenderer(1200);
});
if (composerMode) setupCompositionEditor();
function setupHudPanel() {
@ -294,6 +312,7 @@
return;
}
const loadId = ++loadSequence;
wakeRenderer(3500);
document.body.dataset.viewerLoaded = "false";
if (loadedObject) contentRoot.remove(loadedObject);
clearOverlays();
@ -348,6 +367,7 @@
function markViewerReady(backend) {
document.body.dataset.viewerBackend = backend;
document.body.dataset.viewerLoaded = "true";
wakeRenderer(1400);
}
async function loadAssetWithSceneFallback(asset, assets, options = {}) {
@ -438,7 +458,8 @@
function setRenderQualityForAsset(asset) {
const sizeBytes = Number(asset?.size_bytes || 0);
const heavy = shouldUseSparkForPly(asset) || sizeBytes > 80 * 1024 * 1024;
renderer.setPixelRatio(heavy ? 1 : basePixelRatio);
const performanceCap = composerMode && qualityMode === "performance" ? 1.25 : basePixelRatio;
renderer.setPixelRatio(heavy ? 1 : Math.min(basePixelRatio, performanceCap));
renderer.setSize(innerWidth, innerHeight);
}
@ -659,6 +680,7 @@
});
renderer.domElement.addEventListener("pointerdown", (event) => {
wakeRenderer(60000);
const hit = compositionHit(event, raycaster, pointer);
if (!hit) return;
selectDraftObject(hit.userData.compositionInstanceId, true);
@ -686,6 +708,7 @@
renderer.domElement.addEventListener("pointermove", (event) => {
if (!compositionDrag) return;
wakeRenderer(60000);
const transform = cloneTransform(compositionDrag.transform);
if (composerTool === "move") {
setPointer(event, pointer);
@ -713,6 +736,7 @@
if (!compositionDrag) return;
const instanceId = compositionDrag.instanceId;
compositionDrag = null;
wakeRenderer(1200);
controls.enabled = true;
if (renderer.domElement.hasPointerCapture?.(event.pointerId)) renderer.domElement.releasePointerCapture(event.pointerId);
parent.postMessage({ type: "real2sim-composition-transform-end", instance_id: instanceId }, location.origin);
@ -777,6 +801,7 @@
document.body.dataset.compositionDraftCount = String(draftObjects.size);
document.body.dataset.compositionBounds = JSON.stringify(debug.compositionObjects);
frameCompositionDraft(false);
wakeRenderer(1200);
}
function frameCompositionDraft(force) {
@ -950,6 +975,8 @@
function assetPriority(asset) {
const name = String(asset?.name || asset?.path || "").toLowerCase();
const role = String(asset?.role || "").toLowerCase();
const suffix = name.split(".").pop();
if (composerMode && qualityMode === "performance" && role === "visual_fallback" && ["glb", "gltf", "obj"].includes(suffix)) return 30;
if (role === "viewer_preview" && name.endsWith(".glb")) return 20;
if (role === "rollout_gif" || role === "rollout_final_frame") return 14;
if (name.endsWith("_threejs_rgb.ply")) return 12;
@ -981,18 +1008,43 @@
return String(value).replace(/[&<>"']/g, (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" }[ch]));
}
function animate() {
function wakeRenderer(duration = 1200) {
renderActiveUntil = Math.max(renderActiveUntil, performance.now() + duration);
}
function animate(timestamp = performance.now()) {
requestAnimationFrame(animate);
if (!parentVisible || document.hidden) return;
const active = compositionDrag || timestamp < renderActiveUntil;
const interval = active ? (composerMode ? 33 : 16) : (composerMode ? 100 : 50);
if (timestamp - lastRenderAt < interval) return;
lastRenderAt = timestamp;
controls.update();
selectionHelper?.update();
debug.canvas = { width: renderer.domElement.width, height: renderer.domElement.height };
renderer.render(scene, camera);
requestAnimationFrame(animate);
renderedFrames += 1;
frameWindowCount += 1;
if (timestamp - frameWindowStart >= 1000) {
debug.renderStats = {
fps: Math.round((frameWindowCount * 1000) / Math.max(1, timestamp - frameWindowStart)),
renderedFrames,
targetFps: active ? (composerMode ? 30 : 60) : (composerMode ? 10 : 20),
};
frameWindowStart = timestamp;
frameWindowCount = 0;
}
}
addEventListener("resize", () => {
camera.aspect = innerWidth / innerHeight;
camera.updateProjectionMatrix();
renderer.setSize(innerWidth, innerHeight);
wakeRenderer(1200);
});
addEventListener("visibilitychange", () => {
if (!document.hidden) wakeRenderer(1200);
});
main().catch(showError);