[Bf-blender-cvs] [2335aaf58b3] functions: improve naming

Jacques Lucke noreply at git.blender.org
Thu Nov 21 15:19:57 CET 2019


Commit: 2335aaf58b38065bf0b796bd81c775824522169c
Author: Jacques Lucke
Date:   Thu Nov 21 14:29:03 2019 +0100
Branches: functions
https://developer.blender.org/rB2335aaf58b38065bf0b796bd81c775824522169c

improve naming

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

M	source/blender/functions/FN_multi_function_data_type.h
M	source/blender/functions/intern/multi_functions/mixed.cc
M	source/blender/functions/intern/multi_functions/network.cc
M	source/blender/functions/intern/multi_functions/network.h
M	source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/particle_function.cpp

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

diff --git a/source/blender/functions/FN_multi_function_data_type.h b/source/blender/functions/FN_multi_function_data_type.h
index 9585a031f96..4dfd5fa7357 100644
--- a/source/blender/functions/FN_multi_function_data_type.h
+++ b/source/blender/functions/FN_multi_function_data_type.h
@@ -55,13 +55,13 @@ struct MFDataType {
     return m_category;
   }
 
-  const CPPType &type() const
+  const CPPType &single__cpp_type() const
   {
     BLI_assert(m_category == Category::Single);
     return *m_base_type;
   }
 
-  const CPPType &base_type() const
+  const CPPType &vector__cpp_base_type() const
   {
     BLI_assert(m_category == Category::Vector);
     return *m_base_type;
diff --git a/source/blender/functions/intern/multi_functions/mixed.cc b/source/blender/functions/intern/multi_functions/mixed.cc
index 7e58fabc966..e0912f38b13 100644
--- a/source/blender/functions/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
@@ -382,16 +382,17 @@ MF_SimpleVectorize::MF_SimpleVectorize(const MultiFunction &function,
       case MFParamType::SingleInput: {
         BLI_assert(!found_output_param);
         if (input_is_vectorized[param_index]) {
-          signature.vector_input(param_name + " (List)", param_type.data_type().type());
+          signature.vector_input(param_name + " (List)",
+                                 param_type.data_type().single__cpp_type());
           m_vectorized_inputs.append(param_index);
         }
         else {
-          signature.single_input(param_name, param_type.data_type().type());
+          signature.single_input(param_name, param_type.data_type().single__cpp_type());
         }
         break;
       }
       case MFParamType::SingleOutput: {
-        signature.vector_output(param_name + " (List)", param_type.data_type().type());
+        signature.vector_output(param_name + " (List)", param_type.data_type().single__cpp_type());
         m_output_indices.append(param_index);
         found_output_param = true;
         break;
diff --git a/source/blender/functions/intern/multi_functions/network.cc b/source/blender/functions/intern/multi_functions/network.cc
index 35ca4ef85bc..69a3cb5d459 100644
--- a/source/blender/functions/intern/multi_functions/network.cc
+++ b/source/blender/functions/intern/multi_functions/network.cc
@@ -34,8 +34,8 @@ BLI_NOINLINE void MF_EvaluateNetwork::copy_inputs_to_storage(MFMask mask,
               storage.set_virtual_list_for_input__non_owning(*target, input_list);
             }
             else if (param_type.is_mutable_single()) {
-              GenericMutableArrayRef array = this->allocate_array(param_type.data_type().type(),
-                                                                  mask.min_array_size());
+              GenericMutableArrayRef array = this->allocate_array(
+                  param_type.data_type().single__cpp_type(), mask.min_array_size());
               for (uint i : mask.indices()) {
                 array.copy_in__uninitialized(i, input_list[i]);
               }
@@ -66,7 +66,7 @@ BLI_NOINLINE void MF_EvaluateNetwork::copy_inputs_to_storage(MFMask mask,
             }
             else if (param_type.is_mutable_vector()) {
               GenericVectorArray *vector_array = new GenericVectorArray(
-                  param_type.data_type().base_type(), mask.min_array_size());
+                  param_type.data_type().vector__cpp_base_type(), mask.min_array_size());
               for (uint i : mask.indices()) {
                 vector_array->extend_single__copy(i, input_list_list[i]);
               }
@@ -165,7 +165,7 @@ BLI_NOINLINE void MF_EvaluateNetwork::compute_and_forward_outputs(
         uint output_socket_index = function_node.output_param_indices().first_index(param_index);
         const MFOutputSocket &output_socket = *function_node.outputs()[output_socket_index];
         GenericMutableArrayRef values_destination = this->allocate_array(
-            output_socket.data_type().type(), array_size);
+            output_socket.data_type().single__cpp_type(), array_size);
         params_builder.add_single_output(values_destination);
         single_outputs_to_forward.append({&output_socket, values_destination});
         break;
@@ -173,8 +173,8 @@ BLI_NOINLINE void MF_EvaluateNetwork::compute_and_forward_outputs(
       case MFParamType::VectorOutput: {
         uint output_socket_index = function_node.output_param_indices().first_index(param_index);
         const MFOutputSocket &output_socket = *function_node.outputs()[output_socket_index];
-        auto *values_destination = new GenericVectorArray(output_socket.data_type().base_type(),
-                                                          array_size);
+        auto *values_destination = new GenericVectorArray(
+            output_socket.data_type().vector__cpp_base_type(), array_size);
         params_builder.add_vector_output(*values_destination);
         vector_outputs_to_forward.append({&output_socket, values_destination});
         break;
@@ -224,7 +224,7 @@ BLI_NOINLINE void MF_EvaluateNetwork::compute_and_forward_outputs(
           storage.set_virtual_list_for_input__non_owning(*target, values);
         }
         else if (param_type.is_mutable_single()) {
-          const CPPType &type = param_type.data_type().type();
+          const CPPType &type = param_type.data_type().single__cpp_type();
           GenericMutableArrayRef copied_values = this->allocate_array(type, array_size);
           for (uint i : mask.indices()) {
             type.copy_to_uninitialized(values[i], copied_values[i]);
diff --git a/source/blender/functions/intern/multi_functions/network.h b/source/blender/functions/intern/multi_functions/network.h
index ad6eb3f298a..92bbda223a5 100644
--- a/source/blender/functions/intern/multi_functions/network.h
+++ b/source/blender/functions/intern/multi_functions/network.h
@@ -26,10 +26,10 @@ class MF_EvaluateNetwork final : public MultiFunction {
       MFDataType type = socket->data_type();
       switch (type.category()) {
         case MFDataType::Single:
-          signature.single_input("Input", type.type());
+          signature.single_input("Input", type.single__cpp_type());
           break;
         case MFDataType::Vector:
-          signature.vector_input("Input", type.base_type());
+          signature.vector_input("Input", type.vector__cpp_base_type());
           break;
       }
     }
@@ -39,10 +39,10 @@ class MF_EvaluateNetwork final : public MultiFunction {
       MFDataType type = socket->data_type();
       switch (type.category()) {
         case MFDataType::Single:
-          signature.single_output("Output", type.type());
+          signature.single_output("Output", type.single__cpp_type());
           break;
         case MFDataType::Vector:
-          signature.vector_output("Output", type.base_type());
+          signature.vector_output("Output", type.vector__cpp_base_type());
           break;
       }
     }
diff --git a/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
index 52367476dc1..6dcfd5bc56f 100644
--- a/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
+++ b/source/blender/functions/intern/vtree_multi_function_network/mappings_nodes.cc
@@ -147,10 +147,10 @@ static const MultiFunction &get_switch_function(VTreeMFNetworkBuilder &builder,
   MFDataType type = builder.data_type_from_property(vnode, "data_type");
   switch (type.category()) {
     case MFDataType::Single: {
-      return builder.construct_fn<FN::MF_SwitchSingle>(type.type());
+      return builder.construct_fn<FN::MF_SwitchSingle>(type.single__cpp_type());
     }
     case MFDataType::Vector: {
-      return builder.construct_fn<FN::MF_SwitchVector>(type.base_type());
+      return builder.construct_fn<FN::MF_SwitchVector>(type.vector__cpp_base_type());
     }
   }
   BLI_assert(false);
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index d1aed6ed622..b0e48f4fe8f 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -116,7 +116,7 @@ class VTreeData {
       FN::MFDataType data_type =
           m_vtree_data_graph.lookup_dummy_socket(vnode.input(i)).data_type();
       BLI_assert(data_type.is_single());
-      computed_types.append(&data_type.type());
+      computed_types.append(&data_type.single__cpp_type());
     }
 
     auto &tuple_info = this->construct<FN::GenericTupleInfo>(__func__, std::move(computed_types));
diff --git a/source/blender/simulations/bparticles/particle_function.cpp b/source/blender/simulations/bparticles/particle_function.cpp
index 49ee12ac14c..19163479b2f 100644
--- a/source/blender/simulations/bparticles/particle_function.cpp
+++ b/source/blender/simulations/bparticles/particle_function.cpp
@@ -77,7 +77,7 @@ std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ArrayRef<uint>
         auto *provider = m_input_providers[param_index];
         InputProviderInterface interface(pindices, attributes, action_context);
         auto optional_array = provider->get(interface);
-        const CPPType &type = param_type.data_type().type();
+        const CPPType &type = param_type.data_type().single__cpp_type();
         if (optional_array.has_value()) {
           ParticleFunctionInputArray array = optional_array.extract();
           BLI_assert(array.buffer != nullptr);
@@ -103,7 +103,7 @@ std::unique_ptr<ParticleFunctionResult> ParticleFunction::compute(ArrayRef<uint>
         break;
       }
       case FN::MFParamType::SingleOutput: {
-        const CPPType &type = param_type.data_type().type();
+        const CPPType &type = param_type.data_type().single__cpp_type();
         void *output_buffer = BLI_temporary_allocate(type.size() * array_size);
         params_builder.add_single_output(
             FN::GenericMutableArrayRef(type, output_buffer, array_size));



More information about the Bf-blender-cvs mailing list