Commit: 954b2de3d5a43d8f22d2cd917f3fb247872d6cf2
Author: Jacques Lucke
Date: Sat Apr 6 22:42:52 2019 +0200
Branches: functions
https://developer.blender.org/rB954b2de3d5a43d8f22d2cd917f3fb247872d6cf2
improve method names
===================================================================
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/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 a51fe380efb..cf9c42ae644 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
@@ -109,7 +109,7 @@ namespace FN { namespace DataFlowNodes {
void GraphBuilder::map_socket(Socket socket, bNodeSocket *bsocket)
{
- BLI_assert(this->is_data_socket(bsocket) ? socket.type() ==
this->type_of_socket(bsocket) : true);
+ BLI_assert(this->is_data_socket(bsocket) ? socket.type() ==
this->query_socket_type(bsocket) : true);
m_socket_map.add(bsocket, socket);
}
@@ -249,13 +249,13 @@ namespace FN { namespace DataFlowNodes {
}
}
- SharedType &GraphBuilder::type_of_socket(bNodeSocket *bsocket) const
+ SharedType &GraphBuilder::query_socket_type(bNodeSocket *bsocket) const
{
- std::string data_type = this->socket_type_string(bsocket);
+ std::string data_type = this->query_socket_type_name(bsocket);
return this->type_by_name(data_type.c_str());
}
- std::string GraphBuilder::name_of_socket(bNode *UNUSED(bnode),
bNodeSocket *bsocket) const
+ std::string GraphBuilder::query_socket_name(bNodeSocket *bsocket) const
{
return bsocket->name;
}
@@ -278,15 +278,20 @@ namespace FN { namespace DataFlowNodes {
return ptr;
}
- SharedType &GraphBuilder::type_from_rna(bNode *bnode, const char
*prop_name) const
+ SharedType &GraphBuilder::query_type_property(bNode *bnode, const char
*prop_name) const
+ {
+ PointerRNA rna = this->get_rna(bnode);
+ return this->type_from_rna(rna, prop_name);
+ }
+
+ SharedType &GraphBuilder::type_from_rna(PointerRNA &rna, const char
*prop_name) const
{
- PointerRNA ptr = this->get_rna(bnode);
char type_name[64];
- RNA_string_get(&ptr, prop_name, type_name);
+ RNA_string_get(&rna, prop_name, type_name);
return this->type_by_name(type_name);
}
- std::string GraphBuilder::socket_type_string(bNodeSocket *bsocket) const
+ std::string GraphBuilder::query_socket_type_name(bNodeSocket *bsocket)
const
{
BLI_assert(this->is_data_socket(bsocket));
PointerRNA ptr = this->get_rna(bsocket);
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.hpp
b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
index 5fe589d9fac..60420c5083b 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
@@ -55,13 +55,16 @@ namespace FN { namespace DataFlowNodes {
/* Query Socket Information */
PointerRNA get_rna(bNodeSocket *bsocket) const;
bool is_data_socket(bNodeSocket *bsocket) const;
- SharedType &type_of_socket(bNodeSocket *bsocket) const;
- std::string name_of_socket(bNode *bnode, bNodeSocket *bsocket)
const;
- std::string socket_type_string(bNodeSocket *bsocket) const;
+ std::string query_socket_name(bNodeSocket *bsocket) const;
+ SharedType &query_socket_type(bNodeSocket *bsocket) const;
+ std::string query_socket_type_name(bNodeSocket *bsocket) const;
/* Query Node Information */
PointerRNA get_rna(bNode *bnode) const;
- SharedType &type_from_rna(bNode *bnode, const char *prop_name)
const;
+ SharedType &query_type_property(bNode *bnode, const char
*prop_name) const;
+
+ /* Query RNA */
+ SharedType &type_from_rna(PointerRNA &rna, const char
*prop_name) const;
private:
bool check_if_sockets_are_mapped(
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 cbb04369912..fe0314dbd3f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -46,8 +46,8 @@ namespace FN { namespace DataFlowNodes {
OutputParameters outputs;
for (bNodeSocket *bsocket : bSocketList(&bnode->outputs)) {
if (builder.is_data_socket(bsocket)) {
- SharedType &type =
builder.type_of_socket(bsocket);
-
outputs.append(OutputParameter(builder.name_of_socket(bnode, bsocket), type));
+ SharedType &type =
builder.query_socket_type(bsocket);
+
outputs.append(OutputParameter(builder.query_socket_name(bsocket), type));
}
}
@@ -62,8 +62,8 @@ namespace FN { namespace DataFlowNodes {
InputParameters inputs;
for (bNodeSocket *bsocket : bSocketList(&bnode->inputs)) {
if (builder.is_data_socket(bsocket)) {
- SharedType &type =
builder.type_of_socket(bsocket);
-
inputs.append(InputParameter(builder.name_of_socket(bnode, bsocket), type));
+ SharedType &type =
builder.query_socket_type(bsocket);
+
inputs.append(InputParameter(builder.query_socket_name(bsocket), type));
}
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
index 035124a67d5..8aa7a522f41 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
@@ -127,14 +127,11 @@ namespace FN { namespace DataFlowNodes {
SmallSocketVector GraphInserters::insert_sockets(
GraphBuilder &builder,
BSockets &bsockets,
- BNodes &bnodes)
+ BNodes &UNUSED(bnodes))
{
- BLI_assert(bsockets.size() == bnodes.size());
-
SmallVector<SocketLoader> loaders;
OutputParameters outputs;
for (uint i = 0; i < bsockets.size(); i++) {
- bNode *bnode = bnodes[i];
bNodeSocket *bsocket = bsockets[i];
PointerRNA ptr = builder.get_rna(bsocket);
@@ -145,8 +142,8 @@ namespace FN { namespace DataFlowNodes {
SocketLoader loader =
m_socket_loaders.lookup(data_type);
loaders.append(loader);
outputs.append(OutputParameter(
- builder.name_of_socket(bnode, bsocket),
- builder.type_of_socket(bsocket)));
+ builder.query_socket_name(bsocket),
+ builder.query_socket_type(bsocket)));
}
auto fn = SharedFunction::New("Input Sockets", Signature({},
outputs));
@@ -172,8 +169,8 @@ namespace FN { namespace DataFlowNodes {
Socket from_socket = builder.lookup_socket(from_bsocket);
Socket to_socket = builder.lookup_socket(to_bsocket);
- std::string from_type =
builder.socket_type_string(from_bsocket);
- std::string to_type = builder.socket_type_string(to_bsocket);
+ std::string from_type =
builder.query_socket_type_name(from_bsocket);
+ std::string to_type =
builder.query_socket_type_name(to_bsocket);
if (from_type == to_type) {
builder.insert_link(from_socket, to_socket);
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 d15e97e3077..1d013fba786 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
@@ -85,7 +85,7 @@ namespace FN { namespace DataFlowNodes {
static void insert_get_list_element_node(GraphBuilder &builder, bNode
*bnode)
{
- SharedType &base_type = builder.type_from_rna(bnode,
"active_type");
+ SharedType &base_type = builder.query_type_property(bnode,
"active_type");
SharedFunction &fn =
Functions::GET_FN_get_list_element(base_type);
Node *node = builder.insert_function(fn, bnode);
builder.map_sockets(node, bnode);
@@ -93,7 +93,7 @@ namespace FN { namespace DataFlowNodes {
static void insert_list_length_node(GraphBuilder &builder, bNode *bnode)
{
- SharedType &base_type = builder.type_from_rna(bnode,
"active_type");
+ SharedType &base_type = builder.query_type_property(bnode,
"active_type");
SharedFunction &fn = Functions::GET_FN_list_length(base_type);
Node *node = builder.insert_function(fn, bnode);
builder.map_sockets(node, bnode);
@@ -144,7 +144,7 @@ namespace FN { namespace DataFlowNodes {
static void insert_pack_list_node(GraphBuilder &builder, bNode *bnode)
{
- SharedType &base_type = builder.type_from_rna(bnode,
"active_type");
+ SharedType &base_type = builder.query_type_property(bnode,
"active_type");
Socket packed_list_socket = insert_pack_list_sockets(
builder, bnode, base_type, "variadic", 0);
builder.map_output(packed_list_socket, bnode, 0);
@@ -172,7 +172,7 @@ namespace FN { namespace DataFlowNodes {
static void insert_switch_node(GraphBuilder &builder, bNode *bnode)
{
- SharedType &data_type = builder.type_from_rna(bnode,
"data_type");
+ SharedType &data_type = builder.query_type_property(bnode,
"data_type");
auto fn = Functions::GET_FN_bool_switch(data_type);
Node *node = builder.insert_function(fn);
builder.map_sockets(node, bnode);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
