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

9
blender-5.2.0/source/blender/web_engine/web_engine_api.cpp
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 == "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 == "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")
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")
{
const json properties = command.value("properties", json::object());
if (type == "setSceneProperties") {
@@ -2270,6 +2270,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 == "setSceneHairSettings") {
applied = web_engine_blend_main_set_scene_hair_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(),

2
blender-5.2.0/source/blender/web_engine/web_engine_blend_reader.cpp
View File

@@ -5274,6 +5274,8 @@ json scene_ir_from_blend(const ParsedBlend &blend,
scene["motionBlurSettings"] = {{"enabled", (render_mode & R_MBLUR) != 0},
{"shutter", read_float(*blend.sdna, *render, "motion_blur_shutter").value_or(0.5f)},
{"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["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)},

28
blender-5.2.0/source/blender/web_engine/web_engine_main_state.cpp
View File

@@ -6467,6 +6467,34 @@ bool web_engine_blend_main_set_scene_motion_blur(WebBlendMainState *state,
return true;
}
bool web_engine_blend_main_set_scene_hair_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 hair 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 hair settings must be a non-empty object"; return false; }
const std::unordered_set<std::string> allowed = {"type", "subdivisions"};
for (const auto &[key, value] : properties.items()) { (void)value; if (!allowed.contains(key)) { error = "RENDER_PROPERTY_INVALID: unsupported hair property " + key; return false; } }
if (properties.contains("type")) {
if (!properties["type"].is_number_integer()) { error = "RENDER_PROPERTY_INVALID: hair type must be an integer"; return false; }
const int value = properties["type"].get<int>();
if (value < SCE_HAIR_SHAPE_STRAND || value > SCE_HAIR_SHAPE_CYLINDER) { error = "RENDER_PROPERTY_INVALID: hair type is unsupported"; return false; }
scene->r.hair_type = eHairType(value);
}
if (properties.contains("subdivisions")) {
if (!properties["subdivisions"].is_number_integer()) { error = "RENDER_PROPERTY_INVALID: hair subdivisions must be an integer"; return false; }
const int value = properties["subdivisions"].get<int>();
if (value < 0 || value > 32) { error = "RENDER_PROPERTY_INVALID: hair subdivisions are outside the bounded range"; return false; }
scene->r.hair_subdiv = short(value);
}
scene->id.recalc |= ID_RECALC_PARAMETERS;
return true;
}
bool web_engine_blend_main_write(WebBlendMainState *state,
std::vector<uint8_t> &bytes,
std::string &error)

4
blender-5.2.0/source/blender/web_engine/web_engine_main_state.h
View File

@@ -575,6 +575,10 @@ bool web_engine_blend_main_set_scene_motion_blur(WebBlendMainState *state,
const char *target_id,
const char *properties_json,
std::string &error);
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_write(WebBlendMainState *state,
std::vector<uint8_t> &bytes,
std::string &error);