Cleanup: rename namespace DotExport to dot
This commit is contained in:
parent
b51d6e8012
commit
784911a4a0
|
@ -357,19 +357,17 @@ DerivedNodeTree::~DerivedNodeTree()
|
|||
}
|
||||
}
|
||||
|
||||
namespace Dot = blender::DotExport;
|
||||
|
||||
static Dot::Cluster *get_cluster_for_parent(Dot::DirectedGraph &graph,
|
||||
Map<const DParentNode *, Dot::Cluster *> &clusters,
|
||||
static dot::Cluster *get_cluster_for_parent(dot::DirectedGraph &graph,
|
||||
Map<const DParentNode *, dot::Cluster *> &clusters,
|
||||
const DParentNode *parent)
|
||||
{
|
||||
if (parent == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
return clusters.lookup_or_add_cb(parent, [&]() {
|
||||
Dot::Cluster *parent_cluster = get_cluster_for_parent(graph, clusters, parent->parent());
|
||||
dot::Cluster *parent_cluster = get_cluster_for_parent(graph, clusters, parent->parent());
|
||||
bNodeTree *btree = (bNodeTree *)parent->node_ref().bnode()->id;
|
||||
Dot::Cluster *new_cluster = &graph.new_cluster(parent->node_ref().name() + " / " +
|
||||
dot::Cluster *new_cluster = &graph.new_cluster(parent->node_ref().name() + " / " +
|
||||
StringRef(btree->id.name + 2));
|
||||
new_cluster->set_parent_cluster(parent_cluster);
|
||||
return new_cluster;
|
||||
|
@ -378,15 +376,15 @@ static Dot::Cluster *get_cluster_for_parent(Dot::DirectedGraph &graph,
|
|||
|
||||
std::string DerivedNodeTree::to_dot() const
|
||||
{
|
||||
Dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(Dot::Attr_rankdir::LeftToRight);
|
||||
dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(dot::Attr_rankdir::LeftToRight);
|
||||
|
||||
Map<const DNode *, Dot::NodeWithSocketsRef> dot_nodes;
|
||||
Map<const DGroupInput *, Dot::NodeWithSocketsRef> dot_group_inputs;
|
||||
Map<const DParentNode *, Dot::Cluster *> dot_clusters;
|
||||
Map<const DNode *, dot::NodeWithSocketsRef> dot_nodes;
|
||||
Map<const DGroupInput *, dot::NodeWithSocketsRef> dot_group_inputs;
|
||||
Map<const DParentNode *, dot::Cluster *> dot_clusters;
|
||||
|
||||
for (const DNode *node : m_nodes_by_id) {
|
||||
Dot::Node &dot_node = digraph.new_node("");
|
||||
dot::Node &dot_node = digraph.new_node("");
|
||||
dot_node.set_background_color("white");
|
||||
|
||||
Vector<std::string> input_names;
|
||||
|
@ -399,37 +397,37 @@ std::string DerivedNodeTree::to_dot() const
|
|||
}
|
||||
|
||||
dot_nodes.add_new(node,
|
||||
Dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names));
|
||||
dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names));
|
||||
|
||||
Dot::Cluster *cluster = get_cluster_for_parent(digraph, dot_clusters, node->parent());
|
||||
dot::Cluster *cluster = get_cluster_for_parent(digraph, dot_clusters, node->parent());
|
||||
dot_node.set_parent_cluster(cluster);
|
||||
}
|
||||
|
||||
for (const DGroupInput *group_input : m_group_inputs) {
|
||||
Dot::Node &dot_node = digraph.new_node("");
|
||||
dot::Node &dot_node = digraph.new_node("");
|
||||
dot_node.set_background_color("white");
|
||||
|
||||
std::string group_input_name = group_input->name();
|
||||
dot_group_inputs.add_new(
|
||||
group_input, Dot::NodeWithSocketsRef(dot_node, "Group Input", {}, {group_input_name}));
|
||||
group_input, dot::NodeWithSocketsRef(dot_node, "Group Input", {}, {group_input_name}));
|
||||
|
||||
Dot::Cluster *cluster = get_cluster_for_parent(digraph, dot_clusters, group_input->parent());
|
||||
dot::Cluster *cluster = get_cluster_for_parent(digraph, dot_clusters, group_input->parent());
|
||||
dot_node.set_parent_cluster(cluster);
|
||||
}
|
||||
|
||||
for (const DNode *to_node : m_nodes_by_id) {
|
||||
Dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(to_node);
|
||||
dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(to_node);
|
||||
|
||||
for (const DInputSocket *to_socket : to_node->inputs()) {
|
||||
for (const DOutputSocket *from_socket : to_socket->linked_sockets()) {
|
||||
const DNode *from_node = &from_socket->node();
|
||||
Dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(from_node);
|
||||
dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(from_node);
|
||||
|
||||
digraph.new_edge(from_dot_node.output(from_socket->index()),
|
||||
to_dot_node.input(to_socket->index()));
|
||||
}
|
||||
for (const DGroupInput *group_input : to_socket->linked_group_inputs()) {
|
||||
Dot::NodeWithSocketsRef &from_dot_node = dot_group_inputs.lookup(group_input);
|
||||
dot::NodeWithSocketsRef &from_dot_node = dot_group_inputs.lookup(group_input);
|
||||
|
||||
digraph.new_edge(from_dot_node.output(0), to_dot_node.input(to_socket->index()));
|
||||
}
|
||||
|
|
|
@ -139,15 +139,13 @@ void NodeTreeRef::find_targets_skipping_reroutes(OutputSocketRef &socket,
|
|||
|
||||
std::string NodeTreeRef::to_dot() const
|
||||
{
|
||||
namespace Dot = blender::DotExport;
|
||||
dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(dot::Attr_rankdir::LeftToRight);
|
||||
|
||||
Dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(Dot::Attr_rankdir::LeftToRight);
|
||||
|
||||
Map<const NodeRef *, Dot::NodeWithSocketsRef> dot_nodes;
|
||||
Map<const NodeRef *, dot::NodeWithSocketsRef> dot_nodes;
|
||||
|
||||
for (const NodeRef *node : m_nodes_by_id) {
|
||||
Dot::Node &dot_node = digraph.new_node("");
|
||||
dot::Node &dot_node = digraph.new_node("");
|
||||
dot_node.set_background_color("white");
|
||||
|
||||
Vector<std::string> input_names;
|
||||
|
@ -160,13 +158,13 @@ std::string NodeTreeRef::to_dot() const
|
|||
}
|
||||
|
||||
dot_nodes.add_new(node,
|
||||
Dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names));
|
||||
dot::NodeWithSocketsRef(dot_node, node->name(), input_names, output_names));
|
||||
}
|
||||
|
||||
for (const OutputSocketRef *from_socket : m_output_sockets) {
|
||||
for (const InputSocketRef *to_socket : from_socket->directly_linked_sockets()) {
|
||||
Dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(&from_socket->node());
|
||||
Dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(&to_socket->node());
|
||||
dot::NodeWithSocketsRef &from_dot_node = dot_nodes.lookup(&from_socket->node());
|
||||
dot::NodeWithSocketsRef &to_dot_node = dot_nodes.lookup(&to_socket->node());
|
||||
|
||||
digraph.new_edge(from_dot_node.output(from_socket->index()),
|
||||
to_dot_node.input(to_socket->index()));
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <sstream>
|
||||
|
||||
namespace blender {
|
||||
namespace DotExport {
|
||||
namespace dot {
|
||||
|
||||
class Graph;
|
||||
class DirectedGraph;
|
||||
|
@ -283,7 +283,7 @@ class NodeWithSocketsRef {
|
|||
}
|
||||
};
|
||||
|
||||
} // namespace DotExport
|
||||
} // namespace dot
|
||||
} // namespace blender
|
||||
|
||||
#endif /* __BLI_DOT_EXPORT_HH__ */
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include "BLI_string_ref.hh"
|
||||
|
||||
namespace blender {
|
||||
namespace DotExport {
|
||||
namespace dot {
|
||||
|
||||
enum class Attr_rankdir {
|
||||
LeftToRight,
|
||||
|
@ -119,7 +119,7 @@ inline StringRef dirType_to_string(Attr_dirType value)
|
|||
return "";
|
||||
}
|
||||
|
||||
} // namespace DotExport
|
||||
} // namespace dot
|
||||
} // namespace blender
|
||||
|
||||
#endif /* __BLI_DOT_EXPORT_ATTRIBUTE_ENUMS_HH__ */
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "BLI_dot_export.hh"
|
||||
|
||||
namespace blender {
|
||||
namespace DotExport {
|
||||
namespace dot {
|
||||
|
||||
/* Graph Building
|
||||
************************************************/
|
||||
|
@ -301,5 +301,5 @@ NodeWithSocketsRef::NodeWithSocketsRef(Node &node,
|
|||
m_node->set_shape(Attr_shape::Rectangle);
|
||||
}
|
||||
|
||||
} // namespace DotExport
|
||||
} // namespace dot
|
||||
} // namespace blender
|
||||
|
|
|
@ -195,19 +195,17 @@ MFInputSocket &MFNetwork::add_output(StringRef name, MFDataType data_type)
|
|||
|
||||
std::string MFNetwork::to_dot() const
|
||||
{
|
||||
namespace Dot = blender::DotExport;
|
||||
dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(dot::Attr_rankdir::LeftToRight);
|
||||
|
||||
Dot::DirectedGraph digraph;
|
||||
digraph.set_rankdir(Dot::Attr_rankdir::LeftToRight);
|
||||
|
||||
Map<const MFNode *, Dot::NodeWithSocketsRef> dot_nodes;
|
||||
Map<const MFNode *, dot::NodeWithSocketsRef> dot_nodes;
|
||||
|
||||
Vector<const MFNode *> all_nodes;
|
||||
all_nodes.extend(m_function_nodes.as_span());
|
||||
all_nodes.extend(m_dummy_nodes.as_span());
|
||||
|
||||
for (const MFNode *node : all_nodes) {
|
||||
Dot::Node &dot_node = digraph.new_node("");
|
||||
dot::Node &dot_node = digraph.new_node("");
|
||||
|
||||
Vector<std::string> input_names, output_names;
|
||||
for (const MFInputSocket *socket : node->m_inputs) {
|
||||
|
@ -217,18 +215,18 @@ std::string MFNetwork::to_dot() const
|
|||
output_names.append(socket->name() + " (" + socket->data_type().to_string() + ")");
|
||||
}
|
||||
|
||||
Dot::NodeWithSocketsRef dot_node_ref{dot_node, node->name(), input_names, output_names};
|
||||
dot::NodeWithSocketsRef dot_node_ref{dot_node, node->name(), input_names, output_names};
|
||||
dot_nodes.add_new(node, dot_node_ref);
|
||||
}
|
||||
|
||||
for (const MFNode *to_node : all_nodes) {
|
||||
Dot::NodeWithSocketsRef to_dot_node = dot_nodes.lookup(to_node);
|
||||
dot::NodeWithSocketsRef to_dot_node = dot_nodes.lookup(to_node);
|
||||
|
||||
for (const MFInputSocket *to_socket : to_node->m_inputs) {
|
||||
const MFOutputSocket *from_socket = to_socket->m_origin;
|
||||
if (from_socket != nullptr) {
|
||||
const MFNode *from_node = from_socket->m_node;
|
||||
Dot::NodeWithSocketsRef from_dot_node = dot_nodes.lookup(from_node);
|
||||
dot::NodeWithSocketsRef from_dot_node = dot_nodes.lookup(from_node);
|
||||
digraph.new_edge(from_dot_node.output(from_socket->m_index),
|
||||
to_dot_node.input(to_socket->m_index));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue