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

MaterialX: add convert nodes #15

Merged
Bogdan Nagirniak merged 8 commits from matx-add-convert-nodes into matx-export-material 2023-09-08 16:55:00 +02:00
Conversation 0 Commits 8 Files Changed 9 +17 -9
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33d2cfc8b0 - Show all commits

12
source/blender/nodes/shader/materialx/nodes/blackbody.cc
View File

@ -8,11 +8,15 @@ namespace blender::nodes::materialx {
NodeItem BlackbodyNodeParser::compute() NodeItem BlackbodyNodeParser::compute()
{ {
NodeItem temperature = get_input_value("Temperature", NodeItem::Type::Float); /* This node doesn't have an implementation in MaterialX 1.38.6.
* It's added in MaterialX 1.38.8. Uncomment this code after switching to 1.38.8.
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-09-07 19:48:26 +02:00
Outdated
Review
Copy Link

It is exists in pbrlib_def.mtlx, can be used here

It is exists in pbrlib_def.mtlx, can be used here
*
* NodeItem temperature = get_input_value("Temperature", NodeItem::Type::Float);
NodeItem res = create_node("blackbody", NodeItem::Type::Color3); * NodeItem res = create_node("blackbody", NodeItem::Type::Color3);
res.set_input("temperature", temperature); * res.set_input("temperature", temperature);
return res; * return res; */
return empty();
} }
} // namespace blender::nodes::materialx } // namespace blender::nodes::materialx

12
source/blender/nodes/shader/materialx/nodes/clamp.cc
View File

@ -13,11 +13,15 @@ NodeItem ClampNodeParser::compute()
NodeItem min = get_input_value("Min", NodeItem::Type::Float); NodeItem min = get_input_value("Min", NodeItem::Type::Float);
NodeItem max = get_input_value("Max", NodeItem::Type::Float); NodeItem max = get_input_value("Max", NodeItem::Type::Float);
if (type == NODE_CLAMP_MINMAX) { NodeItem res = empty();
min = min.if_else(NodeItem::CompareOp::Greater, max, max, min); if (type == NODE_CLAMP_RANGE) {
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-09-07 19:49:03 +02:00
Outdated
Review
Copy Link

min = min.min(max)

`min = min.min(max)`
res = min.if_else(
NodeItem::CompareOp::Less, max, value.clamp(min, max), value.clamp(max, min));
BogdanNagirniak marked this conversation as resolved Outdated
Bogdan Nagirniak commented 2023-09-07 20:00:08 +02:00
Outdated
Review
Copy Link

does it correctly work with RANGE? do we need swap min max if min > max?

does it correctly work with RANGE? do we need swap min max if min > max?
} }
else {
return value.clamp(min, max); res = value.clamp(min, max);
}
return res;
} }
} // namespace blender::nodes::materialx } // namespace blender::nodes::materialx

2
source/blender/nodes/shader/materialx/nodes/rgb_to_bw.cc
View File

@ -12,7 +12,7 @@ NodeItem RGBToBWNodeParser::compute()
NodeItem res = create_node("luminance", NodeItem::Type::Color4); NodeItem res = create_node("luminance", NodeItem::Type::Color4);
res.set_input("in", color); res.set_input("in", color);
return res; return res;
} }
} // namespace blender::nodes::materialx } // namespace blender::nodes::materialx