From a8d3363a714e102f351c5a4231c194bbadfa4084 Mon Sep 17 00:00:00 2001 From: eust-w Date: Sun, 12 Jul 2026 19:25:40 +0800 Subject: [PATCH] fix: focus scene composer on task assets --- src/real2sim_platform/static/app.js | 2 +- .../static/scene-viewer.html | 36 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/real2sim_platform/static/app.js b/src/real2sim_platform/static/app.js index e98b3ce..a62214d 100644 --- a/src/real2sim_platform/static/app.js +++ b/src/real2sim_platform/static/app.js @@ -1,4 +1,4 @@ -const STATIC_VERSION = "20260712-scene-composition-v2"; +const STATIC_VERSION = "20260712-scene-composition-v3"; const state = { datasets: [], diff --git a/src/real2sim_platform/static/scene-viewer.html b/src/real2sim_platform/static/scene-viewer.html index b58d90f..51940e7 100644 --- a/src/real2sim_platform/static/scene-viewer.html +++ b/src/real2sim_platform/static/scene-viewer.html @@ -124,6 +124,7 @@ let selectionHelper = null; let composerTool = "select"; let compositionDrag = null; + let compositionFrameKey = ""; let manifestAssets = []; let manifestBounds = null; let sourceUpAxis = "Z"; @@ -536,7 +537,10 @@ clearOverlays(); // Composer mode rebuilds these objects from the editable draft. Loading // manifest overlays as well would duplicate robots and task assets. - if (composerMode) return; + if (composerMode) { + frameCompositionDraft(true); + return; + } if (!loadedObject) return; const overlays = assets.filter((asset) => ["added_asset", "robot"].includes(asset?.role)); for (const asset of overlays) { @@ -772,6 +776,36 @@ }); document.body.dataset.compositionDraftCount = String(draftObjects.size); document.body.dataset.compositionBounds = JSON.stringify(debug.compositionObjects); + frameCompositionDraft(false); + } + + function frameCompositionDraft(force) { + if (!composerMode || !draftObjects.size) return; + const frameKey = [...draftObjects.keys()].sort().join("|"); + if (!force && frameKey === compositionFrameKey) return; + fitRoot.position.set(0, 0, 0); + fitRoot.scale.set(1, 1, 1); + fitRoot.updateMatrixWorld(true); + const box = new THREE.Box3(); + for (const object of draftObjects.values()) box.expandByObject(object); + if (!Number.isFinite(box.min.x) || !Number.isFinite(box.max.x)) return; + const sphere = new THREE.Sphere(); + box.getBoundingSphere(sphere); + const radius = Math.max(0.35, sphere.radius); + const scale = 1.45 / radius; + fitRoot.scale.setScalar(scale); + fitRoot.position.copy(sphere.center).multiplyScalar(-scale); + controls.target.set(0, 0, 0); + camera.position.set(2.8, 2.2, 2.8); + controls.update(); + compositionFrameKey = frameKey; + debug.framing = "composition_draft"; + debug.compositionFocus = { + objectCount: draftObjects.size, + radius, + scale, + }; + document.body.dataset.compositionFraming = "composition_draft"; } function selectDraftObject(instanceId, notify) {