Commit: 92e04dcd159fbb235ec2c17114e66898031d60ec
Author: Jacques Lucke
Date: Thu Oct 31 14:15:27 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rB92e04dcd159fbb235ec2c17114e66898031d60ec
rename placeholder to dummy
===================================================================
M source/blender/blenkernel/BKE_multi_function_network.h
M source/blender/blenkernel/intern/multi_function_network.cc
M source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_multi_function_network.h
b/source/blender/blenkernel/BKE_multi_function_network.h
index 80b9673cf25..998a62104b6 100644
--- a/source/blender/blenkernel/BKE_multi_function_network.h
+++ b/source/blender/blenkernel/BKE_multi_function_network.h
@@ -16,7 +16,7 @@ using BLI::Optional;
class MFBuilderNode;
class MFBuilderFunctionNode;
-class MFBuilderPlaceholderNode;
+class MFBuilderDummyNode;
class MFBuilderSocket;
class MFBuilderInputSocket;
@@ -30,7 +30,7 @@ class MFBuilderNode : BLI::NonCopyable, BLI::NonMovable {
Vector<MFBuilderInputSocket *> m_inputs;
Vector<MFBuilderOutputSocket *> m_outputs;
uint m_id;
- bool m_is_placeholder;
+ bool m_is_dummy;
friend MFNetworkBuilder;
@@ -45,10 +45,10 @@ class MFBuilderNode : BLI::NonCopyable, BLI::NonMovable {
uint id();
bool is_function();
- bool is_placeholder();
+ bool is_dummy();
MFBuilderFunctionNode &as_function();
- MFBuilderPlaceholderNode &as_placeholder();
+ MFBuilderDummyNode &as_dummy();
};
class MFBuilderFunctionNode : public MFBuilderNode {
@@ -66,7 +66,7 @@ class MFBuilderFunctionNode : public MFBuilderNode {
ArrayRef<uint> output_param_indices();
};
-class MFBuilderPlaceholderNode : public MFBuilderNode {
+class MFBuilderDummyNode : public MFBuilderNode {
};
class MFBuilderSocket : BLI::NonCopyable, BLI::NonMovable {
@@ -120,7 +120,7 @@ class MFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
Vector<MFBuilderSocket *> m_socket_by_id;
Vector<MFBuilderFunctionNode *> m_function_nodes;
- Vector<MFBuilderPlaceholderNode *> m_placeholder_nodes;
+ Vector<MFBuilderDummyNode *> m_dummy_nodes;
Vector<MFBuilderInputSocket *> m_input_sockets;
Vector<MFBuilderOutputSocket *> m_output_sockets;
@@ -133,8 +133,8 @@ class MFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
MFBuilderFunctionNode &add_function(const MultiFunction &function,
ArrayRef<uint> input_param_indices,
ArrayRef<uint> output_param_indices);
- MFBuilderPlaceholderNode &add_placeholder(ArrayRef<MFDataType> input_types,
- ArrayRef<MFDataType> output_types);
+ MFBuilderDummyNode &add_dummy(ArrayRef<MFDataType> input_types,
+ ArrayRef<MFDataType> output_types);
void add_link(MFBuilderOutputSocket &from, MFBuilderInputSocket &to);
ArrayRef<MFBuilderNode *> nodes_by_id() const
@@ -152,9 +152,9 @@ class MFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
return m_function_nodes;
}
- ArrayRef<MFBuilderPlaceholderNode *> placeholder_nodes() const
+ ArrayRef<MFBuilderDummyNode *> dummy_nodes() const
{
- return m_placeholder_nodes;
+ return m_dummy_nodes;
}
ArrayRef<MFBuilderInputSocket *> input_sockets() const
@@ -173,7 +173,7 @@ class MFNetworkBuilder : BLI::NonCopyable, BLI::NonMovable {
class MFNode;
class MFFunctionNode;
-class MFPlaceholderNode;
+class MFDummyNode;
class MFSocket;
class MFInputSocket;
@@ -186,7 +186,7 @@ class MFNode : BLI::NonCopyable, BLI::NonMovable {
const MFNetwork *m_network;
Vector<const MFInputSocket *> m_inputs;
Vector<const MFOutputSocket *> m_outputs;
- bool m_is_placeholder;
+ bool m_is_dummy;
uint m_id;
friend MFNetwork;
@@ -200,10 +200,10 @@ class MFNode : BLI::NonCopyable, BLI::NonMovable {
uint id() const;
bool is_function() const;
- bool is_placeholder() const;
+ bool is_dummy() const;
const MFFunctionNode &as_function() const;
- const MFPlaceholderNode &as_placeholder() const;
+ const MFDummyNode &as_dummy() const;
};
class MFFunctionNode : public MFNode {
@@ -221,7 +221,7 @@ class MFFunctionNode : public MFNode {
ArrayRef<uint> output_param_indices() const;
};
-class MFPlaceholderNode : public MFNode {
+class MFDummyNode : public MFNode {
};
class MFSocket : BLI::NonCopyable, BLI::NonMovable {
@@ -277,7 +277,7 @@ class MFNetwork : BLI::NonCopyable, BLI::NonMovable {
Array<MFSocket *> m_socket_by_id;
Vector<MFFunctionNode *> m_function_nodes;
- Vector<MFPlaceholderNode *> m_placeholder_nodes;
+ Vector<MFDummyNode *> m_dummy_nodes;
Vector<MFInputSocket *> m_input_sockets;
Vector<MFOutputSocket *> m_output_sockets;
@@ -317,17 +317,17 @@ inline StringRef MFBuilderNode::name()
return this->as_function().function().name();
}
else {
- return "Placeholder";
+ return "Dummy";
}
}
inline bool MFBuilderNode::is_function()
{
- return !m_is_placeholder;
+ return !m_is_dummy;
}
-inline bool MFBuilderNode::is_placeholder()
+inline bool MFBuilderNode::is_dummy()
{
- return m_is_placeholder;
+ return m_is_dummy;
}
inline MFBuilderFunctionNode &MFBuilderNode::as_function()
@@ -336,10 +336,10 @@ inline MFBuilderFunctionNode &MFBuilderNode::as_function()
return *(MFBuilderFunctionNode *)this;
}
-inline MFBuilderPlaceholderNode &MFBuilderNode::as_placeholder()
+inline MFBuilderDummyNode &MFBuilderNode::as_dummy()
{
- BLI_assert(this->is_placeholder());
- return *(MFBuilderPlaceholderNode *)this;
+ BLI_assert(this->is_dummy());
+ return *(MFBuilderDummyNode *)this;
}
inline const MultiFunction &MFBuilderFunctionNode::function()
@@ -389,7 +389,7 @@ inline StringRef MFBuilderSocket::name()
}
}
else {
- return "Placeholder";
+ return "Dummy";
}
}
@@ -448,12 +448,12 @@ inline uint MFNode::id() const
inline bool MFNode::is_function() const
{
- return !m_is_placeholder;
+ return !m_is_dummy;
}
-inline bool MFNode::is_placeholder() const
+inline bool MFNode::is_dummy() const
{
- return m_is_placeholder;
+ return m_is_dummy;
}
inline const MFFunctionNode &MFNode::as_function() const
@@ -462,10 +462,10 @@ inline const MFFunctionNode &MFNode::as_function() const
return *(MFFunctionNode *)this;
}
-inline const MFPlaceholderNode &MFNode::as_placeholder() const
+inline const MFDummyNode &MFNode::as_dummy() const
{
- BLI_assert(this->is_placeholder());
- return *(const MFPlaceholderNode *)this;
+ BLI_assert(this->is_dummy());
+ return *(const MFDummyNode *)this;
}
inline const MultiFunction &MFFunctionNode::function() const
diff --git a/source/blender/blenkernel/intern/multi_function_network.cc
b/source/blender/blenkernel/intern/multi_function_network.cc
index 769b906826d..97588528d8c 100644
--- a/source/blender/blenkernel/intern/multi_function_network.cc
+++ b/source/blender/blenkernel/intern/multi_function_network.cc
@@ -16,7 +16,7 @@ MFNetworkBuilder::~MFNetworkBuilder()
for (auto node : m_function_nodes) {
delete node;
}
- for (auto node : m_placeholder_nodes) {
+ for (auto node : m_dummy_nodes) {
delete node;
}
for (auto socket : m_input_sockets) {
@@ -43,7 +43,7 @@ MFBuilderFunctionNode &MFNetworkBuilder::add_function(const
MultiFunction &funct
auto node = new MFBuilderFunctionNode();
node->m_network = this;
- node->m_is_placeholder = false;
+ node->m_is_dummy = false;
node->m_function = &function;
node->m_input_param_indices = input_param_indices;
node->m_output_param_indices = output_param_indices;
@@ -86,13 +86,13 @@ MFBuilderFunctionNode &MFNetworkBuilder::add_function(const
MultiFunction &funct
return *node;
}
-MFBuilderPlaceholderNode
&MFNetworkBuilder::add_placeholder(ArrayRef<MFDataType> input_types,
-
ArrayRef<MFDataType> output_types)
+MFBuilderDummyNode &MFNetworkBuilder::add_dummy(ArrayRef<MFDataType>
input_types,
+ ArrayRef<MFDataType>
output_types)
{
- auto node = new MFBuilderPlaceholderNode();
+ auto node = new MFBuilderDummyNode();
node->m_network = this;
- node->m_is_placeholder = true;
+ node->m_is_dummy = true;
node->m_id = m_node_by_id.size();
for (uint i = 0; i < input_types.size(); i++) {
@@ -118,7 +118,7 @@ MFBuilderPlaceholderNode
&MFNetworkBuilder::add_placeholder(ArrayRef<MFDataType>
m_output_sockets.append(output_socket);
}
- m_placeholder_nodes.append(node);
+ m_dummy_nodes.append(node);
m_node_by_id.append(node);
return *node;
}
@@ -260,7 +260,7 @@ MFNetwork::MFNetwork(std::unique_ptr<MFNetworkBuilder>
builder)
node->m_input_param_indices = builder_node->input_param_indices();
node->m_output_param_indices = builder_node->output_param_indices();
node->m_network = this;
- node->m_is_placeholder = false;
+ node->m_is_dummy = false;
for (MFBuilderInputSocket *builder_socket : builder_node->inputs()) {
MFInputSocket *socket = new MFInputSocket();
@@ -291,12 +291,12 @@ MFNetwork::MFNetwork(std::unique_ptr<MFNetworkBuilder>
builder)
m_node_by_id[node->id()] = node;
}
- for (MFBuilderPlaceholderNode *builder_node : builder->placeholder_nodes()) {
- MFPlaceholderNode *node = new MFPlaceholderNode();
+ for (MFBuilderDummyNode *builder_node : builder->dummy_nodes()) {
+ MFDummyNode *node = new MFDummyNode();
node->m_id = builder_node->id();
node->m_network = this;
- node->m_is_placeholder = true;
+ node->m_is_dummy = true;
for (MFBuilderInputSocket *builder_socket : builder_node->inputs()) {
MFInputSocket *socket = new MFInputSocket();
@@ -323,7 +323,7 @@ MFNetwork::MFNetwork(std::unique_ptr<MFNetworkBuilder>
builder)
node->m_outputs.append(socket);
}
- m_placeholder_nodes.append(node);
+ m_dummy_nodes.append(node);
m_node_by_id[node->id()] = node;
}
@@ -349,7 +349,7 @@ MFNetwork::~MFNetwork()
for (auto node : m_function_nodes) {
delete node;
}
- for (auto node : m_placeholder_nodes) {
+ for (auto node : m_dummy_nodes) {
delete node;
}
for (auto socket : m_input_sockets) {
diff --git a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
index 376fc518bc8..427ca00880d 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
@@ -18,14 +18,15 @@ using BKE::GenericMutableArrayRef;
using BKE::GenericVectorArray;
using BKE::GenericVirtualListListRef;
using BKE:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
