[Bf-blender-cvs] [b7f6be1b8be] functions: simplify names
Jacques Lucke
noreply at git.blender.org
Sat Jan 4 16:38:59 CET 2020
Commit: b7f6be1b8be7f3ed95f3131231692b0097ee3095
Author: Jacques Lucke
Date: Sat Jan 4 13:27:56 2020 +0100
Branches: functions
https://developer.blender.org/rBb7f6be1b8be7f3ed95f3131231692b0097ee3095
simplify names
===================================================================
M source/blender/functions/intern/node_tree_multi_function_network/builder.cc
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.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.cc b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
index e8dd9fef32e..51bed9a41e6 100644
--- a/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
+++ b/source/blender/functions/intern/node_tree_multi_function_network/builder.cc
@@ -46,7 +46,7 @@ MFBuilderDummyNode &CommonBuilderBase::add_dummy(const FNode &fnode)
return node;
}
-Vector<bool> FNodeMFNetworkBuilder::get_list_base_variadic_states(StringRefNull prop_name)
+Vector<bool> FNodeMFBuilder::get_list_base_variadic_states(StringRefNull prop_name)
{
Vector<bool> states;
RNA_BEGIN (m_fnode.rna(), itemptr, prop_name.data()) {
@@ -67,13 +67,13 @@ Vector<bool> FNodeMFNetworkBuilder::get_list_base_variadic_states(StringRefNull
return states;
}
-void FNodeMFNetworkBuilder::set_matching_fn(const MultiFunction &fn)
+void FNodeMFBuilder::set_matching_fn(const MultiFunction &fn)
{
MFBuilderFunctionNode &node = this->add_function(fn);
m_common.socket_map.add(m_fnode, node, m_common.fsocket_data_types);
}
-const MultiFunction &FNodeMFNetworkBuilder::get_vectorized_function(
+const MultiFunction &FNodeMFBuilder::get_vectorized_function(
const MultiFunction &base_function, ArrayRef<const char *> is_vectorized_prop_names)
{
ScopedVector<bool> input_is_vectorized;
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 4a51a0eb76e..80966be2ab8 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
@@ -277,13 +277,13 @@ class CommonBuilderBase {
}
};
-class VSocketMFNetworkBuilder : public CommonBuilderBase {
+class VSocketMFBuilder : public CommonBuilderBase {
private:
const VSocket &m_vsocket;
MFBuilderOutputSocket *m_socket_to_build = nullptr;
public:
- VSocketMFNetworkBuilder(CommonBuilderData &common, const VSocket &vsocket)
+ VSocketMFBuilder(CommonBuilderData &common, const VSocket &vsocket)
: CommonBuilderBase(common), m_vsocket(vsocket)
{
}
@@ -322,7 +322,7 @@ class VSocketMFNetworkBuilder : public CommonBuilderBase {
}
};
-class FNodeMFNetworkBuilder : public CommonBuilderBase {
+class FNodeMFBuilder : public CommonBuilderBase {
private:
const FNode &m_fnode;
@@ -330,7 +330,7 @@ class FNodeMFNetworkBuilder : public CommonBuilderBase {
using CommonBuilderBase::data_type_from_property;
public:
- FNodeMFNetworkBuilder(CommonBuilderData &common, const FNode &fnode)
+ FNodeMFBuilder(CommonBuilderData &common, const FNode &fnode)
: CommonBuilderBase(common), m_fnode(fnode)
{
}
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 c2fb1693820..a4ced82ff83 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
@@ -18,7 +18,7 @@ static bool insert_nodes(CommonBuilderData &common)
const InsertVNodeFunction *inserter = common.mappings.fnode_inserters.lookup_ptr(idname);
if (inserter != nullptr) {
- FNodeMFNetworkBuilder fnode_builder{common, *fnode};
+ FNodeMFBuilder fnode_builder{common, *fnode};
(*inserter)(fnode_builder);
}
else if (common.fsocket_data_types.has_data_sockets(*fnode)) {
@@ -28,7 +28,7 @@ static bool insert_nodes(CommonBuilderData &common)
}
for (const FGroupInput *group_input : common.function_tree.all_group_inputs()) {
- VSocketMFNetworkBuilder socket_builder{common, group_input->vsocket()};
+ VSocketMFBuilder socket_builder{common, group_input->vsocket()};
const InsertVSocketFunction *inserter = common.mappings.fsocket_inserters.lookup_ptr(
group_input->vsocket().idname());
if (inserter != nullptr) {
@@ -116,7 +116,7 @@ static bool insert_unlinked_inputs(CommonBuilderData &common)
return false;
}
- VSocketMFNetworkBuilder fsocket_builder{common, fsocket->vsocket()};
+ VSocketMFBuilder fsocket_builder{common, fsocket->vsocket()};
(*inserter)(fsocket_builder);
for (MFBuilderInputSocket *to_socket : common.socket_map.lookup(*fsocket)) {
common.network_builder.add_link(fsocket_builder.built_socket(), *to_socket);
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 d54b336a885..c8d0e3162c0 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
@@ -15,12 +15,12 @@ using BLI::StringMap;
struct VTreeMultiFunctionMappings;
class FunctionTreeMFNetworkBuilder;
-class FNodeMFNetworkBuilder;
-class VSocketMFNetworkBuilder;
+class FNodeMFBuilder;
+class VSocketMFBuilder;
class ImplicitConversionMFBuilder;
-using InsertVNodeFunction = std::function<void(FNodeMFNetworkBuilder &builder)>;
-using InsertVSocketFunction = std::function<void(VSocketMFNetworkBuilder &builder)>;
+using InsertVNodeFunction = std::function<void(FNodeMFBuilder &builder)>;
+using InsertVSocketFunction = std::function<void(VSocketMFBuilder &builder)>;
using InsertImplicitConversionFunction = std::function<void(ImplicitConversionMFBuilder &builder)>;
struct VTreeMultiFunctionMappings {
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 adb35f2b3b1..bba7ff6c853 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
@@ -12,93 +12,93 @@ namespace FN {
namespace MFGeneration {
using BLI::float3;
-static void INSERT_combine_color(FNodeMFNetworkBuilder &builder)
+static void INSERT_combine_color(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_CombineColor>(
{"use_list__red", "use_list__green", "use_list__blue", "use_list__alpha"});
}
-static void INSERT_separate_color(FNodeMFNetworkBuilder &builder)
+static void INSERT_separate_color(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_SeparateColor>({"use_list__color"});
}
-static void INSERT_combine_vector(FNodeMFNetworkBuilder &builder)
+static void INSERT_combine_vector(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_CombineVector>(
{"use_list__x", "use_list__y", "use_list__z"});
}
-static void INSERT_separate_vector(FNodeMFNetworkBuilder &builder)
+static void INSERT_separate_vector(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_SeparateVector>({"use_list__vector"});
}
-static void INSERT_vector_from_value(FNodeMFNetworkBuilder &builder)
+static void INSERT_vector_from_value(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_VectorFromValue>({"use_list__value"});
}
-static void INSERT_list_length(FNodeMFNetworkBuilder &builder)
+static void INSERT_list_length(FNodeMFBuilder &builder)
{
const CPPType &type = builder.cpp_type_from_property("active_type");
builder.set_constructed_matching_fn<MF_ListLength>(type);
}
-static void INSERT_get_list_element(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_list_element(FNodeMFBuilder &builder)
{
const CPPType &type = builder.cpp_type_from_property("active_type");
builder.set_constructed_matching_fn<MF_GetListElement>(type);
}
-static void INSERT_get_list_elements(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_list_elements(FNodeMFBuilder &builder)
{
const CPPType &type = builder.cpp_type_from_property("active_type");
builder.set_constructed_matching_fn<MF_GetListElements>(type);
}
-static void INSERT_pack_list(FNodeMFNetworkBuilder &builder)
+static void INSERT_pack_list(FNodeMFBuilder &builder)
{
const CPPType &type = builder.cpp_type_from_property("active_type");
Vector<bool> list_states = builder.get_list_base_variadic_states("variadic");
builder.set_constructed_matching_fn<MF_PackList>(type, list_states);
}
-static void INSERT_object_location(FNodeMFNetworkBuilder &builder)
+static void INSERT_object_location(FNodeMFBuilder &builder)
{
builder.set_constructed_matching_fn<MF_ObjectWorldLocation>();
}
-static void INSERT_object_mesh_info(FNodeMFNetworkBuilder &builder)
+static void INSERT_object_mesh_info(FNodeMFBuilder &builder)
{
builder.set_constructed_matching_fn<MF_ObjectVertexPositions>();
}
-static void INSERT_get_position_on_surface(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_position_on_surface(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_GetPositionOnSurface>(
{"use_list__surface_hook"});
}
-static void INSERT_get_normal_on_surface(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_normal_on_surface(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_GetNormalOnSurface>(
{"use_list__surface_hook"});
}
-static void INSERT_get_weight_on_surface(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_weight_on_surface(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_GetWeightOnSurface>(
{"use_list__surface_hook", "use_list__vertex_group_name"});
}
-static void INSERT_get_image_color_on_surface(FNodeMFNetworkBuilder &builder)
+static void INSERT_get_image_color_on_surface(FNodeMFBuilder &builder)
{
builder.set_vectorized_constructed_matching_fn<MF_GetImageColorOnSurface>(
{"use_list__surface_hook", "use_list__image"});
}
-static void INSERT_switch(FNodeMFNetworkBuilder &builder)
+static void INSERT_switch(FNodeMFBuilder &builder)
{
MFDataType type = builder.data_type_from_property("data_type");
switch (
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list