MaterialX: Implement more shader nodes #23

Merged
Bogdan Nagirniak merged 4 commits from matx-add-other-shader-nodes into matx-export-material 2023-09-15 20:11:01 +02:00
4 changed files with 42 additions and 7 deletions
Showing only changes of commit 05d7a277d8 - Show all commits

View File

@ -13,6 +13,9 @@ NodeItem::NodeItem(MaterialX::GraphElement *graph) : graph_(graph) {}
NodeItem::Type NodeItem::type(const std::string &type_str) NodeItem::Type NodeItem::type(const std::string &type_str)
{ {
if (type_str == "multioutput") {
return Type::Multioutput;
}
if (type_str == "string") { if (type_str == "string") {
return Type::String; return Type::String;
} }
@ -64,6 +67,8 @@ std::string NodeItem::type(Type type)
switch (type) { switch (type) {
case Type::Any: case Type::Any:
return ""; return "";
case Type::Multioutput:
return "multioutput";
case Type::String: case Type::String:
return "string"; return "string";
case Type::Filename: case Type::Filename:

View File

@ -16,7 +16,7 @@ class NodeItem {
enum class Type { enum class Type {
Any = 0, Any = 0,
Empty, Empty,
Multioutput,
/* Value types */ /* Value types */
String, String,
Filename, Filename,

View File

@ -62,19 +62,13 @@ NODE_SHADER_MATERIALX_BEGIN
} }
res.set_input("base_color", color); res.set_input("base_color", color);
res.set_input("diffuse_roughness", roughness); res.set_input("diffuse_roughness", roughness);
res.set_input("metalness", val(0.0f));
res.set_input("specular", val(0.5f)); res.set_input("specular", val(0.5f));
res.set_input("specular_color", color); res.set_input("specular_color", color);
res.set_input("specular_roughness", roughness); res.set_input("specular_roughness", roughness);
res.set_input("specular_IOR", ior); res.set_input("specular_IOR", ior);
res.set_input("specular_anisotropy", val(0.0f));
res.set_input("specular_rotation", val(0.0f));
res.set_input("transmission", val(1.0f)); res.set_input("transmission", val(1.0f));
res.set_input("transmission_color", color); res.set_input("transmission_color", color);
res.set_input("transmission_depth", val(10.0f)); res.set_input("transmission_depth", val(10.0f));
res.set_input("transmission_scatter_anisotropy", val(0.0f));
res.set_input("transmission_dispersion", val(0.0f));
res.set_input("transmission_extra_roughness", val(0.0f));
return res; return res;
} }

View File

@ -56,6 +56,41 @@ static int node_shader_gpu_bsdf_glossy(GPUMaterial *mat,
return GPU_stack_link(mat, node, "node_bsdf_glossy", in, out, GPU_constant(&use_multi_scatter)); return GPU_stack_link(mat, node, "node_bsdf_glossy", in, out, GPU_constant(&use_multi_scatter));
} }
NODE_SHADER_MATERIALX_BEGIN
#ifdef WITH_MATERIALX
{
if (to_type_ != NodeItem::Type::BSDF) {
return empty();
}
NodeItem color = get_input_value("Color", NodeItem::Type::Color3);
NodeItem roughness = get_input_value("Roughness", NodeItem::Type::Vector2);
NodeItem anisotropy = get_input_value("Anisotropy", NodeItem::Type::Color3);
NodeItem normal = get_input_link("Normal", NodeItem::Type::Vector3);
NodeItem tangent = get_input_link("Tangent", NodeItem::Type::Vector3);
NodeItem artistic_ior = create_node("artistic_ior", NodeItem::Type::Multioutput);
artistic_ior.add_output("ior", NodeItem::Type::Color3);
artistic_ior.add_output("extinction", NodeItem::Type::Color3);
artistic_ior.set_input("reflectivity", color);
artistic_ior.set_input("edge_color", color);
NodeItem res = create_node("conductor_bsdf", NodeItem::Type::BSDF);
if (normal) {
res.set_input("normal", normal);
}
if (tangent) {
res.set_input("tangent", tangent);
}
res.set_input_output("ior", artistic_ior, "ior");
res.set_input_output("extinction", artistic_ior, "extinction");
res.set_input("roughness", roughness);
return res;
}
#endif
NODE_SHADER_MATERIALX_END
} // namespace blender::nodes::node_shader_bsdf_glossy_cc } // namespace blender::nodes::node_shader_bsdf_glossy_cc
/* node type definition */ /* node type definition */
@ -72,6 +107,7 @@ void register_node_type_sh_bsdf_glossy()
blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE); blender::bke::node_type_size_preset(&ntype, blender::bke::eNodeSizePreset::MIDDLE);
ntype.initfunc = file_ns::node_shader_init_glossy; ntype.initfunc = file_ns::node_shader_init_glossy;
ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_glossy; ntype.gpu_fn = file_ns::node_shader_gpu_bsdf_glossy;
ntype.materialx_fn = file_ns::node_shader_materialx;
nodeRegisterType(&ntype); nodeRegisterType(&ntype);