feat(web): add compositor execution 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 19:35:30 +08:00
parent ee1dd8213f
commit 085632b3a9
47 changed files with 1909 additions and 38 deletions

View File

@@ -1592,7 +1592,7 @@ EMSCRIPTEN_KEEPALIVE int web_engine_apply_command(const int handle,
type == "insertGreasePencilFrame" || type == "removeGreasePencilFrame" ||
type == "setGreasePencilStrokes" || type == "setVertexColors" ||
type == "setVertexWeights" || type == "setCameraProperties" || type == "setLightProperties" ||
type == "setWorldProperties" || type == "setSceneProperties" || type == "setSceneRenderSettings" || type == "setSceneAudioSettings" || type == "setSceneUnitSettings" || type == "setSceneTimelineSettings" || type == "setScenePipelineSettings" || type == "setSceneBindings" || type == "setSceneViewLayerSettings" || type == "setSceneCollectionSettings" || type == "setSceneBorderSettings" || type == "setSceneSimplifySettings" || type == "setSceneColorManagement" || type == "setSceneImageFormat" || type == "setSceneMotionBlur" || type == "setSceneHairSettings" ||
type == "setWorldProperties" || type == "setSceneProperties" || type == "setSceneRenderSettings" || type == "setSceneAudioSettings" || type == "setSceneUnitSettings" || type == "setSceneTimelineSettings" || type == "setScenePipelineSettings" || type == "setSceneBindings" || type == "setSceneViewLayerSettings" || type == "setSceneCollectionSettings" || type == "setSceneBorderSettings" || type == "setSceneSimplifySettings" || type == "setSceneColorManagement" || type == "setSceneImageFormat" || type == "setSceneMotionBlur" || type == "setSceneHairSettings" || type == "setSceneCompositorSettings" ||
type == "setSculptMeshAttributes" ||
type == "sculptStroke") {
if (!engine->authoritative_commands || engine->authoritative_main == nullptr) {
@@ -2196,7 +2196,7 @@ EMSCRIPTEN_KEEPALIVE int web_engine_apply_command(const int handle,
command.value("normalize", false), command.value("limit", 0u), command.value("mirror", false),
command.value("mirrorAxis", 0), command.value("mirrorTolerance", 1e-4f), main_error);
}
else if (type == "setCameraProperties" || type == "setLightProperties" || type == "setWorldProperties" || type == "setSceneProperties" || type == "setSceneRenderSettings" || type == "setSceneAudioSettings" || type == "setSceneUnitSettings" || type == "setSceneTimelineSettings" || type == "setScenePipelineSettings" || type == "setSceneBindings" || type == "setSceneViewLayerSettings" || type == "setSceneCollectionSettings" || type == "setSceneBorderSettings" || type == "setSceneSimplifySettings" || type == "setSceneColorManagement" || type == "setSceneImageFormat" || type == "setSceneMotionBlur" || type == "setSceneHairSettings")
else if (type == "setCameraProperties" || type == "setLightProperties" || type == "setWorldProperties" || type == "setSceneProperties" || type == "setSceneRenderSettings" || type == "setSceneAudioSettings" || type == "setSceneUnitSettings" || type == "setSceneTimelineSettings" || type == "setScenePipelineSettings" || type == "setSceneBindings" || type == "setSceneViewLayerSettings" || type == "setSceneCollectionSettings" || type == "setSceneBorderSettings" || type == "setSceneSimplifySettings" || type == "setSceneColorManagement" || type == "setSceneImageFormat" || type == "setSceneMotionBlur" || type == "setSceneHairSettings" || type == "setSceneCompositorSettings")
{
const json properties = command.value("properties", json::object());
if (type == "setSceneProperties") {
@@ -2275,6 +2275,11 @@ EMSCRIPTEN_KEEPALIVE int web_engine_apply_command(const int handle,
engine->authoritative_main, command.value("dataId", "").c_str(),
properties.dump().c_str(), main_error);
}
else if (type == "setSceneCompositorSettings") {
applied = web_engine_blend_main_set_scene_compositor_settings(
engine->authoritative_main, command.value("dataId", "").c_str(),
properties.dump().c_str(), main_error);
}
else {
applied = web_engine_blend_main_set_render_properties(
engine->authoritative_main, command.value("dataId", "").c_str(),

View File

@@ -5276,6 +5276,11 @@ json scene_ir_from_blend(const ParsedBlend &blend,
{"position", read_integer(*blend.sdna, *render, "motion_blur_position").value_or(SCE_MB_CENTER)}};
scene["hairSettings"] = {{"type", read_integer(*blend.sdna, *render, "hair_type").value_or(SCE_HAIR_SHAPE_STRAND)},
{"subdivisions", read_integer(*blend.sdna, *render, "hair_subdiv").value_or(0)}};
scene["compositorSettings"] = {{"device", read_integer(*blend.sdna, *render, "compositor_device").value_or(SCE_COMPOSITOR_DEVICE_GPU)},
{"precision", read_integer(*blend.sdna, *render, "compositor_precision").value_or(SCE_COMPOSITOR_PRECISION_AUTO)},
{"denoiseDevice", read_integer(*blend.sdna, *render, "compositor_denoise_device").value_or(SCE_COMPOSITOR_DENOISE_DEVICE_AUTO)},
{"previewQuality", read_integer(*blend.sdna, *render, "compositor_denoise_preview_quality").value_or(SCE_COMPOSITOR_DENOISE_BALANCED)},
{"finalQuality", read_integer(*blend.sdna, *render, "compositor_denoise_final_quality").value_or(SCE_COMPOSITOR_DENOISE_HIGH)}};
scene["timelineSettings"] = {{"fps", read_integer(*blend.sdna, *render, "frs_sec").value_or(24)},
{"fpsBase", read_float(*blend.sdna, *render, "frs_sec_base").value_or(1.0f)},
{"frameStep", read_integer(*blend.sdna, *render, "frame_step").value_or(1)},

View File

@@ -10,6 +10,7 @@
#include <new>
#include <string_view>
#include <tuple>
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
@@ -6495,6 +6496,30 @@ bool web_engine_blend_main_set_scene_hair_settings(WebBlendMainState *state,
return true;
}
bool web_engine_blend_main_set_scene_compositor_settings(WebBlendMainState *state,
const char *target_id,
const char *properties_json,
std::string &error)
{
if (state == nullptr || state->main == nullptr || target_id == nullptr || properties_json == nullptr) { error = "RENDER_PROPERTY_INVALID: scene compositor target is missing"; return false; }
Scene *scene = find_scene(state->main, target_id);
if (scene == nullptr || scene->id.lib != nullptr) { error = "LINKED_DATA_MUTATION_BLOCKED: Scene is not editable"; return false; }
const json properties = json::parse(properties_json, nullptr, false);
if (!properties.is_object() || properties.empty()) { error = "RENDER_PROPERTY_INVALID: scene compositor settings must be a non-empty object"; return false; }
const std::unordered_set<std::string> allowed = {"device", "precision", "denoiseDevice", "previewQuality", "finalQuality"};
for (const auto &[key, value] : properties.items()) { (void)value; if (!allowed.contains(key)) { error = "RENDER_PROPERTY_INVALID: unsupported compositor property " + key; return false; } }
auto read_enum = [&](const char *key, int minimum, int maximum, auto &target) {
if (!properties.contains(key)) return true;
if (!properties[key].is_number_integer()) { error = std::string("RENDER_PROPERTY_INVALID: ") + key + " must be an integer"; return false; }
const int value = properties[key].get<int>();
if (value < minimum || value > maximum) { error = std::string("RENDER_PROPERTY_INVALID: ") + key + " is outside the bounded enum range"; return false; }
target = static_cast<std::remove_reference_t<decltype(target)>>(value); return true;
};
if (!read_enum("device", 0, 1, scene->r.compositor_device) || !read_enum("precision", 0, 1, scene->r.compositor_precision) || !read_enum("denoiseDevice", 0, 2, scene->r.compositor_denoise_device) || !read_enum("previewQuality", 0, 2, scene->r.compositor_denoise_preview_quality) || !read_enum("finalQuality", 0, 2, scene->r.compositor_denoise_final_quality)) return false;
scene->id.recalc |= ID_RECALC_PARAMETERS;
return true;
}
bool web_engine_blend_main_write(WebBlendMainState *state,
std::vector<uint8_t> &bytes,
std::string &error)

View File

@@ -579,6 +579,10 @@ bool web_engine_blend_main_set_scene_hair_settings(WebBlendMainState *state,
const char *target_id,
const char *properties_json,
std::string &error);
bool web_engine_blend_main_set_scene_compositor_settings(WebBlendMainState *state,
const char *target_id,
const char *properties_json,
std::string &error);
bool web_engine_blend_main_write(WebBlendMainState *state,
std::vector<uint8_t> &bytes,
std::string &error);