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

CSkeletonHierarchyModel: Pass bones by const to IndexForBone()

Browse Source 
Given these aren't modified, we can make this obvious.
This commit is contained in:
Lioncache
2025-12-07 03:09:19 -05:00
parent 03ae5b54df
commit 6620980add
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Editor/CharacterEditor/CSkeletonHierarchyModel.cpp
View File

@@ -19,7 +19,7 @@ QModelIndex CSkeletonHierarchyModel::index(int Row, int Column, const QModelInde
return QModelIndex(); return QModelIndex();
} }
auto *pBone = static_cast<CBone*>(rkParent.internalPointer()); const auto* pBone = static_cast<const CBone*>(rkParent.internalPointer());
if (Row < static_cast<int>(pBone->NumChildren())) if (Row < static_cast<int>(pBone->NumChildren()))
return createIndex(Row, Column, pBone->ChildByIndex(Row)); return createIndex(Row, Column, pBone->ChildByIndex(Row));
else else
@@ -28,16 +28,16 @@ QModelIndex CSkeletonHierarchyModel::index(int Row, int Column, const QModelInde
QModelIndex CSkeletonHierarchyModel::parent(const QModelIndex& rkChild) const QModelIndex CSkeletonHierarchyModel::parent(const QModelIndex& rkChild) const
{ {
auto *pBone = static_cast<CBone*>(rkChild.internalPointer()); const auto *pBone = static_cast<const CBone*>(rkChild.internalPointer());
if (pBone->Parent()) if (pBone->Parent())
{ {
// Determine parent index // Determine parent index
CBone *pParent = pBone->Parent(); const CBone* pParent = pBone->Parent();
if (pParent->Parent()) if (pParent->Parent())
{ {
CBone *pGrandparent = pParent->Parent(); const CBone* pGrandparent = pParent->Parent();
for (size_t iChild = 0; iChild < pGrandparent->NumChildren(); iChild++) for (size_t iChild = 0; iChild < pGrandparent->NumChildren(); iChild++)
{ {
@@ -45,8 +45,10 @@ QModelIndex CSkeletonHierarchyModel::parent(const QModelIndex& rkChild) const
return createIndex(static_cast<int>(iChild), 0, pParent); return createIndex(static_cast<int>(iChild), 0, pParent);
} }
} }
else
else return createIndex(0, 0, pParent); {
return createIndex(0, 0, pParent);
}
} }
return QModelIndex(); return QModelIndex();
@@ -57,7 +59,7 @@ int CSkeletonHierarchyModel::rowCount(const QModelIndex& rkParent) const
if (!mpSkeleton) if (!mpSkeleton)
return 0; return 0;
auto *pBone = static_cast<CBone*>(rkParent.internalPointer()); const auto* pBone = static_cast<const CBone*>(rkParent.internalPointer());
return pBone ? static_cast<int>(pBone->NumChildren()) : 1; return pBone ? static_cast<int>(pBone->NumChildren()) : 1;
} }
@@ -70,7 +72,7 @@ QVariant CSkeletonHierarchyModel::data(const QModelIndex& rkIndex, int Role) con
{ {
if (Role == Qt::DisplayRole || Role == Qt::ToolTipRole) if (Role == Qt::DisplayRole || Role == Qt::ToolTipRole)
{ {
CBone *pBone = (CBone*) rkIndex.internalPointer(); const auto* pBone = static_cast<const CBone*>(rkIndex.internalPointer());
return TO_QSTRING(pBone->Name()); return TO_QSTRING(pBone->Name());
} }
@@ -79,12 +81,12 @@ QVariant CSkeletonHierarchyModel::data(const QModelIndex& rkIndex, int Role) con
CBone* CSkeletonHierarchyModel::BoneForIndex(const QModelIndex& rkIndex) const CBone* CSkeletonHierarchyModel::BoneForIndex(const QModelIndex& rkIndex) const
{ {
return (CBone*) (rkIndex.internalPointer()); return static_cast<CBone*>(rkIndex.internalPointer());
} }
QModelIndex CSkeletonHierarchyModel::IndexForBone(CBone *pBone) const QModelIndex CSkeletonHierarchyModel::IndexForBone(const CBone *pBone) const
{ {
CBone *pParent = pBone->Parent(); const CBone* pParent = pBone->Parent();
if (!pParent) if (!pParent)
return index(0, 0, QModelIndex()); return index(0, 0, QModelIndex());

2
src/Editor/CharacterEditor/CSkeletonHierarchyModel.h
View File

@@ -18,7 +18,7 @@ public:
QVariant data(const QModelIndex& rkIndex, int Role) const override; QVariant data(const QModelIndex& rkIndex, int Role) const override;
CBone* BoneForIndex(const QModelIndex& rkIndex) const; CBone* BoneForIndex(const QModelIndex& rkIndex) const;
QModelIndex IndexForBone(CBone *pBone) const; QModelIndex IndexForBone(const CBone *pBone) const;
void SetSkeleton(CSkeleton *pSkel); void SetSkeleton(CSkeleton *pSkel);
}; };