forked from blender/blender
Support group nodes #22
@ -81,8 +81,9 @@ void MaterialData::init()
|
|||||||
MaterialX::DocumentPtr doc = blender::nodes::materialx::export_to_materialx(
|
MaterialX::DocumentPtr doc = blender::nodes::materialx::export_to_materialx(
|
||||||
scene_delegate_->depsgraph, (Material *)id);
|
scene_delegate_->depsgraph, (Material *)id);
|
||||||
pxr::UsdMtlxRead(doc, stage);
|
pxr::UsdMtlxRead(doc, stage);
|
||||||
pxr::UsdMtlxReadNodeGraphs(doc, stage);
|
|
||||||
|
|
||||||
|
/* Logging stage: creating lambda stage_str() for not to call stage->ExportToString()
|
||||||
|
* if log doesn't execute. */
|
||||||
auto stage_str = [&stage]() {
|
auto stage_str = [&stage]() {
|
||||||
std::string str;
|
std::string str;
|
||||||
stage->ExportToString(&str);
|
stage->ExportToString(&str);
|
||||||
|
@ -20,29 +20,34 @@ NodeItem GroupNodeParser::compute()
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MaterialX::GraphElement *graph = graph_;
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
std::string name = MaterialX::createValidName(ngroup->id.name);
|
std::string name = MaterialX::createValidName(ngroup->id.name);
|
||||||
MaterialX::NodeGraphPtr group_graph = graph_->getChildOfType<MaterialX::NodeGraph>(name);
|
MaterialX::NodeGraphPtr group_graph = graph_->getChildOfType<MaterialX::NodeGraph>(name);
|
||||||
if (!group_graph) {
|
if (!group_graph) {
|
||||||
CLOG_INFO(LOG_MATERIALX_SHADER, 1, "<nodegraph name=%s>", name.c_str());
|
CLOG_INFO(LOG_MATERIALX_SHADER, 1, "<nodegraph name=%s>", name.c_str());
|
||||||
group_graph = graph_->addChild<MaterialX::NodeGraph>(name);
|
group_graph = graph_->addChild<MaterialX::NodeGraph>(name);
|
||||||
}
|
}
|
||||||
|
graph = group_graph.get();
|
||||||
|
#endif
|
||||||
|
|
||||||
NodeItem out = GroupOutputNodeParser(group_graph.get(),
|
NodeItem out =
|
||||||
depsgraph_,
|
GroupOutputNodeParser(
|
||||||
material_,
|
graph, depsgraph_, material_, node_out, socket_out_, NodeItem::Type::Any, this)
|
||||||
node_out,
|
.compute_full();
|
||||||
socket_out_,
|
|
||||||
NodeItem::Type::Any,
|
|
||||||
this)
|
|
||||||
.compute_full();
|
|
||||||
|
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
/* We have to be in NodeParser's graph_, therefore copying output */
|
/* We have to be in NodeParser's graph_, therefore copying output */
|
||||||
res.output = out.output;
|
res.output = out.output;
|
||||||
|
#else
|
||||||
|
res = out;
|
||||||
|
#endif
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeItem GroupOutputNodeParser::compute()
|
NodeItem GroupOutputNodeParser::compute()
|
||||||
{
|
{
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
Vector<NodeItem> values;
|
Vector<NodeItem> values;
|
||||||
for (auto socket_in : node_->input_sockets()) {
|
for (auto socket_in : node_->input_sockets()) {
|
||||||
NodeItem value = get_input_value(socket_in->index(), NodeItem::Type::Any);
|
NodeItem value = get_input_value(socket_in->index(), NodeItem::Type::Any);
|
||||||
@ -59,12 +64,15 @@ NodeItem GroupOutputNodeParser::compute()
|
|||||||
outputs.append(create_output("output" + std::to_string(i + 1), values[i]));
|
outputs.append(create_output("output" + std::to_string(i + 1), values[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return outputs[socket_out_->index()];
|
return outputs[socket_out_->index()];
|
||||||
|
#else
|
||||||
|
return get_input_value(socket_out_->index(), NodeItem::Type::Any);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeItem GroupOutputNodeParser::compute_full()
|
NodeItem GroupOutputNodeParser::compute_full()
|
||||||
{
|
{
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
NodeItem res = empty();
|
NodeItem res = empty();
|
||||||
|
|
||||||
/* Checking if output was already computed */
|
/* Checking if output was already computed */
|
||||||
@ -82,22 +90,29 @@ NodeItem GroupOutputNodeParser::compute_full()
|
|||||||
|
|
||||||
res = compute();
|
res = compute();
|
||||||
return res;
|
return res;
|
||||||
|
#else
|
||||||
|
return NodeParser::compute_full();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeItem GroupInputNodeParser::compute()
|
NodeItem GroupInputNodeParser::compute()
|
||||||
{
|
{
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
NodeItem value = group_parser_->get_input_value(socket_out_->index(), to_type_);
|
NodeItem value = group_parser_->get_input_value(socket_out_->index(), to_type_);
|
||||||
if (value.value) {
|
if (value.value) {
|
||||||
NodeItem constant = create_node("constant", value.type());
|
NodeItem constant = create_node("constant", value.type());
|
||||||
constant.set_input("value", value);
|
constant.set_input("value", value);
|
||||||
value = constant;
|
value = constant;
|
||||||
}
|
}
|
||||||
|
|
||||||
return create_input("input" + std::to_string(socket_out_->index() + 1), value);
|
return create_input("input" + std::to_string(socket_out_->index() + 1), value);
|
||||||
|
#else
|
||||||
|
return group_parser_->get_input_value(socket_out_->index(), to_type_);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeItem GroupInputNodeParser::compute_full()
|
NodeItem GroupInputNodeParser::compute_full()
|
||||||
{
|
{
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
NodeItem res = empty();
|
NodeItem res = empty();
|
||||||
|
|
||||||
/* Checking if output was already computed */
|
/* Checking if output was already computed */
|
||||||
@ -115,6 +130,9 @@ NodeItem GroupInputNodeParser::compute_full()
|
|||||||
|
|
||||||
res = compute();
|
res = compute();
|
||||||
return res;
|
return res;
|
||||||
|
#else
|
||||||
|
return NodeParser::compute_full();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace blender::nodes::materialx
|
} // namespace blender::nodes::materialx
|
||||||
|
@ -6,11 +6,16 @@
|
|||||||
|
|
||||||
#include "node_parser.h"
|
#include "node_parser.h"
|
||||||
|
|
||||||
|
/* TODO: pxr::UsdMtlxRead() doesn't perform nodegraphs.
|
||||||
|
* Uncomment USE_MATERIALX_NODEGRAPH after fixing it. */
|
||||||
|
/* #define USE_MATERIALX_NODEGRAPH */
|
||||||
|
|
||||||
namespace blender::nodes::materialx {
|
namespace blender::nodes::materialx {
|
||||||
|
|
||||||
class GroupInputNodeParser;
|
class GroupInputNodeParser;
|
||||||
|
|
||||||
class GroupNodeParser : public NodeParser {
|
class GroupNodeParser : public NodeParser {
|
||||||
|
friend NodeParser;
|
||||||
friend GroupInputNodeParser;
|
friend GroupInputNodeParser;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -67,7 +67,18 @@ std::string NodeParser::node_name() const
|
|||||||
if (ELEM(to_type_, NodeItem::Type::BSDF, NodeItem::Type::EDF)) {
|
if (ELEM(to_type_, NodeItem::Type::BSDF, NodeItem::Type::EDF)) {
|
||||||
name += "_" + NodeItem::type(to_type_);
|
name += "_" + NodeItem::type(to_type_);
|
||||||
}
|
}
|
||||||
|
#ifdef USE_MATERIALX_NODEGRAPH
|
||||||
return MaterialX::createValidName(name);
|
return MaterialX::createValidName(name);
|
||||||
|
#else
|
||||||
|
std::string prefix;
|
||||||
|
GroupNodeParser *gr = group_parser_;
|
||||||
|
while (gr) {
|
||||||
|
const bNodeTree *ngroup = reinterpret_cast<const bNodeTree *>(gr->node_->id);
|
||||||
|
prefix = MaterialX::createValidName(ngroup->id.name) + "_" + prefix;
|
||||||
|
gr = gr->group_parser_;
|
||||||
|
}
|
||||||
|
return prefix + MaterialX::createValidName(name);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
NodeItem NodeParser::create_node(const std::string &category, NodeItem::Type type)
|
NodeItem NodeParser::create_node(const std::string &category, NodeItem::Type type)
|
||||||
|
Loading…
Reference in New Issue
Block a user