AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-17 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPoiMapModel: Pass by const where applicable

Browse Source
This commit is contained in:
Lioncache
2025-12-12 11:35:17 -05:00
parent b2fbbaa87c
commit 7f714eee07
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Editor/WorldEditor/CPoiMapModel.cpp
View File

@@ -62,7 +62,7 @@ QVariant CPoiMapModel::data(const QModelIndex& rkIndex, int Role) const
return QVariant();
}
void CPoiMapModel::AddPOI(CScriptNode *pPOI)
void CPoiMapModel::AddPOI(const CScriptNode* pPOI)
{
if (mModelMap.contains(pPOI))
return;
@@ -79,7 +79,7 @@ void CPoiMapModel::AddPOI(CScriptNode *pPOI)
void CPoiMapModel::AddMapping(const QModelIndex& rkIndex, CModelNode *pNode)
{
CScriptNode *pPOI = PoiNodePointer(rkIndex);
const CScriptNode* pPOI = PoiNodePointer(rkIndex);
AddPOI(pPOI);
QList<CModelNode*> *pList = mModelMap[pPOI];
@@ -92,7 +92,7 @@ void CPoiMapModel::AddMapping(const QModelIndex& rkIndex, CModelNode *pNode)
void CPoiMapModel::RemovePOI(const QModelIndex& rkIndex)
{
beginRemoveRows(QModelIndex(), rkIndex.row(), rkIndex.row());
CScriptNode *pPOI = PoiNodePointer(rkIndex);
const CScriptNode* pPOI = PoiNodePointer(rkIndex);
if (mModelMap.contains(pPOI))
{
@@ -106,7 +106,7 @@ void CPoiMapModel::RemovePOI(const QModelIndex& rkIndex)
void CPoiMapModel::RemoveMapping(const QModelIndex& rkIndex, CModelNode *pNode)
{
CScriptNode *pPOI = PoiNodePointer(rkIndex);
const CScriptNode* pPOI = PoiNodePointer(rkIndex);
if (mModelMap.contains(pPOI))
{
@@ -120,7 +120,7 @@ void CPoiMapModel::RemoveMapping(const QModelIndex& rkIndex, CModelNode *pNode)
}
}
bool CPoiMapModel::IsPoiTracked(CScriptNode *pPOI) const
bool CPoiMapModel::IsPoiTracked(const CScriptNode* pPOI) const
{
return mModelMap.contains(pPOI);
}
@@ -130,12 +130,11 @@ bool CPoiMapModel::IsModelMapped(const QModelIndex& rkIndex, CModelNode *pNode)
if (!pNode)
return false;
CScriptNode *pPOI = PoiNodePointer(rkIndex);
const CScriptNode* pPOI = PoiNodePointer(rkIndex);
if (mModelMap.contains(pPOI))
{
QList<CModelNode*> *pList = mModelMap[pPOI];
return (pList->contains(pNode));
return pList->contains(pNode);
}
return false;
@@ -156,11 +155,11 @@ CScriptNode* CPoiMapModel::PoiNodePointer(const QModelIndex& rkIndex) const
const QList<CModelNode*>& CPoiMapModel::GetPoiMeshList(const QModelIndex& rkIndex) const
{
CScriptNode *pPOI = PoiNodePointer(rkIndex);
const CScriptNode* pPOI = PoiNodePointer(rkIndex);
return GetPoiMeshList(pPOI);
}
const QList<CModelNode*>& CPoiMapModel::GetPoiMeshList(CScriptNode *pPOI) const
const QList<CModelNode*>& CPoiMapModel::GetPoiMeshList(const CScriptNode *pPOI) const
{
return *mModelMap[pPOI];
}
@@ -174,11 +173,11 @@ void CPoiMapModel::OnMapChange(CWorld*, CGameArea *pArea)
if (mpPoiToWorld)
{
// Create an ID -> Model Node lookup map
QMap<uint32,CModelNode*> NodeMap;
QMap<uint32, CModelNode*> NodeMap;
for (CSceneIterator It(mpEditor->Scene(), ENodeType::Model, true); !It.DoneIterating(); ++It)
{
CModelNode *pNode = static_cast<CModelNode*>(*It);
auto* pNode = static_cast<CModelNode*>(*It);
NodeMap[pNode->FindMeshID()] = pNode;
}
@@ -186,9 +185,8 @@ void CPoiMapModel::OnMapChange(CWorld*, CGameArea *pArea)
for (size_t iPoi = 0; iPoi < mpPoiToWorld->NumMappedPOIs(); iPoi++)
{
const CPoiToWorld::SPoiMap *pkMap = mpPoiToWorld->MapByIndex(iPoi);
CScriptNode *pPoiNode = mpEditor->Scene()->NodeForInstanceID(pkMap->PoiID);
if (pPoiNode)
if (const auto* pPoiNode = mpEditor->Scene()->NodeForInstanceID(pkMap->PoiID))
{
auto* pModelList = new QList<CModelNode*>();

14
src/Editor/WorldEditor/CPoiMapModel.h
View File

@@ -20,7 +20,7 @@ class CPoiMapModel : public QAbstractListModel
CGameArea *mpArea = nullptr;
TResPtr<CPoiToWorld> mpPoiToWorld;
QMap<CScriptNode*, QList<CModelNode*>*> mModelMap;
QMap<const CScriptNode*, QList<CModelNode*>*> mModelMap;
public:
explicit CPoiMapModel(CWorldEditor *pEditor, QObject *pParent = nullptr);
@@ -29,16 +29,16 @@ public:
int rowCount(const QModelIndex& rkParent) const override;
QVariant data(const QModelIndex& rkIndex, int Role) const override;
void AddPOI(CScriptNode *pPOI);
void AddMapping(const QModelIndex& rkIndex, CModelNode *pNode);
void AddPOI(const CScriptNode* pPOI);
void AddMapping(const QModelIndex& rkIndex, CModelNode* pNode);
void RemovePOI(const QModelIndex& rkIndex);
void RemoveMapping(const QModelIndex& rkIndex, CModelNode *pNode);
bool IsPoiTracked(CScriptNode *pPOI) const;
bool IsModelMapped(const QModelIndex& rkIndex, CModelNode *pNode) const;
void RemoveMapping(const QModelIndex& rkIndex, CModelNode* pNode);
bool IsPoiTracked(const CScriptNode* pPOI) const;
bool IsModelMapped(const QModelIndex& rkIndex, CModelNode* pNode) const;
CScriptNode* PoiNodePointer(const QModelIndex& rkIndex) const;
const QList<CModelNode*>& GetPoiMeshList(const QModelIndex& rkIndex) const;
const QList<CModelNode*>& GetPoiMeshList(CScriptNode *pPOI) const;
const QList<CModelNode*>& GetPoiMeshList(const CScriptNode* pPOI) const;
public slots:
void OnMapChange(CWorld*, CGameArea *pArea);