Replaced raw function pointers with std::function in NodeArea class; Breaking Change: NodeArea::RunOnEachConnectedNode was erroneously running the function on the node itself, this has been fixed.

Author: Azzinoth

SubSystems/VisualNodeArea/VisualNodeArea.cpp

@@ -58,7 +58,7 @@ void NodeArea::Update()
 		Render();
 }
 
-void NodeArea::SetMainContextMenuFunction(void(*Function)())
+void NodeArea::SetMainContextMenuFunction(const std::function<void()>& Function)
 {
 	MainContextMenuFunction = Function;
 }

SubSystems/VisualNodeArea/VisualNodeArea.h

@@ -190,8 +190,8 @@ namespace VisNodeSys
 		void DeleteNode(const Node* Node);
 		size_t GetNodeCount() const;
 		void AddNodeEventCallback(std::function<void(Node*, NODE_EVENT)> Func);
-		void RunOnEachNode(void(*Func)(Node*));
-		void RunOnEachConnectedNode(Node* StartNode, void(*Func)(Node*));
+		void RunOnEachNode(const std::function<void(Node*)>& Function);
+		void RunOnEachConnectedNode(Node* StartNode, const std::function<void(Node*)>& Function);
 		void PropagateUpdateToConnectedNodes(const Node* CallerNode) const;
 
 		bool TriggerSocketEvent(NodeSocket* CallerNodeSocket, NodeSocket* TriggeredNodeSocket, NODE_SOCKET_EVENT EventType);
@@ -209,7 +209,7 @@ namespace VisNodeSys
 		std::vector<RerouteNode*> GetRerouteNodesInGroupComment(GroupComment* GroupCommentToCheck) const;
 		std::vector<GroupComment*> GetGroupCommentsInGroupComment(GroupComment* GroupCommentToCheck) const;
 
-		void SetMainContextMenuFunction(void(*Function)());
+		void SetMainContextMenuFunction(const std::function<void()>& Function);
 
 		void GetAllElementsAABB(ImVec2& Min, ImVec2& Max) const;
 		ImVec2 GetAllElementsAABBCenter() const;
@@ -312,7 +312,7 @@ namespace VisNodeSys
 		ImVec2 Position;
 		ImVec2 Size;
 		ImVec2 RenderOffset = ImVec2(0.0, 0.0);
-		void(*MainContextMenuFunction)() = nullptr;
+		std::function<void()> MainContextMenuFunction = nullptr;
 		void RenderDefaultMainContextMenu(ImVec2 LocalMousePosition);
 		std::vector<std::function<void(Node*, NODE_EVENT)>> NodeEventsCallbacks;
 		std::queue<SocketEvent> SocketEventQueue;

SubSystems/VisualNodeArea/VisualNodeAreaLogic.cpp

@@ -391,15 +391,15 @@ bool NodeArea::IsConnected(const Node* OutNode, std::string OutSocketID, const N
 	return IsConnected(OutNode, OutSocketIndex, InNode, InSocketIndex);
 }
 
-void NodeArea::RunOnEachNode(void(*Func)(Node*))
+void NodeArea::RunOnEachNode(const std::function<void(Node*)>& Function)
 {
-	if (Func != nullptr)
-		std::for_each(Nodes.begin(), Nodes.end(), Func);
+	if (Function != nullptr)
+		std::for_each(Nodes.begin(), Nodes.end(), Function);
 }
 
-void NodeArea::RunOnEachConnectedNode(Node* StartNode, void(*Func)(Node*))
+void NodeArea::RunOnEachConnectedNode(Node* StartNode, const std::function<void(Node*)>& Function)
 {
-	if (Func == nullptr)
+	if (Function == nullptr)
 		return;
 
 	static std::unordered_map<Node*, bool> SeenNodes;
@@ -415,9 +415,13 @@ void NodeArea::RunOnEachConnectedNode(Node* StartNode, void(*Func)(Node*))
 	};
 
 	std::vector<Node*> CurrentNodes;
-	CurrentNodes.push_back(StartNode);
-	if (bWasNodeSeen(StartNode))
-		return;
+	std::vector<Node*> NewNodes = StartNode->GetNodesConnectedToOutput();
+	for (size_t j = 0; j < NewNodes.size(); j++)
+	{
+		CurrentNodes.push_back(NewNodes[j]);
+		if (bWasNodeSeen(NewNodes[j]))
+			return;
+	}
 
 	while (!IsEmptyOrFilledByNulls(CurrentNodes))
 	{
@@ -430,7 +434,7 @@ void NodeArea::RunOnEachConnectedNode(Node* StartNode, void(*Func)(Node*))
 				continue;
 			}
 
-			Func(CurrentNodes[i]);
+			Function(CurrentNodes[i]);
 
 			std::vector<Node*> NewNodes = CurrentNodes[i]->GetNodesConnectedToOutput();
 			for (size_t j = 0; j < NewNodes.size(); j++)