Make drawing faster by storing nodes always ordered by id instead of sorting them all the time.

Author: kovacsv

Sources/NodeEngine/NE_NodeGroupList.cpp

@@ -81,6 +81,11 @@ void NodeGroupList::DeleteGroup (const NodeGroupId& groupId)
 	groupIdToNodes.erase (groupId);
 }
 
+void NodeGroupList::MakeSorted ()
+{
+	groups.MakeSorted ();
+}
+
 void NodeGroupList::AddNodeToGroup (const NodeGroupId& groupId, const NodeId& nodeId)
 {
 	if (DBGERROR (!groups.Contains (groupId))) {

Sources/NodeEngine/NE_NodeGroupList.hpp

@@ -26,6 +26,7 @@ class NodeGroupList
 
 	bool					AddGroup (const NodeGroupPtr& group);
 	void					DeleteGroup (const NodeGroupId& groupId);
+	void					MakeSorted ();
 
 	void					AddNodeToGroup (const NodeGroupId& groupId, const NodeId& nodeId);
 	void					RemoveNodeFromGroup (const NodeId& nodeId);

Sources/NodeEngine/NE_NodeList.cpp

@@ -59,6 +59,11 @@ bool NodeList::DeleteNode (const NodeId& nodeId)
 	return nodes.Erase (nodeId);
 }
 
+void NodeList::MakeSorted ()
+{
+	nodes.MakeSorted ();
+}
+
 void NodeList::Clear ()
 {
 	nodes.Clear ();

Sources/NodeEngine/NE_NodeList.hpp

@@ -23,6 +23,7 @@ class NodeList
 
 	bool			AddNode (const NodeId& nodeId, const NodePtr& nodePtr);
 	bool			DeleteNode (const NodeId& nodeId);
+	void			MakeSorted ();
 	void			Clear ();
 
 	void			Enumerate (const std::function<bool (NodePtr)>& processor);

Sources/NodeEngine/NE_NodeManager.cpp

@@ -10,7 +10,7 @@
 namespace NE
 {
 
-SERIALIZATION_INFO (NodeManager, 3);
+SERIALIZATION_INFO (NodeManager, 4);
 
 template <typename SlotListType, typename SlotType>
 static bool HasDuplicates (const SlotListType& slots)
@@ -615,6 +615,12 @@ NodeGroupPtr NodeManager::AddNodeGroup (const NodeGroupPtr& group)
 	return AddNodeGroup (group, IdPolicy::GenerateNew);
 }
 
+void NodeManager::MakeNodesAndGroupsSorted ()
+{
+	nodeList.MakeSorted ();
+	nodeGroupList.MakeSorted ();
+}
+
 void NodeManager::DeleteNodeGroup (const NodeGroupId& groupId)
 {
 	return nodeGroupList.DeleteGroup (groupId);

Sources/NodeEngine/NE_NodeManager.hpp

@@ -156,6 +156,7 @@ class NodeManager
 
 	NodePtr				AddNode (const NodePtr& node, IdPolicy idHandling, InitPolicy initPolicy);
 	NodeGroupPtr		AddNodeGroup (const NodeGroupPtr& group, IdPolicy idHandling);
+	void				MakeNodesAndGroupsSorted ();
 
 	UniqueIdGenerator						idGenerator;
 	NodeList								nodeList;

Sources/NodeEngine/NE_NodeManagerMerge.cpp

@@ -256,6 +256,7 @@ bool NodeManagerMerge::UpdateNodeManager (const NodeManager& source, NodeManager
 		return true;
 	});
 
+	target.MakeNodesAndGroupsSorted ();
 	return true;
 }
 

Sources/NodeEngine/NE_NodeManagerSerialization.cpp

@@ -27,6 +27,10 @@ Stream::Status NodeManagerSerialization::Read (NodeManager& nodeManager, InputSt
 		return groupStatus;
 	}
 
+	if (header.GetVersion () < 4) {
+		nodeManager.MakeNodesAndGroupsSorted ();
+	}
+
 	ReadEnum (inputStream, nodeManager.updateMode);
 
 	return inputStream.GetStatus ();

Sources/NodeEngine/NE_OrderedMap.hpp

@@ -34,6 +34,7 @@ class OrderedMap
 	bool			Insert (const Key& key, const Value& value);
 	bool			InsertBefore (const Key& key, const Value& value, const Key& nextKey);
 	bool			InsertAfter (const Key& key, const Value& value, const Key& prevKey);
+	void			MakeSorted ();
 	bool			Erase (const Key& key);
 	void			Clear ();
 
@@ -186,6 +187,14 @@ bool OrderedMap<Key, Value>::InsertAfter (const Key& key, const Value& value, co
 	return true;
 }
 
+template <typename Key, typename Value>
+void OrderedMap<Key, Value>::MakeSorted ()
+{
+	valueList.sort ([&] (const KeyValue& a, const KeyValue& b) {
+		return a.first < b.first;
+	});
+}
+
 template <typename Key, typename Value>
 bool OrderedMap<Key, Value>::Erase (const Key& key)
 {

Sources/NodeEngineTest/NodeEditorVisualTest.cpp

@@ -566,4 +566,38 @@ TEST (AlignNodesTest)
 	}
 }
 
+TEST (NodeOrderTest)
+{
+	NodeEditorTestEnv env (GetDefaultSkinParams ());
+	Point padding (10.0, 10.0);
+
+	{ // create two nodes
+		env.nodeEditor.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Number 1"), Point (100.0, 100.0), 0.0, 1.0)));
+		env.nodeEditor.AddNode (UINodePtr (new DoubleUpDownNode (LocString (L"Number 2"), Point (150.0, 100.0), 0.0, 1.0)));
+		ASSERT (env.CheckReference (L"NodeOrderTest_Initial.svg"));
+	}
+
+	{ // select top node
+		env.Click (env.GetNodeRect (env.GetNode (L"Number 2")).GetTopLeft () + padding);
+		ASSERT (env.CheckReference (L"NodeOrderTest_Number2Selected.svg"));
+	}
+
+	{ // delete bottom node
+		env.ExecuteCommand (CommandCode::Escape);
+		env.SetNextCommandName (L"Delete Nodes");
+		env.RightClick (env.GetNodeRect (env.GetNode (L"Number 1")).GetTopLeft () + padding);
+		ASSERT (env.CheckReference (L"NodeOrderTest_Number1Deleted.svg"));
+	}
+
+	{ // undo delete
+		env.ExecuteCommand (CommandCode::Undo);
+		ASSERT (env.CheckReference (L"NodeOrderTest_Number1Recreated.svg"));
+	}
+
+	{ // select top node
+		env.Click (env.GetNodeRect (env.GetNode (L"Number 2")).GetTopLeft () + padding);
+		ASSERT (env.CheckReference (L"NodeOrderTest_Number2SelectedAfterUndo.svg"));
+	}
+}
+
 }