feat(web): add scene hair display authoring
This commit is contained in:
BIN
web/app/public/vendor/blender/web_engine.wasm
vendored
BIN
web/app/public/vendor/blender/web_engine.wasm
vendored
Binary file not shown.
@@ -943,6 +943,7 @@ function Properties({ snapshot, selectedFaceIndices, selectedVertexIndices, grea
|
||||
{activeScene?.colorManagement ? <div className="property-section" data-testid="scene-color-management-workbench"><h3>Color Management</h3><output>{activeScene.colorManagement.displayDevice} · {activeScene.colorManagement.temperature?.toFixed(0) ?? "-"} K · Tint {activeScene.colorManagement.tint?.toFixed(2) ?? "-"}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneColorManagement(activeScene.id, { temperature: Math.min(20000, (activeScene.colorManagement!.temperature ?? 6500) + 250) }))}>升高色温</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneColorManagement(activeScene.id, { tint: Math.max(-100, Math.min(100, (activeScene.colorManagement!.tint ?? 0) + 1)) }))}>调整 Tint</button></div></div> : null}
|
||||
{activeScene?.imageFormatSettings ? <div className="property-section" data-testid="scene-image-format-workbench"><h3>Output Format</h3><output>{activeScene.imageFormatSettings.fileType} · {activeScene.imageFormatSettings.colorMode}-channel · {activeScene.imageFormatSettings.depth}-bit · Quality {activeScene.imageFormatSettings.quality}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneImageFormat(activeScene.id, { fileType: activeScene.imageFormatSettings!.fileType === "PNG" ? "OPEN_EXR" : "PNG" }))}>切换格式</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneImageFormat(activeScene.id, { colorMode: activeScene.imageFormatSettings!.colorMode === 32 ? 24 : 32 }))}>切换通道</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneImageFormat(activeScene.id, { quality: Math.min(100, activeScene.imageFormatSettings!.quality + 5) }))}>提高质量</button></div></div> : null}
|
||||
{activeScene?.motionBlurSettings ? <div className="property-section" data-testid="scene-motion-blur-workbench"><h3>Motion Blur</h3><output>{activeScene.motionBlurSettings.enabled ? "Enabled" : "Disabled"} · Shutter {activeScene.motionBlurSettings.shutter.toFixed(3)} · Position {activeScene.motionBlurSettings.position}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneMotionBlur(activeScene.id, { enabled: !activeScene.motionBlurSettings!.enabled }))}>{activeScene.motionBlurSettings.enabled ? "关闭运动模糊" : "启用运动模糊"}</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneMotionBlur(activeScene.id, { shutter: Math.min(10, activeScene.motionBlurSettings!.shutter + 0.05) }))}>增加快门</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneMotionBlur(activeScene.id, { position: ((activeScene.motionBlurSettings!.position + 1) % 3) as 0 | 1 | 2 }))}>切换位置</button></div></div> : null}
|
||||
{activeScene?.hairSettings ? <div className="property-section" data-testid="scene-hair-settings-workbench"><h3>Hair Display</h3><output>Type {activeScene.hairSettings.type} · Subdivisions {activeScene.hairSettings.subdivisions}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneHairSettings(activeScene.id, { type: ((activeScene.hairSettings!.type + 1) % 3) as 0 | 1 | 2 }))}>切换发丝类型</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneHairSettings(activeScene.id, { subdivisions: Math.min(32, activeScene.hairSettings!.subdivisions + 1) }))}>增加细分</button></div></div> : null}
|
||||
{activeScene?.renderSettings ? <div className="property-section" data-testid="scene-render-settings-workbench"><h3>Render Output</h3><output>{activeScene.renderSettings.resolutionX} × {activeScene.renderSettings.resolutionY} @ {activeScene.renderSettings.resolutionPercentage}%</output><output>Frames {activeScene.renderSettings.frameStart} - {activeScene.renderSettings.frameEnd} · {activeScene.renderSettings.outputPath}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneRenderSettings(activeScene.id, { resolutionX: Math.min(65536, activeScene.renderSettings!.resolutionX + 64), resolutionY: Math.min(65536, activeScene.renderSettings!.resolutionY + 64) }))}>增加分辨率</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneRenderSettings(activeScene.id, { resolutionPercentage: Math.min(1000, activeScene.renderSettings!.resolutionPercentage + 10) }))}>增加百分比</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneRenderSettings(activeScene.id, { frameEnd: Math.min(1000000, activeScene.renderSettings!.frameEnd + 1) }))}>延长帧范围</button></div></div> : null}
|
||||
{activeScene?.audioSettings ? <div className="property-section" data-testid="scene-audio-settings-workbench"><h3>Scene Audio</h3><output>Volume {activeScene.audioSettings.volume.toFixed(2)} · Speed {activeScene.audioSettings.speedOfSound.toFixed(1)} · Doppler {activeScene.audioSettings.dopplerFactor.toFixed(2)}</output><output>Distance model {activeScene.audioSettings.distanceModel} · {activeScene.audioSettings.muted ? "Muted" : "Audible"} · {activeScene.audioSettings.sync ? "Synced" : "Free"}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneAudioSettings(activeScene.id, { volume: Math.min(10, activeScene.audioSettings!.volume + 0.1) }))}>增加音量</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneAudioSettings(activeScene.id, { muted: !activeScene.audioSettings!.muted }))}>{activeScene.audioSettings.muted ? "取消静音" : "静音"}</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneAudioSettings(activeScene.id, { sync: !activeScene.audioSettings!.sync }))}>切换同步</button></div></div> : null}
|
||||
{activeScene?.unitSettings ? <div className="property-section" data-testid="scene-unit-settings-workbench"><h3>Scene Units</h3><output>System {activeScene.unitSettings.system} · Scale {activeScene.unitSettings.scaleLength.toFixed(4)} · Rotation {activeScene.unitSettings.rotationSystem}</output><output>Length {activeScene.unitSettings.lengthUnit} · Mass {activeScene.unitSettings.massUnit} · Time {activeScene.unitSettings.timeUnit}</output><div className="property-actions"><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneUnitSettings(activeScene.id, { system: activeScene.unitSettings!.system === 1 ? 2 : 1 }))}>切换单位系统</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneUnitSettings(activeScene.id, { scaleLength: Math.min(1000000, Math.max(0.000001, activeScene.unitSettings!.scaleLength || 1) * 1.1) }))}>调整单位缩放</button><button type="button" onClick={() => onCommand(animationRenderCommands.setSceneUnitSettings(activeScene.id, { rotationSystem: activeScene.unitSettings!.rotationSystem === 2 ? 0 : 2 }))}>切换旋转单位</button></div></div> : null}
|
||||
|
||||
BIN
web/app/src/vendor/blender/web_engine.wasm
vendored
BIN
web/app/src/vendor/blender/web_engine.wasm
vendored
Binary file not shown.
@@ -743,6 +743,14 @@ function assertFutureCapability(payload: Extract<WebEngineRequest["command"], {
|
||||
if (properties.position !== undefined && ![0, 1, 2].includes(properties.position)) throw report("RENDER_PROPERTY_INVALID", "Scene motion blur position is unsupported");
|
||||
return;
|
||||
}
|
||||
case "setSceneHairSettings": {
|
||||
const scene = currentSnapshot?.scenes.find((candidate) => candidate.id === payload.dataId);
|
||||
const properties = payload.properties;
|
||||
if (!scene || !validPropertyKeys(properties, ["type", "subdivisions"])) throw report("RENDER_PROPERTY_INVALID", "Scene hair target or properties are invalid");
|
||||
if (properties.type !== undefined && ![0, 1, 2].includes(properties.type)) throw report("RENDER_PROPERTY_INVALID", "Scene hair type is unsupported");
|
||||
if (properties.subdivisions !== undefined && (!Number.isSafeInteger(properties.subdivisions) || properties.subdivisions < 0 || properties.subdivisions > 32)) throw report("RENDER_PROPERTY_INVALID", "Scene hair subdivisions are outside the bounded range");
|
||||
return;
|
||||
}
|
||||
case "setGeometryNodeGraph": {
|
||||
const snapshot = currentSnapshot;
|
||||
const availableResourceIds = new Set([
|
||||
|
||||
@@ -71,4 +71,7 @@ export const animationRenderCommands = Object.freeze({
|
||||
setSceneMotionBlur(dataId: string, properties: AnimationCommand<"setSceneMotionBlur">["properties"]): AnimationCommand<"setSceneMotionBlur"> {
|
||||
return { type: "setSceneMotionBlur", dataId, properties: { ...properties } };
|
||||
},
|
||||
setSceneHairSettings(dataId: string, properties: AnimationCommand<"setSceneHairSettings">["properties"]): AnimationCommand<"setSceneHairSettings"> {
|
||||
return { type: "setSceneHairSettings", dataId, properties: { ...properties } };
|
||||
},
|
||||
} satisfies Record<string, (...args: never[]) => WebEngineEditCommand>);
|
||||
|
||||
@@ -576,6 +576,7 @@ export interface SceneIR {
|
||||
simplifySettings?: { subsurfViewport: number; subsurfRender: number; particlesViewport: number; particlesRender: number; volumes: number };
|
||||
imageFormatSettings?: { fileType: string; colorMode: number; depth: number; quality: number; compression: number; exrCodec: number };
|
||||
motionBlurSettings?: { enabled: boolean; shutter: number; position: number };
|
||||
hairSettings?: { type: number; subdivisions: number };
|
||||
compositorGraph?: CompositorGraphIR;
|
||||
compositorStatus?: "AVAILABLE" | "BLOCKED";
|
||||
sequencerTimeline?: SequencerTimelineIR;
|
||||
@@ -1621,6 +1622,11 @@ export function parseSceneSnapshotIR(value: unknown): SceneSnapshotIR {
|
||||
requireBoolean(scene.motionBlurSettings.enabled, `scenes[${index}].motionBlurSettings.enabled`);
|
||||
for (const field of ["shutter", "position"] as const) requireNumber(scene.motionBlurSettings[field], `scenes[${index}].motionBlurSettings.${field}`);
|
||||
}
|
||||
if (scene.hairSettings !== undefined) {
|
||||
if (!isRecord(scene.hairSettings)) throw new Error(`SceneIR.scenes[${index}].hairSettings must be an object`);
|
||||
requireNumber(scene.hairSettings.type, `scenes[${index}].hairSettings.type`);
|
||||
requireNumber(scene.hairSettings.subdivisions, `scenes[${index}].hairSettings.subdivisions`);
|
||||
}
|
||||
if (scene.compositorStatus !== undefined && !["AVAILABLE", "BLOCKED"].includes(scene.compositorStatus as string)) {
|
||||
throw new Error(`scenes[${index}].compositorStatus is invalid`);
|
||||
}
|
||||
|
||||
@@ -93,6 +93,7 @@ export const WEB_ENGINE_COMMAND_CAPABILITIES = {
|
||||
setSceneColorManagement: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
|
||||
setSceneImageFormat: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
|
||||
setSceneMotionBlur: { family: "CORE_SCENE_GRAPH", route: "MAIN_AUTHORITATIVE", implementation: "SOURCE_BACKED" },
|
||||
setSceneHairSettings: { 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" },
|
||||
|
||||
@@ -157,6 +157,7 @@ export type WebEngineEditCommand =
|
||||
| { type: "setSceneColorManagement"; dataId: string; properties: { displayDevice?: string; temperature?: number; tint?: number } }
|
||||
| { type: "setSceneImageFormat"; dataId: string; properties: { fileType?: "PNG" | "JPEG" | "OPEN_EXR" | "TIFF" | "WEBP"; colorMode?: number; depth?: number; quality?: number; compression?: number; exrCodec?: number } }
|
||||
| { type: "setSceneMotionBlur"; dataId: string; properties: { enabled?: boolean; shutter?: number; position?: 0 | 1 | 2 } }
|
||||
| { type: "setSceneHairSettings"; dataId: string; properties: { type?: 0 | 1 | 2; subdivisions?: 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 }
|
||||
|
||||
@@ -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", "setSceneViewLayerSettings", "setSceneCollectionSettings", "setSceneBorderSettings", "setSceneSimplifySettings", "setSceneColorManagement", "setSceneImageFormat", "setSceneMotionBlur"],
|
||||
RENDER: ["setCameraProperties", "setLightProperties", "setWorldProperties", "setSceneProperties", "setSceneRenderSettings", "setSceneAudioSettings", "setSceneUnitSettings", "setSceneTimelineSettings", "setScenePipelineSettings", "setSceneBindings", "setSceneViewLayerSettings", "setSceneCollectionSettings", "setSceneBorderSettings", "setSceneSimplifySettings", "setSceneColorManagement", "setSceneImageFormat", "setSceneMotionBlur", "setSceneHairSettings"],
|
||||
IO: ["importImage", "importVFont", "setMaterialImageNode"],
|
||||
} as const satisfies Record<string, readonly WebEngineCommandType[]>);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user