#5643: Move finger print helpers to base class

codereader · Jun 21, 2021 · 9c0c68d · 9c0c68d
1 parent dee964f
commit 9c0c68d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 18 deletions.
diff --git a/libs/scene/merge/SelectionGroupMerger.h b/libs/scene/merge/SelectionGroupMerger.h
@@ -49,8 +49,8 @@ class SelectionGroupMerger :
     selection::ISelectionGroupManager& _sourceManager;
     selection::ISelectionGroupManager& _baseManager;
 
-    std::map<std::string, INodePtr> _sourceNodes;
-    std::map<std::string, INodePtr> _baseNodes;
+    NodeFingerprints _sourceNodes;
+    NodeFingerprints _baseNodes;
 
     std::vector<std::size_t> _baseGroupIdsToRemove;
 
@@ -83,24 +83,10 @@ class SelectionGroupMerger :
     void adjustBaseGroups()
     {
         // Collect all source and base nodes for easier lookup
-        _sourceRoot->foreachNode([&](const INodePtr& node)
-        {
-            if (!std::dynamic_pointer_cast<IGroupSelectable>(node)) return true;
-
-            _sourceNodes.emplace(NodeUtils::GetGroupMemberFingerprint(node), node);
-            return true;
-        });
-
+        _sourceNodes = collectNodeFingerprints(_sourceRoot);
         _log << "Got " << _sourceNodes.size() << " groups in the source map" << std::endl;
 
-        _baseRoot->foreachNode([&](const INodePtr& node)
-        {
-            if (!std::dynamic_pointer_cast<IGroupSelectable>(node)) return true;
-
-            _baseNodes.emplace(NodeUtils::GetGroupMemberFingerprint(node), node);
-            return true;
-        });
-
+        _baseNodes = collectNodeFingerprints(_baseRoot);
         _log << "Got " << _baseNodes.size() << " in the base map" << std::endl;
 
         _log << "Start Processing base groups" << std::endl;

diff --git a/libs/scene/merge/SelectionGroupMergerBase.h b/libs/scene/merge/SelectionGroupMergerBase.h
@@ -37,6 +37,24 @@ class SelectionGroupMergerBase
 
         return members;
     }
+
+    using NodeFingerprints = std::map<std::string, scene::INodePtr>;
+
+    NodeFingerprints collectNodeFingerprints(const IMapRootNodePtr& root)
+    {
+        NodeFingerprints result;
+
+        // Collect all source and base nodes for easier lookup
+        root->foreachNode([&](const INodePtr& node)
+        {
+            if (!std::dynamic_pointer_cast<IGroupSelectable>(node)) return true;
+
+            result.emplace(NodeUtils::GetGroupMemberFingerprint(node), node);
+            return true;
+        });
+
+        return result;
+    }
 };
 
 }

diff --git a/libs/scene/merge/ThreeWaySelectionGroupMerger.h b/libs/scene/merge/ThreeWaySelectionGroupMerger.h
@@ -20,6 +20,10 @@ class ThreeWaySelectionGroupMerger :
     selection::ISelectionGroupManager& _sourceManager;
     selection::ISelectionGroupManager& _targetManager;
 
+    NodeFingerprints _baseNodes;
+    NodeFingerprints _sourceNodes;
+    NodeFingerprints _targetNodes;
+
 public:
     ThreeWaySelectionGroupMerger(const IMapRootNodePtr& baseRoot, const IMapRootNodePtr& sourceRoot, const IMapRootNodePtr& targetRoot) :
         _baseRoot(baseRoot),
@@ -47,7 +51,15 @@ class ThreeWaySelectionGroupMerger :
 
     void adjustTargetGroups()
     {
+        // Collect all node fingerprints for easier lookup
+        _sourceNodes = collectNodeFingerprints(_sourceRoot);
+        _log << "Got " << _sourceNodes.size() << " groups in the source map" << std::endl;
+
+        _targetNodes = collectNodeFingerprints(_targetRoot);
+        _log << "Got " << _targetNodes.size() << " in the target map" << std::endl;
 
+        _baseNodes = collectNodeFingerprints(_baseRoot);
+        _log << "Got " << _baseNodes.size() << " in the base map" << std::endl;
     }
 };