Move inline lambda token mapping handler to static member of UiToken class

Signed-off-by: mialana <aliu@amyliu.dev>

Author: mialana

source/MaterialXGraphEditor/UiNode.cpp

@@ -97,40 +97,27 @@ mx::NodeGraphPtr UiNode::getNodeGraph() const
 
 void UiNode::buildUiTokenMap()
 {
-    // Helper inline lambda function to avoid repeating code for mapping of tokens declared on element itself vs on element's corresponding nodedef
-    auto handleTokenMapping = [&](const mx::ConstInterfaceElementPtr& interfaceElem, mx::ElementPtr sourceElem)
-    {
-        std::vector<mx::TokenPtr> tokens = interfaceElem->getActiveTokens();
-        for (auto token : tokens)
-        {
-            std::string key = token->getName();
-            
-            // Insert into map, but do not allow parent values to override child values
-            _uiTokenMap.try_emplace(key, std::make_shared<UiToken>(token, sourceElem));
-        }
-    };
-    
     _uiTokenMap.clear(); // Assume we want clean slate
 
     mx::ElementPtr currElem = getNode();
     while (currElem)
     {
         if (mx::ConstInterfaceElementPtr interfaceElem = currElem->asA<mx::InterfaceElement>())
         {
-            handleTokenMapping(interfaceElem, currElem);
+            UiToken::applyTokenMapping(&_uiTokenMap, interfaceElem, currElem);
 
             // If the node is a nodegraph, check for tokens on corresponding nodedef
             if (mx::ConstNodeGraphPtr nodegraph = currElem->asA<mx::NodeGraph>())
             {
                 if (mx::NodeDefPtr nodedef = nodegraph->getNodeDef())
-                    handleTokenMapping(nodedef, nodedef);
+                    UiToken::applyTokenMapping(&_uiTokenMap, nodedef, nodedef);
             }
 
             // If the node is a custom node instance, check for tokens on corresponding nodedef
             if (mx::NodePtr node = currElem->asA<mx::Node>())
             {
                 if (mx::NodeDefPtr nodedef = node->getNodeDef())
-                    handleTokenMapping(nodedef, nodedef);
+                    UiToken::applyTokenMapping(&_uiTokenMap, nodedef, nodedef);
             }
         }
         currElem = currElem->getParent();

source/MaterialXGraphEditor/UiNode.h

@@ -18,9 +18,11 @@ namespace ed = ax::NodeEditor;
 
 class UiNode;
 class UiPin;
+class UiToken;
 
 using UiNodePtr = std::shared_ptr<UiNode>;
 using UiPinPtr = std::shared_ptr<UiPin>;
+using UiTokenPtr = std::shared_ptr<UiToken>;
 
 // An edge between two UiNodes, storing the two nodes and connecting input.
 class UiEdge
@@ -194,6 +196,19 @@ class UiToken
     }
 
     const std::vector<mx::InputPtr>& getAffectedInputs() const { return _affectedInputs; };
+    
+    // Handle update of given map pointer by iterating through active tokens of an interface element
+    static void applyTokenMapping(std::unordered_map<std::string, UiTokenPtr>* uiTokenMapPtr, const mx::ConstInterfaceElementPtr& interfaceElem, mx::ElementPtr sourceElem)
+    {
+        std::vector<mx::TokenPtr> tokens = interfaceElem->getActiveTokens();
+        for (auto token : tokens)
+        {
+            std::string key = token->getName();
+
+            // Insert into map, but do not allow parent values to override child values
+            uiTokenMapPtr->try_emplace(key, std::make_shared<UiToken>(token, sourceElem));
+        }
+    }
 
   private:
     const mx::TokenPtr _tokenPtr;
@@ -220,8 +235,6 @@ class UiToken
     }
 };
 
-using UiTokenPtr = std::shared_ptr<UiToken>;
-
 // The visual representation of a node in a graph.
 class UiNode
 {