DagerD/blender
1
1
Fork 0
forked from blender/blender
Code Pull Requests Activity

MaterialX: code improvements #34

Merged
Bogdan Nagirniak merged 2 commits from matx-nodes-polishing into matx-export-material 2023-09-26 07:29:05 +02:00
Conversation 0 Commits 2 Files Changed 10 +36 -34
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dd8e7c2a9 - Show all commits

8
source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
View File

@ -319,7 +319,7 @@ NODE_SHADER_MATERIALX_BEGIN
{"base_color", get_input_value("Base Color", NodeItem::Type::Color3)}, {"base_color", get_input_value("Base Color", NodeItem::Type::Color3)},
{"subsurface", get_input_value("Subsurface", NodeItem::Type::Float)}, {"subsurface", get_input_value("Subsurface", NodeItem::Type::Float)},
{"subsurface_scale", get_input_value("Subsurface Scale", NodeItem::Type::Float)}, {"subsurface_scale", get_input_value("Subsurface Scale", NodeItem::Type::Float)},
{"subsurface_radius", get_input_value("Subsurface Radius", NodeItem::Type::Color3)}, {"subsurface_radius", get_input_value("Subsurface Radius", NodeItem::Type::Vector3)},
//{"subsurface_ior", get_input_value("Subsurface IOR", NodeItem::Type::Vector3)}, //{"subsurface_ior", get_input_value("Subsurface IOR", NodeItem::Type::Vector3)},
{"subsurface_anisotropy", get_input_value("Subsurface Anisotropy", NodeItem::Type::Float)}, {"subsurface_anisotropy", get_input_value("Subsurface Anisotropy", NodeItem::Type::Float)},
{"metallic", get_input_value("Metallic", NodeItem::Type::Float)}, {"metallic", get_input_value("Metallic", NodeItem::Type::Float)},
@ -525,7 +525,8 @@ NODE_SHADER_MATERIALX_BEGIN
NodeItem anisotropic = in["anisotropic"]; NodeItem anisotropic = in["anisotropic"];
NodeItem rotation = in["anisotropic_rotation"]; NodeItem rotation = in["anisotropic_rotation"];
res = create_node("standard_surface", res = create_node(
"standard_surface",
NodeItem::Type::SurfaceShader, NodeItem::Type::SurfaceShader,
{{"base", val(1.0f)}, {{"base", val(1.0f)},
{"base_color", base_color}, {"base_color", base_color},
@ -542,7 +543,8 @@ NODE_SHADER_MATERIALX_BEGIN
{"transmission_extra_roughness", roughness}, {"transmission_extra_roughness", roughness},
{"subsurface", in["subsurface"]}, {"subsurface", in["subsurface"]},
{"subsurface_color", base_color}, {"subsurface_color", base_color},
{"subsurface_radius", in["subsurface_radius"] * in["subsurface_scale"]}, {"subsurface_radius",
(in["subsurface_radius"] * in["subsurface_scale"]).convert(NodeItem::Type::Color3)},
{"subsurface_anisotropy", in["subsurface_anisotropy"]}, {"subsurface_anisotropy", in["subsurface_anisotropy"]},
{"sheen", in["sheen"]}, {"sheen", in["sheen"]},
{"sheen_color", in["sheen_tint"]}, {"sheen_color", in["sheen_tint"]},