[Bf-blender-cvs] [7a931deab2c] functions: simplify names

Jacques Lucke noreply at git.blender.org
Sat Jan 4 16:39:02 CET 2020


Commit: 7a931deab2cfe82a222a03235c8f35f6401a265c
Author: Jacques Lucke
Date:   Sat Jan 4 13:37:27 2020 +0100
Branches: functions
https://developer.blender.org/rB7a931deab2cfe82a222a03235c8f35f6401a265c

simplify names

===================================================================

M	source/blender/functions/intern/node_tree_multi_function_network/builder.h
M	source/blender/functions/intern/node_tree_multi_function_network/generate.cc
M	source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
M	source/blender/functions/intern/node_tree_multi_function_network/mappings.h
M	source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
M	source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc

===================================================================

diff --git a/source/blender/functions/intern/node_tree_multi_function_network/builder.h b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
index 80966be2ab8..16bcfd0451e 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.h
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.h
@@ -179,7 +179,7 @@ class MFSocketByFSocketMapping {
 
 struct CommonBuilderData {
   ResourceCollector &resources;
-  const VTreeMultiFunctionMappings &mappings;
+  const FunctionTreeMFMappings &mappings;
   const FSocketDataTypes &fsocket_data_types;
   MFSocketByFSocketMapping &socket_map;
   MFNetworkBuilder &network_builder;
@@ -210,7 +210,7 @@ class CommonBuilderBase {
     return m_common.resources;
   }
 
-  const VTreeMultiFunctionMappings &mappings() const
+  const FunctionTreeMFMappings &mappings() const
   {
     return m_common.mappings;
   }
@@ -386,13 +386,13 @@ class FNodeMFBuilder : public CommonBuilderBase {
                                                ArrayRef<const char *> is_vectorized_prop_names);
 };
 
-class ImplicitConversionMFBuilder : public CommonBuilderBase {
+class ConversionMFBuilder : public CommonBuilderBase {
  private:
   MFBuilderInputSocket *m_built_input = nullptr;
   MFBuilderOutputSocket *m_built_output = nullptr;
 
  public:
-  ImplicitConversionMFBuilder(CommonBuilderData &common) : CommonBuilderBase(common)
+  ConversionMFBuilder(CommonBuilderData &common) : CommonBuilderBase(common)
   {
   }
 
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
index a4ced82ff83..fe81985943b 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/generate.cc
@@ -15,7 +15,7 @@ static bool insert_nodes(CommonBuilderData &common)
 {
   for (const FNode *fnode : common.function_tree.all_nodes()) {
     StringRef idname = fnode->idname();
-    const InsertVNodeFunction *inserter = common.mappings.fnode_inserters.lookup_ptr(idname);
+    const FNodeInserter *inserter = common.mappings.fnode_inserters.lookup_ptr(idname);
 
     if (inserter != nullptr) {
       FNodeMFBuilder fnode_builder{common, *fnode};
@@ -26,17 +26,20 @@ static bool insert_nodes(CommonBuilderData &common)
       builder.add_dummy(*fnode);
     }
   }
+  return true;
+}
 
+static bool insert_group_inputs(CommonBuilderData &common)
+{
   for (const FGroupInput *group_input : common.function_tree.all_group_inputs()) {
     VSocketMFBuilder socket_builder{common, group_input->vsocket()};
-    const InsertVSocketFunction *inserter = common.mappings.fsocket_inserters.lookup_ptr(
+    const VSocketInserter *inserter = common.mappings.fsocket_inserters.lookup_ptr(
         group_input->vsocket().idname());
     if (inserter != nullptr) {
       (*inserter)(socket_builder);
       common.socket_map.add(*group_input, socket_builder.built_socket());
     }
   }
-
   return true;
 }
 
@@ -78,12 +81,12 @@ static bool insert_links(CommonBuilderData &common)
     MFDataType to_type = to_sockets[0]->data_type();
 
     if (from_type != to_type) {
-      const InsertImplicitConversionFunction *inserter =
-          common.mappings.conversion_inserters.lookup_ptr({from_idname, to_fsocket->idname()});
+      const ConversionInserter *inserter = common.mappings.conversion_inserters.lookup_ptr(
+          {from_idname, to_fsocket->idname()});
       if (inserter == nullptr) {
         return false;
       }
-      ImplicitConversionMFBuilder builder{common};
+      ConversionMFBuilder builder{common};
       (*inserter)(builder);
       builder.add_link(*from_socket, builder.built_input());
       from_socket = &builder.built_output();
@@ -109,7 +112,7 @@ static bool insert_unlinked_inputs(CommonBuilderData &common)
   }
 
   for (const FInputSocket *fsocket : unlinked_data_inputs) {
-    const InsertVSocketFunction *inserter = common.mappings.fsocket_inserters.lookup_ptr(
+    const VSocketInserter *inserter = common.mappings.fsocket_inserters.lookup_ptr(
         fsocket->idname());
 
     if (inserter == nullptr) {
@@ -158,7 +161,7 @@ static std::unique_ptr<FunctionTreeMFNetwork> build(
 std::unique_ptr<FunctionTreeMFNetwork> generate_node_tree_multi_function_network(
     const FunctionTree &function_tree, ResourceCollector &resources)
 {
-  const VTreeMultiFunctionMappings &mappings = get_function_tree_multi_function_mappings();
+  const FunctionTreeMFMappings &mappings = get_function_tree_multi_function_mappings();
   FSocketDataTypes fsocket_data_types{function_tree};
   MFSocketByFSocketMapping socket_map{function_tree};
   auto network_builder = BLI::make_unique<MFNetworkBuilder>();
@@ -168,6 +171,9 @@ std::unique_ptr<FunctionTreeMFNetwork> generate_node_tree_multi_function_network
   if (!insert_nodes(common)) {
     BLI_assert(false);
   }
+  if (!insert_group_inputs(common)) {
+    BLI_assert(false);
+  }
   if (!insert_links(common)) {
     BLI_assert(false);
   }
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
index a5be57e6513..b79a0dc8240 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
@@ -8,9 +8,9 @@
 namespace FN {
 namespace MFGeneration {
 
-BLI_LAZY_INIT_REF(const VTreeMultiFunctionMappings, get_function_tree_multi_function_mappings)
+BLI_LAZY_INIT_REF(const FunctionTreeMFMappings, get_function_tree_multi_function_mappings)
 {
-  auto mappings = BLI::make_unique<VTreeMultiFunctionMappings>();
+  auto mappings = BLI::make_unique<FunctionTreeMFMappings>();
   add_function_tree_socket_mapping_info(*mappings);
   add_function_tree_node_mapping_info(*mappings);
   return mappings;
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings.h b/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
index c8d0e3162c0..658cc22e886 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings.h
@@ -13,30 +13,28 @@ using BLI::Map;
 using BLI::ResourceCollector;
 using BLI::StringMap;
 
-struct VTreeMultiFunctionMappings;
-class FunctionTreeMFNetworkBuilder;
 class FNodeMFBuilder;
 class VSocketMFBuilder;
-class ImplicitConversionMFBuilder;
+class ConversionMFBuilder;
 
-using InsertVNodeFunction = std::function<void(FNodeMFBuilder &builder)>;
-using InsertVSocketFunction = std::function<void(VSocketMFBuilder &builder)>;
-using InsertImplicitConversionFunction = std::function<void(ImplicitConversionMFBuilder &builder)>;
+using FNodeInserter = std::function<void(FNodeMFBuilder &builder)>;
+using VSocketInserter = std::function<void(VSocketMFBuilder &builder)>;
+using ConversionInserter = std::function<void(ConversionMFBuilder &builder)>;
 
-struct VTreeMultiFunctionMappings {
+struct FunctionTreeMFMappings {
   StringMap<MFDataType> data_type_by_idname;
   StringMap<const CPPType *> cpp_type_by_type_name;
   StringMap<MFDataType> data_type_by_type_name;
   Map<const CPPType *, std::string> type_name_from_cpp_type;
-  StringMap<InsertVNodeFunction> fnode_inserters;
-  StringMap<InsertVSocketFunction> fsocket_inserters;
-  Map<std::pair<std::string, std::string>, InsertImplicitConversionFunction> conversion_inserters;
+  StringMap<FNodeInserter> fnode_inserters;
+  StringMap<VSocketInserter> fsocket_inserters;
+  Map<std::pair<std::string, std::string>, ConversionInserter> conversion_inserters;
 };
 
-void add_function_tree_socket_mapping_info(VTreeMultiFunctionMappings &mappings);
-void add_function_tree_node_mapping_info(VTreeMultiFunctionMappings &mappings);
+void add_function_tree_socket_mapping_info(FunctionTreeMFMappings &mappings);
+void add_function_tree_node_mapping_info(FunctionTreeMFMappings &mappings);
 
-const VTreeMultiFunctionMappings &get_function_tree_multi_function_mappings();
+const FunctionTreeMFMappings &get_function_tree_multi_function_mappings();
 
 }  // namespace MFGeneration
 }  // namespace FN
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
index bba7ff6c853..aca9aa68e64 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
@@ -545,7 +545,7 @@ static void INSERT_event_filter_duration(FNodeMFBuilder &builder)
   builder.set_constructed_matching_fn<MF_EventFilterDuration>();
 }
 
-void add_function_tree_node_mapping_info(VTreeMultiFunctionMappings &mappings)
+void add_function_tree_node_mapping_info(FunctionTreeMFMappings &mappings)
 {
   mappings.fnode_inserters.add_new("fn_CombineColorNode", INSERT_combine_color);
   mappings.fnode_inserters.add_new("fn_SeparateColorNode", INSERT_separate_color);
diff --git a/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc b/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
index ed1f8ad42fc..d14bdfd519b 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
@@ -89,28 +89,27 @@ template<typename T> static void INSERT_empty_list_socket(VSocketMFBuilder &buil
 /* Implicit Conversion Inserters
  *******************************************/
 
-template<typename FromT, typename ToT>
-static void INSERT_convert(ImplicitConversionMFBuilder &builder)
+template<typename FromT, typename ToT> static void INSERT_convert(ConversionMFBuilder &builder)
 {
   builder.set_constructed_conversion_fn<MF_Convert<FromT, ToT>>();
 }
 
 template<typename FromT, typename ToT>
-static void INSERT_convert_list(ImplicitConversionMFBuilder &builder)
+static void INSERT_convert_list(ConversionMFBuilder 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list