AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDeleteSelectionCommand: Make use of ranged for where applicable

This commit is contained in:
Lioncash 2020-07-03 22:09:37 -04:00
parent a03f76e545
commit f60d826be2
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Editor/Undo/CDeleteSelectionCommand.cpp
View File

@ -90,9 +90,8 @@ void CDeleteSelectionCommand::undo()
QList<uint32> NewInstanceIDs; QList<uint32> NewInstanceIDs;
// Spawn nodes // Spawn nodes
for (int iNode = 0; iNode < mDeletedNodes.size(); iNode++) for (SDeletedNode& rNode : mDeletedNodes)
{ {
SDeletedNode& rNode = mDeletedNodes[iNode];
mpEditor->NotifyNodeAboutToBeSpawned(); mpEditor->NotifyNodeAboutToBeSpawned();
CMemoryInStream Mem(rNode.InstanceData.data(), rNode.InstanceData.size(), EEndian::BigEndian); CMemoryInStream Mem(rNode.InstanceData.data(), rNode.InstanceData.size(), EEndian::BigEndian);
@ -105,20 +104,18 @@ void CDeleteSelectionCommand::undo()
pNode->SetRotation(rNode.Rotation); pNode->SetRotation(rNode.Rotation);
pNode->SetScale(rNode.Scale); pNode->SetScale(rNode.Scale);
NewNodes << pNode; NewNodes.push_back(pNode);
NewInstanceIDs << pInstance->InstanceID(); NewInstanceIDs.push_back(pInstance->InstanceID());
mpEditor->NotifyNodeSpawned(*rNode.NodePtr); mpEditor->NotifyNodeSpawned(*rNode.NodePtr);
} }
// Sort links by sender index, add outgoing // Sort links by sender index, add outgoing
std::sort(mDeletedLinks.begin(), mDeletedLinks.end(), [](SDeletedLink& rLeft, SDeletedLink& rRight) -> bool { std::sort(mDeletedLinks.begin(), mDeletedLinks.end(), [](const SDeletedLink& rLeft, const SDeletedLink& rRight) {
return (rLeft.SenderIndex < rRight.SenderIndex); return rLeft.SenderIndex < rRight.SenderIndex;
}); });
for (int iLink = 0; iLink < mDeletedLinks.size(); iLink++) for (SDeletedLink& rLink : mDeletedLinks)
{ {
SDeletedLink& rLink = mDeletedLinks[iLink];
// Adding to the sender is only needed if the sender is not one of the nodes we just spawned. If it is, it already has this link. // Adding to the sender is only needed if the sender is not one of the nodes we just spawned. If it is, it already has this link.
if (!NewInstanceIDs.contains(rLink.SenderID) && *rLink.pSender) if (!NewInstanceIDs.contains(rLink.SenderID) && *rLink.pSender)
{ {
@ -128,14 +125,12 @@ void CDeleteSelectionCommand::undo()
} }
// Sort links by receiver index, add incoming // Sort links by receiver index, add incoming
std::sort(mDeletedLinks.begin(), mDeletedLinks.end(), [](SDeletedLink& rLeft, SDeletedLink& rRight) -> bool { std::sort(mDeletedLinks.begin(), mDeletedLinks.end(), [](const SDeletedLink& rLeft, const SDeletedLink& rRight) {
return (rLeft.ReceiverIndex < rRight.ReceiverIndex); return rLeft.ReceiverIndex < rRight.ReceiverIndex;
}); });
for (int iLink = 0; iLink < mDeletedLinks.size(); iLink++) for (SDeletedLink& rLink : mDeletedLinks)
{ {
SDeletedLink& rLink = mDeletedLinks[iLink];
if (*rLink.pReceiver) if (*rLink.pReceiver)
{ {
CLink *pLink = (*rLink.pSender ? rLink.pSender->Link(ELinkType::Outgoing, rLink.SenderIndex) : new CLink(rLink.pReceiver->Area(), rLink.State, rLink.Message, rLink.SenderID, rLink.ReceiverID)); CLink *pLink = (*rLink.pSender ? rLink.pSender->Link(ELinkType::Outgoing, rLink.SenderIndex) : new CLink(rLink.pReceiver->Area(), rLink.State, rLink.Message, rLink.SenderID, rLink.ReceiverID));
@ -156,9 +151,8 @@ void CDeleteSelectionCommand::redo()
{ {
mpEditor->Selection()->SetSelectedNodes(mNewSelection.DereferenceList()); mpEditor->Selection()->SetSelectedNodes(mNewSelection.DereferenceList());
for (int iNode = 0; iNode < mDeletedNodes.size(); iNode++) for (SDeletedNode& rNode : mDeletedNodes)
{ {
SDeletedNode& rNode = mDeletedNodes[iNode];
CSceneNode *pNode = *rNode.NodePtr; CSceneNode *pNode = *rNode.NodePtr;
CScriptObject *pInst = static_cast<CScriptNode*>(pNode)->Instance(); CScriptObject *pInst = static_cast<CScriptNode*>(pNode)->Instance();