[Bf-blender-cvs] [f101aa6c4bc] functions: fix naming after recent refactor
Jacques Lucke
noreply at git.blender.org
Wed Dec 4 17:10:36 CET 2019
Commit: f101aa6c4bc6981f8f343a33502cad263b1b5314
Author: Jacques Lucke
Date: Wed Dec 4 15:32:30 2019 +0100
Branches: functions
https://developer.blender.org/rBf101aa6c4bc6981f8f343a33502cad263b1b5314
fix naming after recent refactor
===================================================================
M source/blender/functions/FN_inlined_tree_multi_function_network.h
M source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
M source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc
M source/blender/functions/intern/inlined_tree_multi_function_network/builder.h
M source/blender/functions/intern/inlined_tree_multi_function_network/generate.cc
M source/blender/functions/intern/inlined_tree_multi_function_network/mappings.h
M source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc
M source/blender/functions/intern/inlined_tree_multi_function_network/mappings_sockets.cc
M source/blender/simulations/bparticles/node_frontend.cpp
===================================================================
diff --git a/source/blender/functions/FN_inlined_tree_multi_function_network.h b/source/blender/functions/FN_inlined_tree_multi_function_network.h
index 80a86127a66..34bb9e23c44 100644
--- a/source/blender/functions/FN_inlined_tree_multi_function_network.h
+++ b/source/blender/functions/FN_inlined_tree_multi_function_network.h
@@ -16,10 +16,10 @@ using BKE::XOutputSocket;
using BKE::XSocket;
using BLI::MultiMap;
-#define VTreeMFSocketMap_UNMAPPED UINT_MAX
-#define VTreeMFSocketMap_MULTIMAPPED (UINT_MAX - 1)
+#define InlinedTreeMFSocketMap_UNMAPPED UINT_MAX
+#define InlinedTreeMFSocketMap_MULTIMAPPED (UINT_MAX - 1)
-class VTreeMFSocketMap {
+class InlinedTreeMFSocketMap {
private:
/* An input xsocket can be mapped to multiple sockets.
* An output xsocket can be mapped to at most one socket.
@@ -31,11 +31,11 @@ class VTreeMFSocketMap {
Array<uint> m_xsocket_by_socket;
public:
- VTreeMFSocketMap(const InlinedNodeTree &inlined_tree,
- const MFNetwork &network,
- Array<uint> single_socket_by_xsocket,
- MultiMap<uint, uint> multiple_inputs_by_xsocket,
- Array<uint> xsocket_by_socket)
+ InlinedTreeMFSocketMap(const InlinedNodeTree &inlined_tree,
+ const MFNetwork &network,
+ Array<uint> single_socket_by_xsocket,
+ MultiMap<uint, uint> multiple_inputs_by_xsocket,
+ Array<uint> xsocket_by_socket)
: m_inlined_tree(&inlined_tree),
m_network(&network),
m_single_socket_by_xsocket(std::move(single_socket_by_xsocket)),
@@ -46,12 +46,12 @@ class VTreeMFSocketMap {
bool is_mapped(const XSocket &xsocket) const
{
- return m_single_socket_by_xsocket[xsocket.id()] < VTreeMFSocketMap_MULTIMAPPED;
+ return m_single_socket_by_xsocket[xsocket.id()] < InlinedTreeMFSocketMap_MULTIMAPPED;
}
bool is_mapped(const MFSocket &socket) const
{
- return m_xsocket_by_socket[socket.id()] != VTreeMFSocketMap_UNMAPPED;
+ return m_xsocket_by_socket[socket.id()] != InlinedTreeMFSocketMap_UNMAPPED;
}
const MFInputSocket &lookup_singly_mapped_input_socket(const XInputSocket &xsocket) const
@@ -66,10 +66,10 @@ class VTreeMFSocketMap {
uint id = xsocket.id();
uint mapped_value = m_single_socket_by_xsocket[id];
switch (mapped_value) {
- case VTreeMFSocketMap_UNMAPPED: {
+ case InlinedTreeMFSocketMap_UNMAPPED: {
return {};
}
- case VTreeMFSocketMap_MULTIMAPPED: {
+ case InlinedTreeMFSocketMap_MULTIMAPPED: {
Vector<const MFInputSocket *> sockets;
for (uint mapped_id : m_multiple_inputs_by_xsocket.lookup(id)) {
sockets.append(&m_network->socket_by_id(mapped_id).as_input());
@@ -103,16 +103,16 @@ class VTreeMFSocketMap {
}
};
-class VTreeMFNetwork {
+class InlinedTreeMFNetwork {
private:
const InlinedNodeTree &m_inlined_tree;
std::unique_ptr<MFNetwork> m_network;
- VTreeMFSocketMap m_socket_map;
+ InlinedTreeMFSocketMap m_socket_map;
public:
- VTreeMFNetwork(const InlinedNodeTree &inlined_tree,
- std::unique_ptr<MFNetwork> network,
- VTreeMFSocketMap socket_map)
+ InlinedTreeMFNetwork(const InlinedNodeTree &inlined_tree,
+ std::unique_ptr<MFNetwork> network,
+ InlinedTreeMFSocketMap socket_map)
: m_inlined_tree(inlined_tree),
m_network(std::move(network)),
m_socket_map(std::move(socket_map))
diff --git a/source/blender/functions/FN_inlined_tree_multi_function_network_generation.h b/source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
index 459b0960e3f..1c9f612719b 100644
--- a/source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
+++ b/source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
@@ -9,7 +9,7 @@ namespace FN {
using BLI::ResourceCollector;
-std::unique_ptr<VTreeMFNetwork> generate_inlined_tree_multi_function_network(
+std::unique_ptr<InlinedTreeMFNetwork> generate_inlined_tree_multi_function_network(
const InlinedNodeTree &inlined_tree, ResourceCollector &resources);
std::unique_ptr<MF_EvaluateNetwork> generate_inlined_tree_multi_function(
diff --git a/source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc b/source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc
index fd564172215..febfd71c0fb 100644
--- a/source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc
+++ b/source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc
@@ -2,7 +2,7 @@
namespace FN {
-VTreeMFNetworkBuilder::VTreeMFNetworkBuilder(
+InlinedTreeMFNetworkBuilder::InlinedTreeMFNetworkBuilder(
const InlinedNodeTree &inlined_tree,
const PreprocessedVTreeMFData &preprocessed_inlined_tree_data,
const VTreeMultiFunctionMappings &inlined_tree_mappings,
@@ -11,25 +11,25 @@ VTreeMFNetworkBuilder::VTreeMFNetworkBuilder(
m_preprocessed_inlined_tree_data(preprocessed_inlined_tree_data),
m_inlined_tree_mappings(inlined_tree_mappings),
m_resources(resources),
- m_single_socket_by_xsocket(inlined_tree.socket_count(), VTreeMFSocketMap_UNMAPPED),
+ m_single_socket_by_xsocket(inlined_tree.socket_count(), InlinedTreeMFSocketMap_UNMAPPED),
m_builder(BLI::make_unique<MFNetworkBuilder>())
{
}
-MFBuilderFunctionNode &VTreeMFNetworkBuilder::add_function(const MultiFunction &function)
+MFBuilderFunctionNode &InlinedTreeMFNetworkBuilder::add_function(const MultiFunction &function)
{
return m_builder->add_function(function);
}
-MFBuilderFunctionNode &VTreeMFNetworkBuilder::add_function(const MultiFunction &function,
- const XNode &xnode)
+MFBuilderFunctionNode &InlinedTreeMFNetworkBuilder::add_function(const MultiFunction &function,
+ const XNode &xnode)
{
MFBuilderFunctionNode &node = m_builder->add_function(function);
this->map_data_sockets(xnode, node);
return node;
}
-MFBuilderDummyNode &VTreeMFNetworkBuilder::add_dummy(const XNode &xnode)
+MFBuilderDummyNode &InlinedTreeMFNetworkBuilder::add_dummy(const XNode &xnode)
{
Vector<MFDataType> input_types;
for (const XInputSocket *xsocket : xnode.inputs()) {
@@ -52,7 +52,7 @@ MFBuilderDummyNode &VTreeMFNetworkBuilder::add_dummy(const XNode &xnode)
return node;
}
-void VTreeMFNetworkBuilder::map_data_sockets(const XNode &xnode, MFBuilderNode &node)
+void InlinedTreeMFNetworkBuilder::map_data_sockets(const XNode &xnode, MFBuilderNode &node)
{
uint data_inputs = 0;
for (const XInputSocket *xsocket : xnode.inputs()) {
@@ -71,7 +71,7 @@ void VTreeMFNetworkBuilder::map_data_sockets(const XNode &xnode, MFBuilderNode &
}
}
-void VTreeMFNetworkBuilder::assert_xnode_is_mapped_correctly(const XNode &xnode) const
+void InlinedTreeMFNetworkBuilder::assert_xnode_is_mapped_correctly(const XNode &xnode) const
{
UNUSED_VARS_NDEBUG(xnode);
#ifdef DEBUG
@@ -80,7 +80,7 @@ void VTreeMFNetworkBuilder::assert_xnode_is_mapped_correctly(const XNode &xnode)
#endif
}
-void VTreeMFNetworkBuilder::assert_data_sockets_are_mapped_correctly(
+void InlinedTreeMFNetworkBuilder::assert_data_sockets_are_mapped_correctly(
ArrayRef<const XSocket *> xsockets) const
{
for (const XSocket *xsocket : xsockets) {
@@ -90,7 +90,7 @@ void VTreeMFNetworkBuilder::assert_data_sockets_are_mapped_correctly(
}
}
-void VTreeMFNetworkBuilder::assert_xsocket_is_mapped_correctly(const XSocket &xsocket) const
+void InlinedTreeMFNetworkBuilder::assert_xsocket_is_mapped_correctly(const XSocket &xsocket) const
{
BLI_assert(this->xsocket_is_mapped(xsocket));
MFDataType xsocket_type = this->try_get_data_type(xsocket).value();
@@ -111,7 +111,7 @@ void VTreeMFNetworkBuilder::assert_xsocket_is_mapped_correctly(const XSocket &xs
}
}
-bool VTreeMFNetworkBuilder::has_data_sockets(const XNode &xnode) const
+bool InlinedTreeMFNetworkBuilder::has_data_sockets(const XNode &xnode) const
{
for (const XInputSocket *xsocket : xnode.inputs()) {
if (this->is_data_socket(*xsocket)) {
@@ -126,8 +126,8 @@ bool VTreeMFNetworkBuilder::has_data_sockets(const XNode &xnode) const
return false;
}
-const CPPType &VTreeMFNetworkBuilder::cpp_type_from_property(const XNode &xnode,
- StringRefNull prop_name) const
+const CPPType &InlinedTreeMFNetworkBuilder::cpp_type_from_property(const XNode &xnode,
+ StringRefNull prop_name) const
{
char *type_name = RNA_string_get_alloc(xnode.rna(), prop_name.data(), nullptr, 0);
const CPPType &type = this->cpp_type_by_name(type_name);
@@ -135,8 +135,8 @@ const CPPType &VTreeMFNetworkBuilder::cpp_type_from_property(const XNode &xnode,
return type;
}
-MFDataType VTreeMFNetworkBuilder::data_type_from_property(const XNode &xnode,
- StringRefNull prop_name) const
+MFDataType InlinedTreeMFNetworkBuilder::data_type_from_property(const XNode &xnode,
+ StringRefNull prop_name) const
{
char *type_name = RNA_string_get_alloc(xnode.rna(), prop_name.data(), nullptr, 0);
MFDataType type = m_inlined_tree_mappings.data_type_by_type_name.lookup(type_name);
@@ -192,19 +192,19 @@ const MultiFunction &VNodeMFNetworkBuilder::get_vectorized_function(
}
}
-std::unique_ptr<VTreeMFNetwork> VTreeMFNetworkBuilder::build()
+std::unique_ptr<InlinedTreeMFNetwork> InlinedTreeMFNetworkBuilder::build()
{
// m_builder->to_dot__clipboard();
auto network = BLI::make_unique<MFNetwork>(std::move(m_builder));
- Array<uint> xsocket_by_socket(network->socket_ids().size(), VTreeMFSocketMap_UNMAPPED);
+ Array<uint> xsocket_by_socket(network->socket_ids().size(), InlinedTreeMFSocketMap_UNMAPPED);
for (uint xsocket_id : m_single_socket_by_xsocket.index_iterator()) {
switch (m_single_socket_by_xsocket[xsocket_i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list