[Bf-blender-cvs] [36221652a4d] functions: rename various types and variables
Jacques Lucke
noreply at git.blender.org
Thu Jan 2 16:37:35 CET 2020
Commit: 36221652a4d9ef3ab7fe0f87939b1a3d9660325c
Author: Jacques Lucke
Date: Tue Dec 31 14:17:44 2019 +0100
Branches: functions
https://developer.blender.org/rB36221652a4d9ef3ab7fe0f87939b1a3d9660325c
rename various types and variables
===================================================================
M source/blender/functions/CMakeLists.txt
D source/blender/functions/FN_inlined_tree_multi_function_network.h
D source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
M source/blender/functions/FN_multi_function_dependencies.h
M source/blender/functions/FN_node_tree.h
A source/blender/functions/FN_node_tree_multi_function_network.h
A source/blender/functions/FN_node_tree_multi_function_network_generation.h
D source/blender/functions/intern/inlined_tree_multi_function_network/builder.cc
M source/blender/functions/intern/node_tree.cc
A source/blender/functions/intern/node_tree_multi_function_network/builder.cc
R053 source/blender/functions/intern/inlined_tree_multi_function_network/builder.h source/blender/functions/intern/node_tree_multi_function_network/builder.h
R051 source/blender/functions/intern/inlined_tree_multi_function_network/generate.cc source/blender/functions/intern/node_tree_multi_function_network/generate.cc
R054 source/blender/functions/intern/inlined_tree_multi_function_network/mappings.cc source/blender/functions/intern/node_tree_multi_function_network/mappings.cc
R059 source/blender/functions/intern/inlined_tree_multi_function_network/mappings.h source/blender/functions/intern/node_tree_multi_function_network/mappings.h
R061 source/blender/functions/intern/inlined_tree_multi_function_network/mappings_nodes.cc source/blender/functions/intern/node_tree_multi_function_network/mappings_nodes.cc
R095 source/blender/functions/intern/inlined_tree_multi_function_network/mappings_sockets.cc source/blender/functions/intern/node_tree_multi_function_network/mappings_sockets.cc
M source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
M source/blender/modifiers/intern/MOD_functionpoints_cxx.cc
M source/blender/simulations/bparticles/node_frontend.cpp
M source/blender/simulations/bparticles/node_frontend.hpp
===================================================================
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 4bd7e4f3c68..19034a59133 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -30,11 +30,11 @@ set(SRC
intern/multi_functions/sampling_util.cc
intern/multi_functions/surface_hook.cc
intern/multi_functions/vectorize.cc
- intern/inlined_tree_multi_function_network/builder.cc
- intern/inlined_tree_multi_function_network/generate.cc
- intern/inlined_tree_multi_function_network/mappings_nodes.cc
- intern/inlined_tree_multi_function_network/mappings_sockets.cc
- intern/inlined_tree_multi_function_network/mappings.cc
+ intern/node_tree_multi_function_network/builder.cc
+ intern/node_tree_multi_function_network/generate.cc
+ intern/node_tree_multi_function_network/mappings_nodes.cc
+ intern/node_tree_multi_function_network/mappings_sockets.cc
+ intern/node_tree_multi_function_network/mappings.cc
intern/attributes_block_container.cc
intern/attributes_ref.cc
intern/cpp_type.cc
@@ -64,8 +64,8 @@ set(SRC
FN_multi_function_param_type.h
FN_multi_function.h
FN_multi_functions.h
- FN_inlined_tree_multi_function_network_generation.h
- FN_inlined_tree_multi_function_network.h
+ FN_node_tree_multi_function_network_generation.h
+ FN_node_tree_multi_function_network.h
FN_node_tree.h
intern/multi_functions/customizable.h
@@ -77,8 +77,8 @@ set(SRC
intern/multi_functions/surface_hook.h
intern/multi_functions/util.h
intern/multi_functions/vectorize.h
- intern/inlined_tree_multi_function_network/builder.h
- intern/inlined_tree_multi_function_network/mappings.h
+ intern/node_tree_multi_function_network/builder.h
+ intern/node_tree_multi_function_network/mappings.h
intern/cpp_types.h
)
diff --git a/source/blender/functions/FN_inlined_tree_multi_function_network.h b/source/blender/functions/FN_inlined_tree_multi_function_network.h
deleted file mode 100644
index c2fa36ac2b4..00000000000
--- a/source/blender/functions/FN_inlined_tree_multi_function_network.h
+++ /dev/null
@@ -1,187 +0,0 @@
-#ifndef __FN_VTREE_MULTI_FUNCTION_NETWORK_H__
-#define __FN_VTREE_MULTI_FUNCTION_NETWORK_H__
-
-#include "FN_node_tree.h"
-
-#include "BLI_multi_map.h"
-
-#include "FN_multi_function_network.h"
-
-namespace FN {
-
-using BLI::MultiMap;
-
-#define InlinedTreeMFSocketMap_UNMAPPED UINT_MAX
-#define InlinedTreeMFSocketMap_MULTIMAPPED (UINT_MAX - 1)
-
-class InlinedTreeMFSocketMap {
- private:
- /* An input xsocket can be mapped to multiple sockets.
- * An output xsocket can be mapped to at most one socket.
- */
- const InlinedNodeTree *m_inlined_tree;
- const MFNetwork *m_network;
- Array<uint> m_single_socket_by_xsocket;
- MultiMap<uint, uint> m_multiple_inputs_by_xsocket;
- Array<uint> m_xsocket_by_socket;
-
- public:
- 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)),
- m_multiple_inputs_by_xsocket(std::move(multiple_inputs_by_xsocket)),
- m_xsocket_by_socket(std::move(xsocket_by_socket))
- {
- }
-
- bool is_mapped(const XSocket &xsocket) const
- {
- return m_single_socket_by_xsocket[xsocket.id()] < InlinedTreeMFSocketMap_MULTIMAPPED;
- }
-
- bool is_mapped(const MFSocket &socket) const
- {
- return m_xsocket_by_socket[socket.id()] != InlinedTreeMFSocketMap_UNMAPPED;
- }
-
- const MFInputSocket &lookup_singly_mapped_input_socket(const XInputSocket &xsocket) const
- {
- BLI_assert(this->lookup_socket(xsocket).size() == 1);
- uint mapped_id = m_single_socket_by_xsocket[xsocket.id()];
- return m_network->socket_by_id(mapped_id).as_input();
- }
-
- Vector<const MFInputSocket *> lookup_socket(const XInputSocket &xsocket) const
- {
- uint id = xsocket.id();
- uint mapped_value = m_single_socket_by_xsocket[id];
- switch (mapped_value) {
- case InlinedTreeMFSocketMap_UNMAPPED: {
- return {};
- }
- 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());
- }
- return sockets;
- }
- default: {
- uint mapped_id = mapped_value;
- const MFInputSocket &socket = m_network->socket_by_id(mapped_id).as_input();
- return {&socket};
- }
- }
- }
-
- const MFOutputSocket &lookup_socket(const XOutputSocket &xsocket) const
- {
- uint mapped_id = m_single_socket_by_xsocket[xsocket.id()];
- return m_network->socket_by_id(mapped_id).as_output();
- }
-
- const XInputSocket &lookup_xsocket(const MFInputSocket &socket) const
- {
- uint mapped_id = m_xsocket_by_socket[socket.id()];
- return m_inlined_tree->socket_by_id(mapped_id).as_input();
- }
-
- const XOutputSocket &lookup_xsocket(const MFOutputSocket &socket) const
- {
- uint mapped_id = m_xsocket_by_socket[socket.id()];
- return m_inlined_tree->socket_by_id(mapped_id).as_output();
- }
-};
-
-class InlinedTreeMFNetwork {
- private:
- const InlinedNodeTree &m_inlined_tree;
- std::unique_ptr<MFNetwork> m_network;
- InlinedTreeMFSocketMap m_socket_map;
-
- public:
- 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))
- {
- }
-
- const InlinedNodeTree &inlined_tree() const
- {
- return m_inlined_tree;
- }
-
- const MFNetwork &network() const
- {
- return *m_network;
- }
-
- bool is_mapped(const XSocket &xsocket) const
- {
- return m_socket_map.is_mapped(xsocket);
- }
-
- bool is_mapped(const MFSocket &socket) const
- {
- return m_socket_map.is_mapped(socket);
- }
-
- const MFInputSocket &lookup_dummy_socket(const XInputSocket &xsocket) const
- {
- const MFInputSocket &socket = m_socket_map.lookup_singly_mapped_input_socket(xsocket);
- BLI_assert(socket.node().is_dummy());
- return socket;
- }
-
- const MFOutputSocket &lookup_dummy_socket(const XOutputSocket &xsocket) const
- {
- const MFOutputSocket &socket = this->lookup_socket(xsocket);
- BLI_assert(socket.node().is_dummy());
- return socket;
- }
-
- const MFOutputSocket &lookup_socket(const XOutputSocket &xsocket) const
- {
- return m_socket_map.lookup_socket(xsocket);
- }
-
- const XInputSocket &lookup_xsocket(const MFInputSocket &socket) const
- {
- return m_socket_map.lookup_xsocket(socket);
- }
-
- const XOutputSocket &lookup_xsocket(const MFOutputSocket &socket) const
- {
- return m_socket_map.lookup_xsocket(socket);
- }
-
- void lookup_dummy_sockets(ArrayRef<const XOutputSocket *> xsockets,
- MutableArrayRef<const MFOutputSocket *> r_result) const
- {
- BLI_assert(xsockets.size() == r_result.size());
- for (uint i : xsockets.index_iterator()) {
- r_result[i] = &this->lookup_socket(*xsockets[i]);
- }
- }
-
- void lookup_dummy_sockets(ArrayRef<const XInputSocket *> xsockets,
- MutableArrayRef<const MFInputSocket *> r_result) const
- {
- BLI_assert(xsockets.size() == r_result.size());
- for (uint i : xsockets.index_iterator()) {
- r_result[i] = &this->lookup_dummy_socket(*xsockets[i]);
- }
- }
-};
-
-} // namespace FN
-
-#endif /* __FN_VTREE_MULTI_FUNCTION_NETWORK_H__ */
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
deleted file mode 100644
index 1c9f612719b..00000000000
--- a/source/blender/functions/FN_inlined_tree_multi_function_network_generation.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__
-#define __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__
-
-#include "FN_inlined_tree_multi_function_network.h"
-#include "BLI_resource_collector.h"
-#include "intern/multi_functions/network.h"
-
-namespace FN {
-
-using BLI::ResourceCollector;
-
-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(
- const InlinedNodeTree &inlined_tree, ResourceCollector &resources);
-
-} // namespace FN
-
-#endif /* __FN_VTREE_MULTI_FUNCTION_NETWORK_GENERATION_H__ */
diff --git a/source/blender/functions/FN_multi_function_dependencies.h b/source/blender/functions/FN_multi_function_dependencies.h
index f34dc24074b..faa8be55776 100644
--- a/source/blender/functions/FN_multi_function_dependencies.h
+++ b/source/blender/functions/FN_multi_function_dependencies.h
@@ -12,18 +12,18 @@ namespace FN {
using BLI::Set;
-inline Set<Object *> get_objects_used_by_sockets(const InlinedNodeTree &inlined_tree)
+inline Set<Object *> get_objects_used_by_sockets(const FunctionNodeTree &function_tree)
{
Set<Object *> objects;
- for (const XSocket *xsocket : inlined_tree.all_sockets()) {
- if (xsocket->idname() == "fn_ObjectSocket") {
- Object *object = (Object *)RNA_pointer_get(xsocket->rna(), "value").data;
+ for (const FSocket *fsocket : function_tree.all_sockets()) {
+ if (fsocket->idname() == "fn_ObjectSocket") {
+ Object *object = (Object *)RNA_pointer_get(fsocket->rna(), "value").data;
if (object != nullptr) {
objects.add(object);
}
}
}
- for (const XGroupInput *group_input : inlined_tree.all_group_inputs()) {
+ for (const FGroupInput *group_input : function_tree.all_group_inputs()) {
if (group_input->vsocket().idname() == "fn_ObjectSocket") {
Object *object = (Object *)RNA_pointer_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list