@@ -1461,9 +1458,9 @@ function Properties({ client, snapshot, editorWorkflow, selectedFaceIndices, sel
return (
- 对象
- 修改器
- 材质
+ ▣ 对象 ⌕ 修改器 ● 材质
Transform 位置 0.000, 0.000, 0.000 旋转 0°, 0°, 0° 缩放 1.000, 1.000, 1.000
{activeNode ?
: null}
@@ -3463,7 +3460,7 @@ export function App() {
...(snapshot?.activeObjectId ? [{ id: "selectObject", label: "Select Active Object", keywords: "browser selection outliner", execute: () => selectObject(snapshot.activeObjectId!, false) }] : []),
{ id: "focusViewport", label: "Focus 3D Viewport", keywords: "browser view zoom pan orbit", execute: () => dispatchUI({ type: "setMode", mode: "Object" }) },
{ id: "focusEditor", label: "Focus Current Editor", keywords: "browser editor area region", execute: () => dispatchUI({ type: "setMode", mode: uiState.context.mode }) },
- ...(["Layout", "Modeling", "Animation"] as WorkspaceId[]).filter((id) => id !== workspace).map((id) => ({ id: `workspace.${id}`, label: `Switch to ${id}`, keywords: "workspace", execute: () => dispatchUI({ type: "switchWorkspace", workspaceId: id }) })),
+ ...BLENDER_WORKSPACE_IDS.filter((id) => id !== workspace).map((id) => ({ id: `workspace.${id}`, label: `Switch to ${id}`, keywords: "workspace", execute: () => dispatchUI({ type: "switchWorkspace", workspaceId: id }) })),
{ id: "mode.toggle", label: uiState.context.mode === "Object" ? "Enter Edit Mode" : "Exit Edit Mode", keywords: "mode tab", execute: () => dispatchUI({ type: "setMode", mode: uiState.context.mode === "Object" ? "Edit" : "Object" }) },
...(snapshot && uiState.context.mode === "Object" && isWorkbenchCommandAvailable("createPrimitive") ? ([
["CUBE", "Cube"], ["PLANE", "Plane"], ["UV_SPHERE", "UV Sphere"], ["ICO_SPHERE", "Ico Sphere"],
@@ -3513,17 +3510,17 @@ export function App() {
data-grease-pencil-selection-drawing-id={greasePencilSelection?.drawing.drawingId ?? ""}
data-diagnostic-count={diagnostics.length} data-last-diagnostic-code={diagnostics.at(-1)?.code}>
- ◈ Web Blender Modeler V1
+ Blender
{(["文件", "编辑", "渲染", "窗口", "帮助"] as const).map((menu) => { menuTriggerRefs.current[menu] = element; }} type="button" aria-haspopup="menu" aria-expanded={uiState.openMenu === menu} onClick={() => dispatchUI({ type: "toggleMenu", menu })}>{menu} {uiState.openMenu === menu ? { closeMenu(); if (label === "打开") fileInputRef.current?.click(); else if (label === "保存") void saveBlend(); else if (label === "关闭") closeProject(); else if (label === "撤销") void applyEditCommand({ type: "undo" }); else if (label === "重做") void applyEditCommand({ type: "redo" }); else if (label === "导出 GLB") void reportGLBExport(); }} /> : null}
- {(["Layout", "Modeling", "Animation"] as WorkspaceId[]).map((item) => dispatchUI({ type: "switchWorkspace", workspaceId: item })}>{item} )}
+ {BLENDER_WORKSPACE_IDS.map((item) => dispatchUI({ type: "switchWorkspace", workspaceId: item })}>{item} )}
+ +
- { const projectId = event.target.value; const displayName = event.target.selectedOptions[0]?.textContent ?? projectId; if (!projectId) return; void recoverCachedProject(projectId, displayName); event.currentTarget.value = ""; }}>最近项目 ({recentProjects.length}) {recentProjects.map((project) => {project.displayName} )} fileInputRef.current?.click()}>打开 关闭 void recoverCachedProject()}>恢复 void saveBlend()}>保存 void reportGLBExport()}>GLB 诊断 void applyEditCommand({ type: "undo" })}>↶ void applyEditCommand({ type: "redo" })}>↷ dispatchUI({ type: "toggleOperatorSearch", open: true })}>F3 {workerFaultTestMode ? Fault : null}
+ Scene ViewLayer { const projectId = event.target.value; const displayName = event.target.selectedOptions[0]?.textContent ?? projectId; if (!projectId) return; void recoverCachedProject(projectId, displayName); event.currentTarget.value = ""; }}>Recent ({recentProjects.length}) {recentProjects.map((project) => {project.displayName} )} fileInputRef.current?.click()}>⌕ × void recoverCachedProject()}>↺ void saveBlend()}>▣ void reportGLBExport()}>GLB ! void applyEditCommand({ type: "undo" })}>↶ void applyEditCommand({ type: "redo" })}>↷ dispatchUI({ type: "toggleOperatorSearch", open: true })}>F3 {workerFaultTestMode ? Fault : null}
{workerFault ?
{workerFault.source === "engine" ? "Engine Worker" : "Storage Worker"} stopped; current project list and scene are retained. void restartWorkersAndRecover()} disabled={workerRecoveryStatus === "RUNNING"}>{workerRecoveryStatus === "RUNNING" ? "恢复中..." : "重启并恢复"} {workerRecoveryStatus === "FAILED" ? Recovery failed; retry is safe. : null}
: null}
{recentProjectIssues.length > 0 ?
最近项目中有 {recentProjectIssues.length} 个条目无法验证；当前场景不会被删除。 {recentProjectIssues.map((issue) =>
{issue.project.displayName}: {recentProjectIssueMessage(issue.code)} void removeInvalidRecentProject(issue.project.projectId)}>移除引用
)}
: null}
-
void cleanupProjectAssets()} />
{workspaceLabel} dispatchUI({ type: "setMode", mode: uiState.context.mode === "Object" ? "Edit" : "Object" })}>{uiState.context.mode} Mode {uiState.context.mode === "Edit" ? <>
{(["VERT", "EDGE", "FACE"] as MeshElementMode[]).map((mode) => setMeshSelectionMode(mode)}>{mode === "VERT" ? "1 Vertex" : mode === "EDGE" ? "2 Edge" : "3 Face"} )}
Select All {(["MERGE", "DISSOLVE", "EXTRUDE", "INSET", "BEVEL", "LOOP_CUT", "SUBDIVIDE", "FILL", "TRIANGULATE", "RECALCULATE_NORMALS", "BRIDGE_LOOPS", "DELETE"] as MeshEditOperation[]).map((operation) =>
runMeshEdit(operation)}>{operation.replaceAll("_", " ")} )}
snapshot?.activeObjectId && void applyEditCommand({ type: "separateMeshFaces", objectId: snapshot.activeObjectId, faceIndices: [...meshSelection.indices], name: "Separated" })}>Separate : <>{(["CUBE", "PLANE", "UV_SPHERE", "ICO_SPHERE", "CYLINDER", "CONE", "TORUS"] as MeshPrimitive[]).map((primitive) =>
void applyEditCommand(coreSceneCommands.createPrimitive(primitive))}>Add {primitive.replaceAll("_", " ")} )}
snapshot?.activeObjectId && void applyEditCommand({ type: "duplicateObject", objectId: snapshot.activeObjectId, offset: [0.25, 0.25, 0] })}>Duplicate snapshot?.activeObjectId && void applyEditCommand({ type: "duplicateObject", objectId: snapshot.activeObjectId, offset: [0.5, 0.5, 0], linked: true })}>Linked Duplicate snapshot?.activeObjectId && void applyEditCommand({ type: "deleteObject", objectId: snapshot.activeObjectId })}>Delete { const child = snapshot?.activeObjectId; const parent = [...selectedObjectIds].find((id) => id !== child); if (child && parent) void applyEditCommand({ type: "setParent", objectId: child, parentId: parent, keepTransform: true }); }}>Parent snapshot?.activeObjectId && void applyEditCommand({ type: "setParent", objectId: snapshot.activeObjectId, parentId: null, keepTransform: true })}>Unparent snapshot?.activeObjectId && void applyEditCommand({ type: "joinObjects", activeObjectId: snapshot.activeObjectId, objectIds: [...selectedObjectIds] })}>Join void applyEditCommand({ type: "createCollection", name: `Collection ${(snapshot?.collections.length ?? 0) + 1}` })}>New Collection }
{uiState.context.mode === "Edit" ? `${meshSelection.greasePencilPoints?.length ?? meshSelection.indices.size} ${meshSelection.mode.toLowerCase()} selected` : `${selectedObjectIds.size} selected`} {saved ? "已保存" : "未保存"}
@@ -3532,7 +3529,7 @@ export function App() {
void applyEditCommand({ type: "setFrame", frame: value })} onCommand={(command) => void applyEditCommand(command)} />
{uiState.operatorSearchOpen ? { setSnapshot(result.snapshot); setGeometryBuffers(result.geometryBuffers); setNonMeshGeometryBuffers(result.nonMeshGeometryBuffers ?? []); setFrame(result.snapshot.frame.current); projectRevisionRef.current = result.snapshot.revision; const routeLabel = (route as unknown as { identifier?: string; id?: string }).identifier ?? (route as unknown as { id?: string }).id ?? "unknown"; setEngineStatus(`Route: ${routeLabel}`); }} /> : null}
- Web Blender Modeler V1 Objects {objectCount} · Vertices {vertexCount} · Faces {faceCount} {openProgress ? 0 ? openProgress.totalBytes : 1} value={openProgress.bytesRead ?? openProgress.fraction ?? 0} />{openProgress.message ?? "Opening"} {canCancelOpenRead ? × : null} {manifestStatus} {wasmStatus} {engineStatus} {storageStatus} LMB Select · MMB Rotate View · Wheel Zoom Collection | Cube · Objects {objectCount} · Vertices {vertexCount} · Faces {faceCount} {openProgress ? 0 ? openProgress.totalBytes : 1} value={openProgress.bytesRead ?? openProgress.fraction ?? 0} />{openProgress.message ?? "Opening"} {canCancelOpenRead ? × : null} {manifestStatus} {wasmStatus} {engineStatus} {storageStatus} void cleanupProjectAssets()} />5.2.0 LTS ;
+ const workspaces = Object.fromEntries(BLENDER_WORKSPACE_IDS.map((id) => [id, workspace(id)])) as Record;
return {
workspaces,
context: {
diff --git a/web/tests/e2e/responsive-layout.spec.ts b/web/tests/e2e/responsive-layout.spec.ts
index f296c0e46..1e689a9ed 100644
--- a/web/tests/e2e/responsive-layout.spec.ts
+++ b/web/tests/e2e/responsive-layout.spec.ts
@@ -47,4 +47,41 @@ test.describe("M7-14 responsive layout", () => {
expect(report.rootScrollWidth, JSON.stringify(report)).toBeLessThanOrEqual(report.viewportWidth);
});
}
+
+ test("desktop mirrors Blender 5.2 Layout workspace regions", async ({ page }) => {
+ await page.setViewportSize({ width: 1440, height: 900 });
+ await page.goto("/");
+ await expect(page.getByTestId("engine-status")).toContainText("ready, open a .blend file", { timeout: 20_000 });
+
+ await expect(page.locator(".workspace-tab")).toHaveText([
+ "Layout", "Modeling", "Sculpting", "UV Editing", "Texture Paint", "Shading",
+ "Animation", "Rendering", "Compositing", "Geometry Nodes", "Scripting",
+ ]);
+ const geometry = await page.evaluate(() => {
+ const rect = (selector: string) => {
+ const bounds = document.querySelector(selector)?.getBoundingClientRect();
+ if (!bounds) throw new Error(`Missing ${selector}`);
+ return { x: bounds.x, y: bounds.y, width: bounds.width, height: bounds.height, bottom: bounds.bottom };
+ };
+ const propertyTabs = document.querySelector(".property-tabs");
+ return {
+ viewport: rect(".viewport-area"),
+ outliner: rect(".outliner-area"),
+ properties: rect(".properties-area"),
+ timeline: rect(".timeline-area"),
+ status: rect(".status-bar"),
+ propertyTabsDirection: propertyTabs ? getComputedStyle(propertyTabs).flexDirection : "missing",
+ };
+ });
+
+ expect(geometry.viewport.width / 1440).toBeGreaterThan(0.75);
+ expect(geometry.outliner.x).toBeCloseTo(geometry.viewport.width + 1, 0);
+ expect(geometry.outliner.height).toBeLessThan(geometry.properties.height);
+ expect(geometry.properties.bottom).toBeCloseTo(geometry.status.y, 0);
+ expect(geometry.timeline.x).toBe(0);
+ expect(geometry.timeline.width).toBeCloseTo(geometry.viewport.width, 0);
+ expect(geometry.timeline.height).toBeGreaterThanOrEqual(96);
+ expect(geometry.timeline.height).toBeLessThanOrEqual(120);
+ expect(geometry.propertyTabsDirection).toBe("column");
+ });
});