feat(web): add scene view layer authoring
Some checks failed
M6 deployable RC / quick (push) Has been cancelled
M6 deployable RC / chromium (push) Has been cancelled
M6 deployable RC / release (push) Has been cancelled

This commit is contained in:
mes123456
2026-08-29 13:50:23 +08:00
parent 27b1f77ffb
commit b8695839ac
47 changed files with 1959 additions and 40 deletions

Binary file not shown.

View File

@@ -946,6 +946,7 @@ function Properties({ snapshot, selectedFaceIndices, selectedVertexIndices, grea
{activeScene?.timelineSettings ? <div className="property-section" data-testid="scene-timeline-settings-workbench"><h3>Timeline Settings</h3><output>{activeScene.timelineSettings.fps} / {activeScene.timelineSettings.fpsBase.toFixed(3)} fps · Step {activeScene.timelineSettings.frameStep}</output><output>{activeScene.timelineSettings.usePreviewRange ? `Preview ${activeScene.timelineSettings.previewStart} - ${activeScene.timelineSettings.previewEnd}` : "Full frame range"}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneTimelineSettings(activeScene.id, { fps: Math.min(1000, activeScene.timelineSettings!.fps + 1) }))}>增加帧率</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneTimelineSettings(activeScene.id, { frameStep: Math.min(1000, activeScene.timelineSettings!.frameStep + 1) }))}>增加步进</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneTimelineSettings(activeScene.id, { usePreviewRange: !activeScene.timelineSettings!.usePreviewRange }))}>{activeScene.timelineSettings.usePreviewRange ? "关闭预览范围" : "启用预览范围"}</button></div></div> : null}
{activeScene?.pipelineSettings ? <div className="property-section" data-testid="scene-pipeline-settings-workbench"><h3>Render Pipeline</h3><output>{activeScene.pipelineSettings.useCompositor ? "Compositor" : "Direct"} · {activeScene.pipelineSettings.useSequencer ? "Sequencer" : "No Sequencer"}</output><output>{activeScene.pipelineSettings.saveOutput ? "Save output" : "Preview only"} · {activeScene.pipelineSettings.noOverwrite ? "No overwrite" : "Overwrite allowed"}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setScenePipelineSettings(activeScene.id, { useCompositor: !activeScene.pipelineSettings!.useCompositor }))}>切换 Compositor</button><button type="button" onClick={() => onCommand(animationRenderCommands.setScenePipelineSettings(activeScene.id, { useSequencer: !activeScene.pipelineSettings!.useSequencer }))}>切换 Sequencer</button><button type="button" onClick={() => onCommand(animationRenderCommands.setScenePipelineSettings(activeScene.id, { saveOutput: !activeScene.pipelineSettings!.saveOutput }))}>切换输出保存</button></div></div> : null}
{activeScene ? <div className="property-section" data-testid="scene-bindings-workbench"><h3>Scene Bindings</h3><output>Camera {activeScene.cameraObjectId ?? "None"} · World {activeScene.worldId ?? "None"}</output><div className="property-actions"><button type="button" disabled={!snapshot?.nodes.some((node) => node.id === activeScene.cameraObjectId && node.type === "CAMERA")} onClick={() => onCommand(animationRenderCommands.setSceneBindings(activeScene.id, { cameraObjectId: activeScene.cameraObjectId }))}>确认相机绑定</button><button type="button" disabled={!activeWorld} onClick={() => onCommand(animationRenderCommands.setSceneBindings(activeScene.id, { worldId: activeWorld?.id ?? null }))}>绑定当前世界</button></div></div> : null}
{activeScene?.viewLayers?.length ? <div className="property-section" data-testid="scene-view-layer-settings-workbench"><h3>View Layers</h3>{activeScene.viewLayers.map((layer) => <div key={layer.name}><output>{layer.name} · {layer.useRender ? "Render" : "Disabled"} · {layer.useFreestyle ? "Freestyle" : "No Freestyle"} · {layer.samples} samples</output><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneViewLayerSettings(activeScene.id, layer.name, { useRender: !layer.useRender }))}>切换渲染</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneViewLayerSettings(activeScene.id, layer.name, { samples: Math.min(1000000, layer.samples + 1) }))}>增加采样</button></div>)}</div> : null}
{activeFont ? <div className="property-section" data-testid="font-workbench"><h3>Font</h3><label>Text <textarea aria-label="Font body" value={fontBody} maxLength={65536} onChange={(event) => setFontBody(event.target.value)} /></label><div className="property-actions"><button type="button" disabled={fontBody === activeFont.text} onClick={() => onCommand(nonMeshGeometryCommands.setFontBody(activeFont.id, fontBody))}>Apply Text</button>{activeFont.fontProperties ? <button type="button" onClick={() => onCommand(nonMeshGeometryCommands.setFontProperties(activeFont.id, { extrude: Math.min(1000, activeFont.fontProperties!.extrude + 0.01) }))}>Increase Extrude</button> : null}</div><output>{activeFont.text?.length ?? 0} characters</output></div> : null}
{activeVolume ? <div className="property-section" data-testid="volume-workbench"><h3>Volume</h3><output>{activeVolume.sourcePath ?? "No source path"}</output><output>{activeVolume.volumeGrids?.length ?? 0} grids</output>{activeVolume.volumeProperties ? <><output>Density {activeVolume.volumeProperties.displayDensity.toFixed(3)} · Step {activeVolume.volumeProperties.stepSize.toFixed(4)}</output><div className="property-actions"><button type="button" onClick={() => onCommand(nonMeshGeometryCommands.setVolumeProperties(activeVolume.id, activeVolume.sourcePath ?? "", Math.min(1e6, activeVolume.volumeProperties!.displayDensity + 0.1), activeVolume.volumeProperties!.interpolation, activeVolume.volumeProperties!.stepSize))}>Increase Density</button><button type="button" onClick={() => onCommand(nonMeshGeometryCommands.setVolumeProperties(activeVolume.id, activeVolume.sourcePath ?? "", activeVolume.volumeProperties!.displayDensity, activeVolume.volumeProperties!.interpolation === "LINEAR" ? "NEAREST" : "LINEAR", activeVolume.volumeProperties!.stepSize))}>Toggle Interpolation</button></div></> : <output>Volume properties unavailable</output>}</div> : null}
{activeMetaball ? <div className="property-section" data-testid="metaball-workbench"><h3>Metaball</h3><output>{activeMetaball.elements?.length ?? 0} elements</output>{activeMetaball.elements?.length ? <div className="property-actions"><button type="button" onClick={() => onCommand(nonMeshGeometryCommands.setMetaballElements(activeMetaball.id, activeMetaball.elements!.map((element, index) => index === 0 ? { ...element, radius: Math.min(100000, element.radius + 0.05) } : element)))}>Increase Active Radius</button></div> : <output>No editable elements</output>}</div> : null}

Binary file not shown.

View File

@@ -675,6 +675,15 @@ function assertFutureCapability(payload: Extract<WebEngineRequest["command"], {
}
return;
}
case "setSceneViewLayerSettings": {
const scene = currentSnapshot?.scenes.find((candidate) => candidate.id === payload.dataId);
if (!scene || typeof payload.layerName !== "string" || payload.layerName.length === 0 || new TextEncoder().encode(payload.layerName).byteLength > 63) throw report("RENDER_PROPERTY_INVALID", "Scene view layer target is invalid");
const properties = payload.properties;
if (!validPropertyKeys(properties, ["useRender", "useFreestyle", "samples"])) throw report("RENDER_PROPERTY_INVALID", "Scene view layer properties are invalid");
for (const field of ["useRender", "useFreestyle"] as const) if (properties[field] !== undefined && typeof properties[field] !== "boolean") throw report("RENDER_PROPERTY_INVALID", `Scene view layer ${field} must be boolean`);
if (properties.samples !== undefined && (!Number.isSafeInteger(properties.samples) || properties.samples < 0 || properties.samples > 1000000)) throw report("RENDER_PROPERTY_INVALID", "Scene view layer samples are outside the bounded range");
return;
}
case "setGeometryNodeGraph": {
const snapshot = currentSnapshot;
const availableResourceIds = new Set([

View File

@@ -50,4 +50,7 @@ export const animationRenderCommands = Object.freeze({
setSceneBindings(dataId: string, properties: AnimationCommand<"setSceneBindings">["properties"]): AnimationCommand<"setSceneBindings"> {
return { type: "setSceneBindings", dataId, properties: { ...properties } };
},
setSceneViewLayerSettings(dataId: string, layerName: string, properties: AnimationCommand<"setSceneViewLayerSettings">["properties"]): AnimationCommand<"setSceneViewLayerSettings"> {
return { type: "setSceneViewLayerSettings", dataId, layerName, properties: { ...properties } };
},
} satisfies Record<string, (...args: never[]) => WebEngineEditCommand>);

View File

@@ -571,6 +571,7 @@ export interface SceneIR {
saveOutput: boolean;
alphaPremultiplied: boolean;
};
viewLayers?: Array<{ name: string; useRender: boolean; useFreestyle: boolean; samples: number }>;
compositorGraph?: CompositorGraphIR;
compositorStatus?: "AVAILABLE" | "BLOCKED";
sequencerTimeline?: SequencerTimelineIR;
@@ -1587,6 +1588,16 @@ export function parseSceneSnapshotIR(value: unknown): SceneSnapshotIR {
if (!isRecord(scene.pipelineSettings)) throw new Error(`SceneIR.scenes[${index}].pipelineSettings must be an object`);
for (const field of ["useCompositor", "useSequencer", "noOverwrite", "saveOutput", "alphaPremultiplied"] as const) requireBoolean(scene.pipelineSettings[field], `scenes[${index}].pipelineSettings.${field}`);
}
if (scene.viewLayers !== undefined) {
if (!Array.isArray(scene.viewLayers)) throw new Error(`SceneIR.scenes[${index}].viewLayers must be an array`);
for (const [layerIndex, layer] of scene.viewLayers.entries()) {
if (!isRecord(layer)) throw new Error(`SceneIR.scenes[${index}].viewLayers[${layerIndex}] must be an object`);
requireString(layer.name, `scenes[${index}].viewLayers[${layerIndex}].name`);
requireBoolean(layer.useRender, `scenes[${index}].viewLayers[${layerIndex}].useRender`);
requireBoolean(layer.useFreestyle, `scenes[${index}].viewLayers[${layerIndex}].useFreestyle`);
requireNumber(layer.samples, `scenes[${index}].viewLayers[${layerIndex}].samples`);
}
}
if (scene.compositorStatus !== undefined && !["AVAILABLE", "BLOCKED"].includes(scene.compositorStatus as string)) {
throw new Error(`scenes[${index}].compositorStatus is invalid`);
}

View File

@@ -86,6 +86,7 @@ export const WEB_ENGINE_COMMAND_CAPABILITIES = {
setSceneTimelineSettings: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
setScenePipelineSettings: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
setSceneBindings: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
setSceneViewLayerSettings: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
setMetaballElements: { family: "GEOMETRY", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
sculptStroke: { family: "SCULPT", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
setSculptMeshAttributes: { family: "SCULPT", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },

View File

@@ -150,6 +150,7 @@ export type WebEngineEditCommand =
| { type: "setSceneTimelineSettings"; dataId: string; properties: { fps?: number; fpsBase?: number; frameStep?: number; usePreviewRange?: boolean; previewStart?: number; previewEnd?: number } }
| { type: "setScenePipelineSettings"; dataId: string; properties: { useCompositor?: boolean; useSequencer?: boolean; noOverwrite?: boolean; saveOutput?: boolean; alphaPremultiplied?: boolean } }
| { type: "setSceneBindings"; dataId: string; properties: { cameraObjectId?: string | null; worldId?: string | null } }
| { type: "setSceneViewLayerSettings"; dataId: string; layerName: string; properties: { useRender?: boolean; useFreestyle?: boolean; samples?: number } }
| { type: "setMetaballElements"; dataId: string; elements: Array<{ type: number; position: [number, number, number]; radius: number; scale: [number, number, number] }> }
| { type: "sculptStroke"; stroke: SculptStrokeIR }
| { type: "setSculptMeshAttributes"; attributes: SculptMeshAttributesIR }

View File

@@ -4,7 +4,7 @@ export const WORKBENCH_COMMAND_GROUPS = Object.freeze({
OBJECT: ["createPrimitive", "duplicateObject", "deleteObject", "setObjectTransform", "setParent", "createCollection", "moveObjectToCollection", "renameId", "applyObjectTransform", "setObjectOrigin"],
MESH: ["meshEdit", "translateMeshVertices", "createUVMap", "setActiveUVMap", "unwrapUV", "setVertexColors", "setVertexWeights"],
ANIMATION: ["setFrame", "insertObjectKeyframe", "deleteObjectKeyframe", "setFCurveInterpolation", "setConstraint", "setNLAStack"],
RENDER: ["setCameraProperties", "setLightProperties", "setWorldProperties", "setSceneProperties", "setSceneRenderSettings", "setSceneAudioSettings", "setSceneUnitSettings", "setSceneTimelineSettings", "setScenePipelineSettings", "setSceneBindings"],
RENDER: ["setCameraProperties", "setLightProperties", "setWorldProperties", "setSceneProperties", "setSceneRenderSettings", "setSceneAudioSettings", "setSceneUnitSettings", "setSceneTimelineSettings", "setScenePipelineSettings", "setSceneBindings", "setSceneViewLayerSettings"],
IO: ["importImage", "importVFont", "setMaterialImageNode"],
} as const satisfies Record<string, readonly WebEngineCommandType[]>);