From 93e2491ee724874a28030ae4d32f39bed6835923 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 16 Mar 2021 15:02:37 +0100 Subject: Cleanup: replace std::map with blender::Map. --- .../compositor/intern/COM_NodeOperationBuilder.cc | 44 ++++++---------------- .../compositor/intern/COM_NodeOperationBuilder.h | 14 +------ 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc index 46954e04cb8..aac1d1d747c 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc @@ -67,19 +67,19 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system) * Inverting yields a map of node inputs to all connected operation inputs, * so multiple operations can use the same node input. */ - OpInputInverseMap inverse_input_map; - for (InputSocketMap::const_iterator it = m_input_map.begin(); it != m_input_map.end(); ++it) { - inverse_input_map[it->second].append(it->first); + blender::Map> inverse_input_map; + for (blender::Map::MutableItem item : m_input_map.items()) { + inverse_input_map.lookup_or_add_default(item.value).append(item.key); } for (const NodeGraph::Link &link : m_graph.links()) { NodeOutput *from = link.from; NodeInput *to = link.to; - NodeOperationOutput *op_from = find_operation_output(m_output_map, from); - const blender::Vector &op_to_list = find_operation_inputs( - inverse_input_map, to); - if (!op_from || op_to_list.is_empty()) { + NodeOperationOutput *op_from = m_output_map.lookup(from); + + const blender::Vector *op_to_list = inverse_input_map.lookup_ptr(to); + if (!op_from || op_to_list == nullptr || op_to_list->is_empty()) { /* XXX allow this? error/debug message? */ // BLI_assert(false); /* XXX note: this can happen with certain nodes (e.g. OutputFile) @@ -89,7 +89,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system) continue; } - for (NodeOperationInput *op_to : op_to_list) { + for (NodeOperationInput *op_to : *op_to_list) { addLink(op_from, op_to); } } @@ -136,7 +136,7 @@ void NodeOperationBuilder::mapInputSocket(NodeInput *node_socket, * for resolving links the map will be inverted first in convertToOperations, * to get a list of links for each node input socket. */ - m_input_map[operation_socket] = node_socket; + m_input_map.add_new(operation_socket, node_socket); } void NodeOperationBuilder::mapOutputSocket(NodeOutput *node_socket, @@ -145,7 +145,7 @@ void NodeOperationBuilder::mapOutputSocket(NodeOutput *node_socket, BLI_assert(m_current_node); BLI_assert(node_socket->getNode() == m_current_node); - m_output_map[node_socket] = operation_socket; + m_output_map.add_new(node_socket, operation_socket); } void NodeOperationBuilder::addLink(NodeOperationOutput *from, NodeOperationInput *to) @@ -175,28 +175,6 @@ void NodeOperationBuilder::removeInputLink(NodeOperationInput *to) } } -NodeInput *NodeOperationBuilder::find_node_input(const InputSocketMap &map, - NodeOperationInput *op_input) -{ - InputSocketMap::const_iterator it = map.find(op_input); - return (it != map.end() ? it->second : NULL); -} - -const blender::Vector &NodeOperationBuilder::find_operation_inputs( - const OpInputInverseMap &map, NodeInput *node_input) -{ - static const blender::Vector empty_list; - OpInputInverseMap::const_iterator it = map.find(node_input); - return (it != map.end() ? it->second : empty_list); -} - -NodeOperationOutput *NodeOperationBuilder::find_operation_output(const OutputSocketMap &map, - NodeOutput *node_output) -{ - OutputSocketMap::const_iterator it = map.find(node_output); - return (it != map.end() ? it->second : NULL); -} - PreviewOperation *NodeOperationBuilder::make_preview_operation() const { BLI_assert(m_current_node); @@ -312,7 +290,7 @@ void NodeOperationBuilder::add_operation_input_constants() } for (Inputs::const_iterator it = pending_inputs.begin(); it != pending_inputs.end(); ++it) { NodeOperationInput *input = *it; - add_input_constant_value(input, find_node_input(m_input_map, input)); + add_input_constant_value(input, m_input_map.lookup(input)); } } diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 391c40116a7..5d497e8ec7d 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -62,10 +62,6 @@ class NodeOperationBuilder { } }; - typedef std::map InputSocketMap; - typedef std::map OutputSocketMap; - typedef std::map> OpInputInverseMap; - private: const CompositorContext *m_context; NodeGraph m_graph; @@ -75,9 +71,9 @@ class NodeOperationBuilder { blender::Vector m_groups; /** Maps operation inputs to node inputs */ - InputSocketMap m_input_map; + blender::Map m_input_map; /** Maps node outputs to operation outputs */ - OutputSocketMap m_output_map; + blender::Map m_output_map; Node *m_current_node; @@ -122,12 +118,6 @@ class NodeOperationBuilder { } protected: - static NodeInput *find_node_input(const InputSocketMap &map, NodeOperationInput *op_input); - static const blender::Vector &find_operation_inputs( - const OpInputInverseMap &map, NodeInput *node_input); - static NodeOperationOutput *find_operation_output(const OutputSocketMap &map, - NodeOutput *node_output); - /** Add datatype conversion where needed */ void add_datatype_conversions(); -- cgit v1.2.3