wangdequan/workinf_Blender_Wasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mes123456
2026-08-29 16:59:08 +08:00
parent 05f9bf1433
commit ee1dd8213f
47 changed files with 1910 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/protocol/animation-render-commands.ts
View File

@@ -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>);

6
web/protocol/scene-ir.ts
View File

@@ -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`);
}

1
web/protocol/web-engine-capabilities.ts
View File

@@ -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" },

1
web/protocol/web-engine.ts
View File

@@ -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 }

2
web/protocol/workbench-command-groups.ts
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", "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[]>);