[Bf-blender-cvs] [92319905a0a] functions: unify mapping names
Jacques Lucke
noreply at git.blender.org
Fri Aug 2 19:15:01 CEST 2019
Commit: 92319905a0a3b3a12560abcbd2c6d954df96903f
Author: Jacques Lucke
Date: Fri Aug 2 14:07:14 2019 +0200
Branches: functions
https://developer.blender.org/rB92319905a0a3b3a12560abcbd2c6d954df96903f
unify mapping names
===================================================================
M source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
M source/blender/functions/frontends/data_flow_nodes/input_handlers.cpp
M source/blender/functions/frontends/data_flow_nodes/mappings/mappings.hpp
M source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
M source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
M source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp
M source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
===================================================================
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 2ce843b7b06..938e6c8454a 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -31,7 +31,7 @@ static void insert_placeholder_node(VTreeDataGraphBuilder &builder, VirtualNode
static bool insert_functions_for_bnodes(VTreeDataGraphBuilder &builder)
{
- auto inserters = get_node_inserters_map();
+ auto inserters = MAPPING_node_inserters();
for (VirtualNode *vnode : builder.vtree().nodes()) {
NodeInserter *inserter = inserters.lookup_ptr(vnode->idname());
@@ -50,7 +50,7 @@ static bool insert_functions_for_bnodes(VTreeDataGraphBuilder &builder)
static bool insert_links(VTreeDataGraphBuilder &builder)
{
- Map<StringPair, ConversionInserter> &map = get_conversion_inserter_map();
+ Map<StringPair, ConversionInserter> &map = MAPPING_conversion_inserters();
for (VirtualSocket *to_vsocket : builder.vtree().inputs_with_links()) {
if (to_vsocket->links().size() > 1) {
diff --git a/source/blender/functions/frontends/data_flow_nodes/input_handlers.cpp b/source/blender/functions/frontends/data_flow_nodes/input_handlers.cpp
index b74edb96bb1..0c97802f090 100644
--- a/source/blender/functions/frontends/data_flow_nodes/input_handlers.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/input_handlers.cpp
@@ -68,7 +68,7 @@ void DynamicSocketLoader::insert(VTreeDataGraphBuilder &builder,
ArrayRef<VirtualSocket *> unlinked_inputs,
ArrayRef<BuilderOutputSocket *> r_new_origins)
{
- auto &socket_loader_map = get_socket_loader_map();
+ auto &socket_loader_map = MAPPING_socket_loaders();
Vector<SocketLoader> loaders;
Vector<bNodeSocket *> bsockets;
@@ -160,7 +160,7 @@ void ConstantInputsHandler::insert(VTreeDataGraphBuilder &builder,
ArrayRef<VirtualSocket *> unlinked_inputs,
ArrayRef<BuilderOutputSocket *> r_new_origins)
{
- auto &socket_loader_map = get_socket_loader_map();
+ auto &socket_loader_map = MAPPING_socket_loaders();
FunctionBuilder fn_builder;
for (VirtualSocket *vsocket : unlinked_inputs) {
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/mappings.hpp b/source/blender/functions/frontends/data_flow_nodes/mappings/mappings.hpp
index 315ecc86ca4..63775ed096f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/mappings.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/mappings.hpp
@@ -21,14 +21,14 @@ typedef std::function<void(
VTreeDataGraphBuilder &builder, BuilderOutputSocket *from, BuilderInputSocket *to)>
ConversionInserter;
-StringMap<SharedType> &get_type_by_idname_map();
-StringMap<SharedType> &get_type_by_data_type_map();
-StringMap<std::string> &get_data_type_by_idname_map();
-StringMap<std::string> &get_idname_by_data_type_map();
-
-StringMap<NodeInserter> &get_node_inserters_map();
-StringMap<SocketLoader> &get_socket_loader_map();
-Map<StringPair, ConversionInserter> &get_conversion_inserter_map();
+StringMap<SharedType> &MAPPING_type_by_idname();
+StringMap<SharedType> &MAPPING_type_by_name();
+StringMap<std::string> &MAPPING_type_name_by_idname();
+StringMap<std::string> &MAPPING_type_idname_by_name();
+
+StringMap<NodeInserter> &MAPPING_node_inserters();
+StringMap<SocketLoader> &MAPPING_socket_loaders();
+Map<StringPair, ConversionInserter> &MAPPING_conversion_inserters();
} // namespace DataFlowNodes
} // namespace FN
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
index 96fc0f821c1..7da7d6452f1 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.cpp
@@ -5,7 +5,7 @@
namespace FN {
namespace DataFlowNodes {
-BLI_LAZY_INIT(StringMap<NodeInserter>, get_node_inserters_map)
+BLI_LAZY_INIT(StringMap<NodeInserter>, MAPPING_node_inserters)
{
StringMap<NodeInserter> map;
NodeInserterRegistry registry(map);
@@ -13,7 +13,7 @@ BLI_LAZY_INIT(StringMap<NodeInserter>, get_node_inserters_map)
return map;
}
-BLI_LAZY_INIT(StringMap<SocketLoader>, get_socket_loader_map)
+BLI_LAZY_INIT(StringMap<SocketLoader>, MAPPING_socket_loaders)
{
StringMap<SocketLoader> map;
SocketLoaderRegistry registry(map);
@@ -22,7 +22,7 @@ BLI_LAZY_INIT(StringMap<SocketLoader>, get_socket_loader_map)
}
using ConversionInserterMap = Map<StringPair, ConversionInserter>;
-BLI_LAZY_INIT(ConversionInserterMap, get_conversion_inserter_map)
+BLI_LAZY_INIT(ConversionInserterMap, MAPPING_conversion_inserters)
{
Map<StringPair, ConversionInserter> map;
ConversionInserterRegistry registry(map);
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
index fd0cd703aac..6c2d26fd381 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/registry.hpp
@@ -40,7 +40,7 @@ class SocketLoaderRegistry {
public:
SocketLoaderRegistry(StringMap<SocketLoader> &map)
- : m_map(map), m_idname_by_data_type(get_idname_by_data_type_map())
+ : m_map(map), m_idname_by_data_type(MAPPING_type_idname_by_name())
{
}
@@ -58,7 +58,7 @@ class ConversionInserterRegistry {
public:
ConversionInserterRegistry(Map<StringPair, ConversionInserter> &map)
- : m_map(map), m_idname_by_data_type(get_idname_by_data_type_map())
+ : m_map(map), m_idname_by_data_type(MAPPING_type_idname_by_name())
{
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp
index e020ab484fe..5f1d8e6c10b 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/type_mappings.cpp
@@ -39,22 +39,22 @@ BLI_LAZY_INIT_STATIC(StringTypeMappings, get_type_mappings)
#undef ADD_TYPE
}
-StringMap<SharedType> &get_type_by_idname_map()
+StringMap<SharedType> &MAPPING_type_by_idname()
{
return get_type_mappings().type_by_idname;
}
-StringMap<SharedType> &get_type_by_data_type_map()
+StringMap<SharedType> &MAPPING_type_by_name()
{
return get_type_mappings().type_by_type_name;
}
-StringMap<std::string> &get_data_type_by_idname_map()
+StringMap<std::string> &MAPPING_type_name_by_idname()
{
return get_type_mappings().data_type_by_idname;
}
-StringMap<std::string> &get_idname_by_data_type_map()
+StringMap<std::string> &MAPPING_type_idname_by_name()
{
return get_type_mappings().idname_by_data_type;
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
index 1cfdb4d2528..5343bb13531 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
@@ -30,9 +30,9 @@ namespace DataFlowNodes {
VTreeDataGraphBuilder::VTreeDataGraphBuilder(VirtualNodeTree &vtree)
: m_vtree(vtree),
m_socket_map(vtree.socket_count(), nullptr),
- m_type_by_idname(get_type_by_idname_map()),
- m_type_by_data_type(get_type_by_data_type_map()),
- m_data_type_by_idname(get_data_type_by_idname_map())
+ m_type_by_idname(MAPPING_type_by_idname()),
+ m_type_by_data_type(MAPPING_type_by_name()),
+ m_data_type_by_idname(MAPPING_type_name_by_idname())
{
this->initialize_type_by_vsocket_map();
}
More information about the Bf-blender-cvs
mailing list