forked from blender/blender
Support group nodes #22
@ -24,24 +24,19 @@ NodeItem GroupNodeParser::compute()
|
||||
group_graph = graph_->addChild<MaterialX::NodeGraph>(name);
|
||||
}
|
||||
|
||||
GroupOutputNodeParser parser(
|
||||
group_graph.get(), depsgraph_, material_, node_out, socket_out_, NodeItem::Type::Any);
|
||||
NodeItem out = parser.compute_full();
|
||||
res.node = group_graph;
|
||||
if (parser.output) {
|
||||
res = create_node("constant", out.type());
|
||||
res.set_input("value", parser.output);
|
||||
}
|
||||
NodeItem out =
|
||||
GroupOutputNodeParser(
|
||||
group_graph.get(), depsgraph_, material_, node_out, socket_out_, NodeItem::Type::Any)
|
||||
.compute_full();
|
||||
res.output = out.output;
|
||||
return res;
|
||||
}
|
||||
|
||||
NodeItem GroupOutputNodeParser::compute()
|
||||
{
|
||||
NodeItem res = get_input_link(socket_out_->index(), to_type_);
|
||||
if (res) {
|
||||
output = graph_->addOutput(MaterialX::EMPTY_STRING, NodeItem::type(res.type()));
|
||||
output->setValue(1.0f);
|
||||
}
|
||||
NodeItem value = get_input_link(socket_out_->index(), to_type_);
|
||||
NodeItem res = create_output();
|
||||
res.set_output(value);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
@ -15,9 +15,6 @@ class GroupNodeParser : public NodeParser {
|
||||
};
|
||||
|
||||
class GroupOutputNodeParser : public NodeParser {
|
||||
public:
|
||||
MaterialX::OutputPtr output;
|
||||
|
||||
public:
|
||||
using NodeParser::NodeParser;
|
||||
NodeItem compute() override;
|
||||
|
@ -98,9 +98,14 @@ std::string NodeItem::type(Type type)
|
||||
return "";
|
||||
}
|
||||
|
||||
bool NodeItem::is_arithmetic(Type type)
|
||||
{
|
||||
return type >= Type::Float && type <= Type::Color4;
|
||||
}
|
||||
|
||||
NodeItem::operator bool() const
|
||||
{
|
||||
return value || node;
|
||||
return value || node || output;
|
||||
}
|
||||
|
||||
NodeItem NodeItem::operator+(const NodeItem &other) const
|
||||
@ -619,6 +624,9 @@ NodeItem::Type NodeItem::type() const
|
||||
if (node) {
|
||||
return type(node->getType());
|
||||
}
|
||||
if (output) {
|
||||
return type(output->getType());
|
||||
}
|
||||
return Type::Empty;
|
||||
}
|
||||
|
||||
@ -670,32 +678,75 @@ void NodeItem::set_input(const std::string &in_name, const NodeItem &item)
|
||||
else if (item.node) {
|
||||
node->setConnectedNode(in_name, item.node);
|
||||
}
|
||||
else if (item.output) {
|
||||
node->setConnectedOutput(in_name, item.output);
|
||||
}
|
||||
else {
|
||||
CLOG_WARN(LOG_MATERIALX_SHADER, "Empty item to input: %s", in_name.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void NodeItem::set_input(const std::string &in_name, MaterialX::OutputPtr output)
|
||||
NodeItem NodeItem::add_output(const std::string &out_name, Type out_type)
|
||||
{
|
||||
node->setConnectedOutput(in_name, output);
|
||||
NodeItem res = empty();
|
||||
res.output = node->addOutput(out_name, type(out_type));
|
||||
return res;
|
||||
}
|
||||
|
||||
void NodeItem::set_input_output(const std::string &in_name,
|
||||
const NodeItem &item,
|
||||
const std::string &out_name)
|
||||
NodeItem NodeItem::create_output(const std::string &out_name) const
|
||||
{
|
||||
node->setConnectedNode(in_name, item.node);
|
||||
node->setConnectedOutput(in_name, item.node->getOutput(out_name));
|
||||
NodeItem res = empty();
|
||||
res.output = graph_->addOutput(out_name);
|
||||
return res;
|
||||
}
|
||||
|
||||
void NodeItem::add_output(const std::string &name, Type out_type)
|
||||
void NodeItem::set_output(const NodeItem &item) const
|
||||
{
|
||||
node->addOutput(name, type(out_type));
|
||||
}
|
||||
|
||||
bool NodeItem::is_arithmetic(Type type)
|
||||
{
|
||||
return type >= Type::Float && type <= Type::Color4;
|
||||
Type item_type = item.type();
|
||||
if (item.value) {
|
||||
switch (item_type) {
|
||||
case Type::String:
|
||||
set_output(item.value->asA<std::string>(), item_type);
|
||||
break;
|
||||
case Type::Boolean:
|
||||
set_output(item.value->asA<bool>(), item_type);
|
||||
break;
|
||||
case Type::Integer:
|
||||
set_output(item.value->asA<int>(), item_type);
|
||||
break;
|
||||
case Type::Float:
|
||||
set_output(item.value->asA<float>(), item_type);
|
||||
break;
|
||||
case Type::Vector2:
|
||||
set_output(item.value->asA<MaterialX::Vector2>(), item_type);
|
||||
break;
|
||||
case Type::Vector3:
|
||||
set_output(item.value->asA<MaterialX::Vector3>(), item_type);
|
||||
break;
|
||||
case Type::Vector4:
|
||||
set_output(item.value->asA<MaterialX::Vector4>(), item_type);
|
||||
break;
|
||||
case Type::Color3:
|
||||
set_output(item.value->asA<MaterialX::Color3>(), item_type);
|
||||
break;
|
||||
case Type::Color4:
|
||||
set_output(item.value->asA<MaterialX::Color4>(), item_type);
|
||||
break;
|
||||
default:
|
||||
BLI_assert_unreachable();
|
||||
}
|
||||
}
|
||||
else if (item.node) {
|
||||
output->setConnectedNode(item.node);
|
||||
output->setType(type(item_type));
|
||||
}
|
||||
else if (item.output) {
|
||||
output->setConnectedOutput(item.output);
|
||||
output->setType(type(item_type));
|
||||
}
|
||||
else {
|
||||
CLOG_WARN(LOG_MATERIALX_SHADER, "Empty item to output: %s", output->getName().c_str());
|
||||
}
|
||||
}
|
||||
|
||||
NodeItem::Type NodeItem::cast_types(NodeItem &item1, NodeItem &item2)
|
||||
|
@ -43,6 +43,7 @@ class NodeItem {
|
||||
public:
|
||||
MaterialX::ValuePtr value;
|
||||
MaterialX::NodePtr node;
|
||||
MaterialX::OutputPtr output;
|
||||
|
||||
private:
|
||||
MaterialX::GraphElement *graph_;
|
||||
@ -102,16 +103,17 @@ class NodeItem {
|
||||
NodeItem empty() const;
|
||||
template<class T> NodeItem val(const T &data) const;
|
||||
Type type() const;
|
||||
NodeItem create_node(const std::string &category, NodeItem::Type type) const;
|
||||
|
||||
/* Functions to set input and output */
|
||||
/* Node functions */
|
||||
NodeItem create_node(const std::string &category, NodeItem::Type type) const;
|
||||
template<class T> void set_input(const std::string &in_name, const T &value, Type in_type);
|
||||
void set_input(const std::string &in_name, const NodeItem &item);
|
||||
void set_input(const std::string &in_name, MaterialX::OutputPtr output);
|
||||
void set_input_output(const std::string &in_name,
|
||||
const NodeItem &item,
|
||||
const std::string &out_name);
|
||||
void add_output(const std::string &in_name, Type out_type);
|
||||
NodeItem add_output(const std::string &out_name, Type out_type);
|
||||
|
||||
/* Output functions */
|
||||
NodeItem create_output(const std::string &out_name) const;
|
||||
template<class T> void set_output(const T &value, Type out_type) const;
|
||||
void set_output(const NodeItem &item) const;
|
||||
|
||||
private:
|
||||
static Type cast_types(NodeItem &item1, NodeItem &item2);
|
||||
@ -136,4 +138,9 @@ void NodeItem::set_input(const std::string &in_name, const T &value, Type in_typ
|
||||
node->setInputValue(in_name, value, type(in_type));
|
||||
}
|
||||
|
||||
template<class T> void NodeItem::set_output(const T &value, Type out_type) const
|
||||
{
|
||||
output->setValue(value, type(out_type));
|
||||
}
|
||||
|
||||
} // namespace blender::nodes::materialx
|
||||
|
@ -73,6 +73,11 @@ NodeItem NodeParser::create_node(const std::string &category, NodeItem::Type typ
|
||||
return empty().create_node(category, type);
|
||||
}
|
||||
|
||||
NodeItem NodeParser::create_output()
|
||||
{
|
||||
return empty().create_output("");
|
||||
}
|
||||
|
||||
NodeItem NodeParser::get_input_default(const std::string &name, NodeItem::Type to_type)
|
||||
{
|
||||
return get_input_default(node_->input_by_identifier(name), to_type);
|
||||
|
@ -40,6 +40,7 @@ class NodeParser {
|
||||
protected:
|
||||
std::string node_name() const;
|
||||
NodeItem create_node(const std::string &category, NodeItem::Type type);
|
||||
NodeItem create_output();
|
||||
NodeItem get_input_default(const std::string &name, NodeItem::Type to_type);
|
||||
NodeItem get_input_default(int index, NodeItem::Type to_type);
|
||||
NodeItem get_input_link(const std::string &name, NodeItem::Type to_type);
|
||||
|
Loading…
Reference in New Issue
Block a user