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

CInstancesModel: Tidy up appending to lists

This commit is contained in:
Lioncash 2020-07-03 22:57:46 -04:00
parent 2d21d6af01
commit 55e93e6111
1 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/Editor/WorldEditor/CInstancesModel.cpp
View File

@ -360,15 +360,15 @@ CScriptObject* CInstancesModel::IndexObject(const QModelIndex& rkIndex) const
// ************ PUBLIC SLOTS ************ // ************ PUBLIC SLOTS ************
void CInstancesModel::OnActiveProjectChanged(CGameProject *pProj) void CInstancesModel::OnActiveProjectChanged(CGameProject *pProj)
{ {
if (mModelType == EInstanceModelType::Types) if (mModelType != EInstanceModelType::Types)
{ return;
if (pProj)
mpCurrentGame = NGameList::GetGameTemplate( pProj->Game() );
else
mpCurrentGame = nullptr;
GenerateList(); if (pProj != nullptr)
} mpCurrentGame = NGameList::GetGameTemplate( pProj->Game() );
else
mpCurrentGame = nullptr;
GenerateList();
} }
void CInstancesModel::OnMapChange() void CInstancesModel::OnMapChange()
@ -387,11 +387,11 @@ void CInstancesModel::OnMapChange()
void CInstancesModel::NodeAboutToBeCreated() void CInstancesModel::NodeAboutToBeCreated()
{ {
if (!mChangingLayout) if (mChangingLayout)
{ return;
emit layoutAboutToBeChanged();
mChangingLayout = true; emit layoutAboutToBeChanged();
} mChangingLayout = true;
} }
void CInstancesModel::NodeCreated(CSceneNode *pNode) void CInstancesModel::NodeCreated(CSceneNode *pNode)
@ -412,7 +412,7 @@ void CInstancesModel::NodeCreated(CSceneNode *pNode)
if (pObj->Template()->NumObjects() == 1) if (pObj->Template()->NumObjects() == 1)
{ {
QModelIndex ScriptRootIdx = index(0, 0, QModelIndex()); const QModelIndex ScriptRootIdx = index(0, 0, QModelIndex());
int NewIndex = 0; int NewIndex = 0;
for (; NewIndex < mTemplateList.size(); NewIndex++) for (; NewIndex < mTemplateList.size(); NewIndex++)
@ -431,27 +431,21 @@ void CInstancesModel::NodeCreated(CSceneNode *pNode)
void CInstancesModel::NodeAboutToBeDeleted(CSceneNode *pNode) void CInstancesModel::NodeAboutToBeDeleted(CSceneNode *pNode)
{ {
if (pNode->NodeType() == ENodeType::Script) if (pNode->NodeType() != ENodeType::Script)
return;
if (mModelType == EInstanceModelType::Types)
{ {
if (mModelType == EInstanceModelType::Types) const auto *pScript = static_cast<CScriptNode*>(pNode);
const CScriptObject *pObj = pScript->Instance();
if (pObj->Template()->NumObjects() <= 1)
{ {
CScriptNode *pScript = static_cast<CScriptNode*>(pNode); const QModelIndex ScriptRootIdx = index(0, 0, QModelIndex());
CScriptObject *pObj = pScript->Instance(); const int TempIdx = mTemplateList.indexOf(pObj->Template());
beginRemoveRows(ScriptRootIdx, TempIdx, TempIdx);
if (pObj->Template()->NumObjects() <= 1) mTemplateList.removeOne(pObj->Template());
{ endRemoveRows();
QModelIndex ScriptRootIdx = index(0, 0, QModelIndex());
int TempIdx = mTemplateList.indexOf(pObj->Template());
beginRemoveRows(ScriptRootIdx, TempIdx, TempIdx);
mTemplateList.removeOne(pObj->Template());
endRemoveRows();
}
else if (!mChangingLayout)
{
emit layoutAboutToBeChanged();
mChangingLayout = true;
}
} }
else if (!mChangingLayout) else if (!mChangingLayout)
@ -460,40 +454,45 @@ void CInstancesModel::NodeAboutToBeDeleted(CSceneNode *pNode)
mChangingLayout = true; mChangingLayout = true;
} }
} }
else if (!mChangingLayout)
{
emit layoutAboutToBeChanged();
mChangingLayout = true;
}
} }
void CInstancesModel::NodeDeleted() void CInstancesModel::NodeDeleted()
{ {
if (mChangingLayout) if (!mChangingLayout)
{ return;
emit layoutChanged();
mChangingLayout = false; emit layoutChanged();
} mChangingLayout = false;
} }
void CInstancesModel::PropertyModified(IProperty *pProp, CScriptObject *pInst) void CInstancesModel::PropertyModified(IProperty *pProp, CScriptObject *pInst)
{ {
if (pProp->Name() == "Name") if (pProp->Name() != "Name")
return;
const QModelIndex ScriptRoot = index(0, 0, QModelIndex());
if (mModelType == EInstanceModelType::Layers)
{ {
QModelIndex ScriptRoot = index(0, 0, QModelIndex()); const uint32 Index = pInst->Layer()->AreaIndex();
const QModelIndex LayerIndex = index(Index, 0, ScriptRoot);
const QModelIndex InstIndex = index(pInst->LayerIndex(), 0, LayerIndex);
emit dataChanged(InstIndex, InstIndex);
}
else
{
const uint32 Index = mTemplateList.indexOf(pInst->Template());
const QModelIndex TempIndex = index(Index, 0, ScriptRoot);
if (mModelType == EInstanceModelType::Layers) const QList<CScriptObject*> InstList = QList<CScriptObject*>::fromStdList(pInst->Template()->ObjectList());
{ const uint32 InstIdx = InstList.indexOf(pInst);
uint32 Index = pInst->Layer()->AreaIndex(); const QModelIndex InstIndex = index(InstIdx, 0, TempIndex);
QModelIndex LayerIndex = index(Index, 0, ScriptRoot); emit dataChanged(InstIndex, InstIndex);
QModelIndex InstIndex = index(pInst->LayerIndex(), 0, LayerIndex);
emit dataChanged(InstIndex, InstIndex);
}
else
{
uint32 Index = mTemplateList.indexOf(pInst->Template());
QModelIndex TempIndex = index(Index, 0, ScriptRoot);
QList<CScriptObject*> InstList = QList<CScriptObject*>::fromStdList(pInst->Template()->ObjectList());
uint32 InstIdx = InstList.indexOf(pInst);
QModelIndex InstIndex = index(InstIdx, 0, TempIndex);
emit dataChanged(InstIndex, InstIndex);
}
} }
} }
@ -508,21 +507,22 @@ void CInstancesModel::InstancesLayerPreChange()
void CInstancesModel::InstancesLayerPostChange(const QList<CScriptNode*>& rkInstanceList) void CInstancesModel::InstancesLayerPostChange(const QList<CScriptNode*>& rkInstanceList)
{ {
QList<CScriptObject*> InstanceList; QList<CScriptObject*> InstanceList;
InstanceList.reserve(rkInstanceList.size());
for (CScriptNode *pNode : rkInstanceList) for (CScriptNode *pNode : rkInstanceList)
InstanceList << pNode->Instance(); InstanceList.push_back(pNode->Instance());
QModelIndex ScriptIdx = index(0, 0, QModelIndex()); const QModelIndex ScriptIdx = index(0, 0, QModelIndex());
// For types, just find the instances that have changed layers and emit dataChanged for column 1. // For types, just find the instances that have changed layers and emit dataChanged for column 1.
if (mModelType == EInstanceModelType::Types) if (mModelType == EInstanceModelType::Types)
{ {
for (int iType = 0; iType < rowCount(ScriptIdx); iType++) for (int iType = 0; iType < rowCount(ScriptIdx); iType++)
{ {
QModelIndex TypeIdx = index(iType, 0, ScriptIdx); const QModelIndex TypeIdx = index(iType, 0, ScriptIdx);
for (int iInst = 0; iInst < rowCount(TypeIdx); iInst++) for (int iInst = 0; iInst < rowCount(TypeIdx); iInst++)
{ {
QModelIndex InstIdx = index(iInst, 1, TypeIdx); const QModelIndex InstIdx = index(iInst, 1, TypeIdx);
CScriptObject *pInst = IndexObject(InstIdx); CScriptObject *pInst = IndexObject(InstIdx);
if (InstanceList.contains(pInst)) if (InstanceList.contains(pInst))
@ -553,15 +553,15 @@ CInstancesModel::EIndexType CInstancesModel::IndexType(const QModelIndex& rkInde
ENodeType CInstancesModel::IndexNodeType(const QModelIndex& rkIndex) ENodeType CInstancesModel::IndexNodeType(const QModelIndex& rkIndex)
{ {
EIndexType type = IndexType(rkIndex); const EIndexType type = IndexType(rkIndex);
const ENodeType kTypes[] = { ENodeType::Script, ENodeType::Light }; const std::array kTypes{ENodeType::Script, ENodeType::Light};
switch (type) switch (type)
{ {
case EIndexType::Root: return ENodeType::None; case EIndexType::Root: return ENodeType::None;
case EIndexType::NodeType: return (ENodeType) kTypes[ rkIndex.row() ]; case EIndexType::NodeType: return kTypes[rkIndex.row()];
case EIndexType::ObjectType: return (ENodeType) kTypes[ rkIndex.parent().row() ]; case EIndexType::ObjectType: return kTypes[rkIndex.parent().row()];
case EIndexType::Instance: return (ENodeType) kTypes[ rkIndex.parent().parent().row() ]; case EIndexType::Instance: return kTypes[rkIndex.parent().parent().row()];
default: return ENodeType::None; default: return ENodeType::None;
} }
} }
@ -575,18 +575,18 @@ void CInstancesModel::GenerateList()
if (mpCurrentGame) if (mpCurrentGame)
{ {
uint32 NumTemplates = mpCurrentGame->NumScriptTemplates(); const uint32 NumTemplates = mpCurrentGame->NumScriptTemplates();
for (uint32 iTemp = 0; iTemp < NumTemplates; iTemp++) for (uint32 iTemp = 0; iTemp < NumTemplates; iTemp++)
{ {
CScriptTemplate *pTemp = mpCurrentGame->TemplateByIndex(iTemp); CScriptTemplate *pTemp = mpCurrentGame->TemplateByIndex(iTemp);
if (pTemp->NumObjects() > 0) if (pTemp->NumObjects() > 0)
mTemplateList << pTemp; mTemplateList.push_back(pTemp);
} }
std::sort(mTemplateList.begin(), mTemplateList.end(), [](CScriptTemplate *pLeft, CScriptTemplate *pRight) -> bool { std::sort(mTemplateList.begin(), mTemplateList.end(), [](const CScriptTemplate *pLeft, const CScriptTemplate *pRight) {
return (pLeft->Name() < pRight->Name()); return pLeft->Name() < pRight->Name();
}); });
} }