diff options
author | Jacques Lucke <mail@jlucke.com> | 2020-01-03 15:40:31 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2020-01-03 15:40:31 +0300 |
commit | 35aaf2fe518fbcf8fcef8ca7403ff60c13ef1ae4 (patch) | |
tree | 5d23b73822ab4cc0f46fdbcfac1a019fcd893a3a /source/blender/functions | |
parent | 9c2e7a4e1cd4deb8ead7ed249ed8ad0f26c07f68 (diff) |
use IndexToRefMap instead of IndexMap
Diffstat (limited to 'source/blender/functions')
-rw-r--r-- | source/blender/functions/FN_node_tree_multi_function_network.h | 20 | ||||
-rw-r--r-- | source/blender/functions/intern/node_tree_multi_function_network/builder.cc | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/functions/FN_node_tree_multi_function_network.h b/source/blender/functions/FN_node_tree_multi_function_network.h index 206d285384f..fb2519ff866 100644 --- a/source/blender/functions/FN_node_tree_multi_function_network.h +++ b/source/blender/functions/FN_node_tree_multi_function_network.h @@ -4,13 +4,13 @@ #include "FN_node_tree.h" #include "BLI_multi_map.h" -#include "BLI_index_map.h" +#include "BLI_index_to_ref_map.h" #include "FN_multi_function_network.h" namespace FN { -using BLI::IndexMap; +using BLI::IndexToRefMap; using BLI::MultiMap; #define IdMultiMap_UNMAPPED UINT_MAX @@ -80,14 +80,14 @@ class InlinedTreeMFSocketMap { const FunctionNodeTree *m_function_tree; const MFNetwork *m_network; - IndexMap<const MFSocket *> m_dummy_socket_by_fsocket_id; - IndexMap<const FSocket *> m_fsocket_by_dummy_socket_id; + IndexToRefMap<const MFSocket> m_dummy_socket_by_fsocket_id; + IndexToRefMap<const FSocket> m_fsocket_by_dummy_socket_id; public: InlinedTreeMFSocketMap(const FunctionNodeTree &function_tree, const MFNetwork &network, - IndexMap<const MFSocket *> dummy_socket_by_fsocket_id, - IndexMap<const FSocket *> fsocket_by_dummy_socket_id) + IndexToRefMap<const MFSocket> dummy_socket_by_fsocket_id, + IndexToRefMap<const FSocket> fsocket_by_dummy_socket_id) : m_function_tree(&function_tree), m_network(&network), m_dummy_socket_by_fsocket_id(std::move(dummy_socket_by_fsocket_id)), @@ -107,24 +107,24 @@ class InlinedTreeMFSocketMap { const MFInputSocket &lookup_singly_mapped_input_socket(const FInputSocket &fsocket) const { - return m_dummy_socket_by_fsocket_id.lookup(fsocket.id())->as_input(); + return m_dummy_socket_by_fsocket_id.lookup(fsocket.id()).as_input(); } const MFOutputSocket &lookup_socket(const FOutputSocket &fsocket) const { - return m_dummy_socket_by_fsocket_id.lookup(fsocket.id())->as_output(); + return m_dummy_socket_by_fsocket_id.lookup(fsocket.id()).as_output(); } const FInputSocket &lookup_fsocket(const MFInputSocket &socket) const { BLI_assert(socket.node().is_dummy()); - return m_fsocket_by_dummy_socket_id.lookup(socket.id())->as_input(); + return m_fsocket_by_dummy_socket_id.lookup(socket.id()).as_input(); } const FOutputSocket &lookup_fsocket(const MFOutputSocket &socket) const { BLI_assert(socket.node().is_dummy()); - return m_fsocket_by_dummy_socket_id.lookup(socket.id())->as_output(); + return m_fsocket_by_dummy_socket_id.lookup(socket.id()).as_output(); } }; 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 ad982c8e6cf..b5c97de7b3f 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 @@ -203,8 +203,8 @@ std::unique_ptr<FunctionTreeMFNetwork> FunctionTreeMFNetworkBuilder::build() { // m_builder->to_dot__clipboard(); - IndexMap<const MFSocket *> dummy_socket_by_fsocket_id(m_function_tree.socket_count(), nullptr); - IndexMap<const FSocket *> fsocket_by_dummy_socket_id(m_builder->sockets_by_id().size(), nullptr); + IndexToRefMap<const MFSocket> dummy_socket_by_fsocket_id(m_function_tree.socket_count()); + IndexToRefMap<const FSocket> fsocket_by_dummy_socket_id(m_builder->sockets_by_id().size()); auto network = BLI::make_unique<MFNetwork>(std::move(m_builder)); @@ -213,8 +213,8 @@ std::unique_ptr<FunctionTreeMFNetwork> FunctionTreeMFNetworkBuilder::build() for (uint mapped_id : mapped_ids) { const MFSocket &socket = network->socket_by_id(mapped_id); if (socket.node().is_dummy()) { - dummy_socket_by_fsocket_id.add_new(fsocket->id(), &socket); - fsocket_by_dummy_socket_id.add_new(socket.id(), fsocket); + dummy_socket_by_fsocket_id.add_new(fsocket->id(), socket); + fsocket_by_dummy_socket_id.add_new(socket.id(), *fsocket); } } } |