Commit: decd4d8ecf13945a0ecc59fd2aeb9b94f3ae6eb9
Author: Jacques Lucke
Date: Sat Apr 6 22:13:24 2019 +0200
Branches: functions
https://developer.blender.org/rBdecd4d8ecf13945a0ecc59fd2aeb9b94f3ae6eb9
rename Builder to GraphBuilder
===================================================================
M source/blender/functions/frontends/data_flow_nodes/builder.cpp
M source/blender/functions/frontends/data_flow_nodes/builder.hpp
M source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters.hpp
M
source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
===================================================================
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
index e1021868228..d3e16a5b9f6 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
@@ -83,37 +83,37 @@ namespace FN { namespace DataFlowNodes {
}
};
- Node *Builder::insert_function(SharedFunction &fn)
+ Node *GraphBuilder::insert_function(SharedFunction &fn)
{
return m_graph->insert(fn);
}
- Node *Builder::insert_function(SharedFunction &fn, bNode *bnode)
+ Node *GraphBuilder::insert_function(SharedFunction &fn, bNode *bnode)
{
BLI_assert(bnode != nullptr);
NodeSource *source =
m_graph->new_source_info<NodeSource>(m_ctx.btree(), bnode);
return m_graph->insert(fn, source);
}
- Node *Builder::insert_function(SharedFunction &fn, bNodeLink *blink)
+ Node *GraphBuilder::insert_function(SharedFunction &fn, bNodeLink
*blink)
{
BLI_assert(blink != nullptr);
LinkSource *source =
m_graph->new_source_info<LinkSource>(m_ctx.btree(), blink);
return m_graph->insert(fn, source);
}
- void Builder::insert_link(Socket a, Socket b)
+ void GraphBuilder::insert_link(Socket a, Socket b)
{
m_graph->link(a, b);
}
- void Builder::map_socket(Socket socket, bNodeSocket *bsocket)
+ void GraphBuilder::map_socket(Socket socket, bNodeSocket *bsocket)
{
BLI_assert(m_ctx.is_data_socket(bsocket) ? socket.type() ==
m_ctx.type_of_socket(bsocket) : true);
m_socket_map.add(bsocket, socket);
}
- void Builder::map_sockets(Node *node, struct bNode *bnode)
+ void GraphBuilder::map_sockets(Node *node, struct bNode *bnode)
{
BLI_assert(BLI_listbase_count(&bnode->inputs) ==
node->input_amount());
BLI_assert(BLI_listbase_count(&bnode->outputs) ==
node->output_amount());
@@ -131,7 +131,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- void Builder::map_data_sockets(Node *node, struct bNode *bnode)
+ void GraphBuilder::map_data_sockets(Node *node, struct bNode *bnode)
{
uint input_index = 0;
for (bNodeSocket *bsocket : bSocketList(&bnode->inputs)) {
@@ -150,27 +150,27 @@ namespace FN { namespace DataFlowNodes {
}
}
- void Builder::map_input(Socket socket, struct bNode *bnode, uint index)
+ void GraphBuilder::map_input(Socket socket, struct bNode *bnode, uint
index)
{
BLI_assert(socket.is_input());
auto bsocket = (bNodeSocket *)BLI_findlink(&bnode->inputs,
index);
this->map_socket(socket, bsocket);
}
- void Builder::map_output(Socket socket, struct bNode *bnode, uint index)
+ void GraphBuilder::map_output(Socket socket, struct bNode *bnode, uint
index)
{
BLI_assert(socket.is_output());
auto bsocket = (bNodeSocket *)BLI_findlink(&bnode->outputs,
index);
this->map_socket(socket, bsocket);
}
- Socket Builder::lookup_socket(struct bNodeSocket *bsocket)
+ Socket GraphBuilder::lookup_socket(struct bNodeSocket *bsocket)
{
BLI_assert(m_socket_map.contains(bsocket));
return m_socket_map.lookup(bsocket);
}
- bool Builder::check_if_sockets_are_mapped(
+ bool GraphBuilder::check_if_sockets_are_mapped(
struct bNode *bnode,
bSocketList bsockets) const
{
@@ -196,7 +196,7 @@ namespace FN { namespace DataFlowNodes {
return true;
}
- bool Builder::verify_data_sockets_mapped(struct bNode *bnode) const
+ bool GraphBuilder::verify_data_sockets_mapped(struct bNode *bnode) const
{
return (
this->check_if_sockets_are_mapped(bnode,
bSocketList(&bnode->inputs)) &&
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.hpp
b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
index 57b77479f77..769dde041d7 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
@@ -36,14 +36,14 @@ namespace FN { namespace DataFlowNodes {
std::string socket_type_string(bNodeSocket *bsocket) const;
};
- class Builder {
+ class GraphBuilder {
private:
const BuilderContext &m_ctx;
SharedDataFlowGraph &m_graph;
SocketMap &m_socket_map;
public:
- Builder(
+ GraphBuilder(
const BuilderContext &ctx,
SharedDataFlowGraph &graph,
SocketMap &socket_map)
diff --git
a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
index d69b6fe8f23..cf86aca35ce 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -41,7 +41,7 @@ namespace FN { namespace DataFlowNodes {
}
static void insert_input_node(
- Builder &builder, const BuilderContext &ctx, bNode *bnode)
+ GraphBuilder &builder, const BuilderContext &ctx, bNode *bnode)
{
OutputParameters outputs;
for (bNodeSocket *bsocket : bSocketList(&bnode->outputs)) {
@@ -57,7 +57,7 @@ namespace FN { namespace DataFlowNodes {
}
static void insert_output_node(
- Builder &builder, const BuilderContext &ctx, bNode *bnode)
+ GraphBuilder &builder, const BuilderContext &ctx, bNode *bnode)
{
InputParameters inputs;
for (bNodeSocket *bsocket : bSocketList(&bnode->inputs)) {
@@ -151,7 +151,7 @@ namespace FN { namespace DataFlowNodes {
SocketMap socket_map;
BuilderContext ctx(btree);
- Builder builder(ctx, graph, socket_map);
+ GraphBuilder builder(ctx, graph, socket_map);
GraphInserters &inserters = get_standard_inserters();
bNode *input_node;
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
index f178b6aa013..662fa6e2014 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
@@ -32,7 +32,7 @@ namespace FN { namespace DataFlowNodes {
void GraphInserters::reg_node_function(std::string idname,
FunctionGetter getter)
{
auto inserter = [getter](
- Builder &builder,
+ GraphBuilder &builder,
bNode *bnode)
{
SharedFunction fn = getter();
@@ -64,7 +64,7 @@ namespace FN { namespace DataFlowNodes {
FunctionGetter getter)
{
auto inserter = [getter](
- Builder &builder,
+ GraphBuilder &builder,
Socket from,
Socket to,
struct bNodeLink *source_link)
@@ -84,7 +84,7 @@ namespace FN { namespace DataFlowNodes {
}
bool GraphInserters::insert_node(
- Builder &builder,
+ GraphBuilder &builder,
bNode *bnode)
{
NodeInserter *inserter =
m_node_inserters.lookup_ptr(bnode->idname);
@@ -125,7 +125,7 @@ namespace FN { namespace DataFlowNodes {
};
SmallSocketVector GraphInserters::insert_sockets(
- Builder &builder,
+ GraphBuilder &builder,
BSockets &bsockets,
BNodes &bnodes)
{
@@ -164,7 +164,7 @@ namespace FN { namespace DataFlowNodes {
}
bool GraphInserters::insert_link(
- Builder &builder,
+ GraphBuilder &builder,
struct bNodeSocket *from_bsocket,
struct bNodeSocket *to_bsocket,
struct bNodeLink *source_link)
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
index 7190dd1ea0d..7ad1d85b1c6 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
@@ -11,7 +11,7 @@ struct PointerRNA;
namespace FN { namespace DataFlowNodes {
typedef std::function<void (
- Builder &builder,
+ GraphBuilder &builder,
struct bNode *bnode)> NodeInserter;
typedef std::function<void (
@@ -20,7 +20,7 @@ namespace FN { namespace DataFlowNodes {
uint index)> SocketLoader;
typedef std::function<void (
- Builder &builder,
+ GraphBuilder &builder,
Socket from,
Socket to,
struct bNodeLink *source_link)> ConversionInserter;
@@ -50,16 +50,16 @@ namespace FN { namespace DataFlowNodes {
FunctionGetter getter);
bool insert_node(
- Builder &builder,
+ GraphBuilder &builder,
struct bNode *bnode);
SmallSocketVector insert_sockets(
- Builder &builder,
+ GraphBuilder &builder,
BSockets &bsockets,
BNodes &bnodes);
bool insert_link(
- Builder &builder,
+ GraphBuilder &builder,
struct bNodeSocket *from_bsocket,
struct bNodeSocket *to_bsocket,
struct bNodeLink *source_link = nullptr);
diff --git
a/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
index 23283ce99cf..f32ef86134b 100644
---
a/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
+++
b/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
@@ -5,7 +5,7 @@
namespace FN { namespace DataFlowNodes {
static void insert_base_to_list_conversion(
- Builder &builder,
+ GraphBuilder &builder,
Socket from,
Socket to,
struct bNodeLink *UNUSED(source_link))
diff --git
a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
index 000f2e75f5d..d9c31a6e83a 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
@@ -12,7 +12,7 @@ namespace FN { namespace DataFlowNodes {
using namespace Types;
- static void insert_object_transforms_node(Builder &builder, bNode
*bnode)
+ static void insert_object_transforms_node(GraphBuilder &builder, bNode
*bnode)
{
PointerRNA ptr;
builder.ctx().get_rna(bnode, &ptr);
@@ -38,7 +38,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- static void insert_float_math_node(Builder &builder, bNode *bnode)
+ static void insert_float_math_node(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr;
builder.ctx().get_rna(bnode, &ptr);
@@ -60,7 +60,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- static void insert_vector_math_node(Builder &builder, bNode *bnode)
+ static void insert_vector_math_node(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr;
builder.ctx().get_rna(bnod
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
