[Bf-blender-cvs] [5ea3eca3805] functions: use function name prefix for inserters
Jacques Lucke
noreply at git.blender.org
Sat Apr 6 22:50:31 CEST 2019
Commit: 5ea3eca3805261ae299734794cf0909cfea7771e
Author: Jacques Lucke
Date: Sat Apr 6 22:50:20 2019 +0200
Branches: functions
https://developer.blender.org/rB5ea3eca3805261ae299734794cf0909cfea7771e
use function name prefix for inserters
===================================================================
M source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
===================================================================
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 f32ef86134b..aa8b1f31f30 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/conversions.cpp
@@ -4,7 +4,7 @@
namespace FN { namespace DataFlowNodes {
- static void insert_base_to_list_conversion(
+ static void INSERT_base_to_list(
GraphBuilder &builder,
Socket from,
Socket to,
@@ -23,9 +23,9 @@ namespace FN { namespace DataFlowNodes {
inserters.reg_conversion_function("Integer", "Float", Functions::GET_FN_int32_to_float);
inserters.reg_conversion_function("Float", "Integer", Functions::GET_FN_float_to_int32);
- inserters.reg_conversion_inserter("Float", "Float List", insert_base_to_list_conversion);
- inserters.reg_conversion_inserter("Vector", "Vector List", insert_base_to_list_conversion);
- inserters.reg_conversion_inserter("Integer", "Integer List", insert_base_to_list_conversion);
+ inserters.reg_conversion_inserter("Float", "Float List", INSERT_base_to_list);
+ inserters.reg_conversion_inserter("Vector", "Vector List", INSERT_base_to_list);
+ inserters.reg_conversion_inserter("Integer", "Integer List", INSERT_base_to_list);
}
} } /* namespace FN::DataFlowNodes */
\ No newline at end of file
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 1d013fba786..1aa7670c00c 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(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_object_transforms(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
Object *object = (Object *)RNA_pointer_get(&ptr, "object").id.data;
@@ -37,7 +37,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- static void insert_float_math_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_float_math(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
int operation = RNA_enum_get(&ptr, "operation");
@@ -58,7 +58,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- static void insert_vector_math_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_vector_math(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
int operation = RNA_enum_get(&ptr, "operation");
@@ -68,7 +68,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_sockets(node, bnode);
}
- static void insert_clamp_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_clamp(GraphBuilder &builder, bNode *bnode)
{
SharedFunction &max_fn = Functions::GET_FN_max_floats();
SharedFunction &min_fn = Functions::GET_FN_min_floats();
@@ -83,7 +83,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_output( min_node->output(0), bnode, 0);
}
- static void insert_get_list_element_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_get_list_element(GraphBuilder &builder, bNode *bnode)
{
SharedType &base_type = builder.query_type_property(bnode, "active_type");
SharedFunction &fn = Functions::GET_FN_get_list_element(base_type);
@@ -91,7 +91,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_sockets(node, bnode);
}
- static void insert_list_length_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_list_length(GraphBuilder &builder, bNode *bnode)
{
SharedType &base_type = builder.query_type_property(bnode, "active_type");
SharedFunction &fn = Functions::GET_FN_list_length(base_type);
@@ -142,7 +142,7 @@ namespace FN { namespace DataFlowNodes {
return node->output(0);
}
- static void insert_pack_list_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_pack_list(GraphBuilder &builder, bNode *bnode)
{
SharedType &base_type = builder.query_type_property(bnode, "active_type");
Socket packed_list_socket = insert_pack_list_sockets(
@@ -150,7 +150,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_output(packed_list_socket, bnode, 0);
}
- static void insert_call_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_call(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
@@ -170,7 +170,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_sockets(node, bnode);
}
- static void insert_switch_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_switch(GraphBuilder &builder, bNode *bnode)
{
SharedType &data_type = builder.query_type_property(bnode, "data_type");
auto fn = Functions::GET_FN_bool_switch(data_type);
@@ -198,7 +198,7 @@ namespace FN { namespace DataFlowNodes {
}
}
- static void insert_combine_vector_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_combine_vector(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
@@ -216,7 +216,7 @@ namespace FN { namespace DataFlowNodes {
builder.map_sockets(node, bnode);
}
- static void insert_separate_vector_node(GraphBuilder &builder, bNode *bnode)
+ static void INSERT_separate_vector(GraphBuilder &builder, bNode *bnode)
{
PointerRNA ptr = builder.get_rna(bnode);
@@ -238,17 +238,17 @@ namespace FN { namespace DataFlowNodes {
inserters.reg_node_function("fn_RandomNumberNode", Functions::GET_FN_random_number);
inserters.reg_node_function("fn_MapRangeNode", Functions::GET_FN_map_range);
- inserters.reg_node_inserter("fn_SeparateVectorNode", insert_separate_vector_node);
- inserters.reg_node_inserter("fn_CombineVectorNode", insert_combine_vector_node);
- inserters.reg_node_inserter("fn_ObjectTransformsNode", insert_object_transforms_node);
- inserters.reg_node_inserter("fn_FloatMathNode", insert_float_math_node);
- inserters.reg_node_inserter("fn_VectorMathNode", insert_vector_math_node);
- inserters.reg_node_inserter("fn_ClampNode", insert_clamp_node);
- inserters.reg_node_inserter("fn_GetListElementNode", insert_get_list_element_node);
- inserters.reg_node_inserter("fn_PackListNode", insert_pack_list_node);
- inserters.reg_node_inserter("fn_CallNode", insert_call_node);
- inserters.reg_node_inserter("fn_SwitchNode", insert_switch_node);
- inserters.reg_node_inserter("fn_ListLengthNode", insert_list_length_node);
+ inserters.reg_node_inserter("fn_SeparateVectorNode", INSERT_separate_vector);
+ inserters.reg_node_inserter("fn_CombineVectorNode", INSERT_combine_vector);
+ inserters.reg_node_inserter("fn_ObjectTransformsNode", INSERT_object_transforms);
+ inserters.reg_node_inserter("fn_FloatMathNode", INSERT_float_math);
+ inserters.reg_node_inserter("fn_VectorMathNode", INSERT_vector_math);
+ inserters.reg_node_inserter("fn_ClampNode", INSERT_clamp);
+ inserters.reg_node_inserter("fn_GetListElementNode", INSERT_get_list_element);
+ inserters.reg_node_inserter("fn_PackListNode", INSERT_pack_list);
+ inserters.reg_node_inserter("fn_CallNode", INSERT_call);
+ inserters.reg_node_inserter("fn_SwitchNode", INSERT_switch);
+ inserters.reg_node_inserter("fn_ListLengthNode", INSERT_list_length);
}
} }
\ No newline at end of file
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp b/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
index ec735fa7996..b5bb5ca94de 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
@@ -7,33 +7,33 @@
namespace FN { namespace DataFlowNodes {
- static void load_float(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_float(PointerRNA *ptr, Tuple &tuple, uint index)
{
float value = RNA_float_get(ptr, "value");
tuple.set<float>(index, value);
}
- static void load_vector(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_vector(PointerRNA *ptr, Tuple &tuple, uint index)
{
float vector[3];
RNA_float_get_array(ptr, "value", vector);
tuple.set<Types::Vector>(index, Types::Vector(vector));
}
- static void load_integer(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_integer(PointerRNA *ptr, Tuple &tuple, uint index)
{
int value = RNA_int_get(ptr, "value");
tuple.set<int32_t>(index, value);
}
- static void load_boolean(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_boolean(PointerRNA *ptr, Tuple &tuple, uint index)
{
bool value = RNA_boolean_get(ptr, "value");
tuple.set<bool>(index, value);
}
template<typename T>
- static void load_empty_list(PointerRNA *UNUSED(ptr), Tuple &tuple, uint index)
+ static void LOAD_empty_list(PointerRNA *UNUSED(ptr), Tuple &tuple, uint index)
{
auto list = Types::SharedList<T>::New();
tuple.move_in(index, list);
@@ -41,13 +41,13 @@ namespace FN { namespace DataFlowNodes {
void initialize_socket_inserters(GraphInserters &inserters)
{
- inserters.reg_socket_loader("Float", load_float);
- inserters.reg_socket_loader("Vector", load_vector);
- inserters.reg_socket_loader("Integer", load_integer);
- inserters.reg_socket_loader("Boolean", load_boolean);
- inserters.reg_socket_loader("Float List", load_empty_list<float>);
- inserters.reg_socket_loader("Vector List", load_empty_list<Types::Vector>);
- inserters.reg_socket_loader("Integer List", load_empty_list<int32_t>);
+ inserters.reg_socket_loader("Float", LOAD_float);
+ inserters.reg_socket_loader("Vector", LOAD_vector);
+ inserters.reg_socket_loader("Integer", LOAD_integer);
+ inserters.reg_socket_loader("Boolean", LOAD_boolean);
+ inserters.reg_socket_loader("Float List", LOAD_empty_list<float>);
+ inserters.reg_socket_loader("Vector List", LOAD_empty_list<Types::Vector>);
+ inserters.reg_socket_loader("Integer List", LOAD_empty_list<int32_t>);
}
} }
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list