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

CGameProject: Make use of size_t where applicable

Browse Source 
Plays nicely with standard containers.
This commit is contained in:
Lioncash 2020-06-18 05:34:56 -04:00
parent 6a0a20e3fa
commit 5ce6b972a0
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/GameProject/AssetNameGeneration.cpp
View File

@ -109,11 +109,11 @@ void GenerateAssetNames(CGameProject *pProj)
// Generate names for package named resources
debugf("Processing packages");
for (uint32 iPkg = 0; iPkg < pProj->NumPackages(); iPkg++)
for (size_t iPkg = 0; iPkg < pProj->NumPackages(); iPkg++)
{
CPackage *pPkg = pProj->PackageByIndex(iPkg);
for (uint32 iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
for (size_t iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
{
const SNamedResource& rkRes = pPkg->NamedResourceByIndex(iRes);
if (rkRes.Name.EndsWith("NODEPEND")) continue;

4
src/Core/GameProject/CGameExporter.cpp
View File

@ -669,11 +669,11 @@ TString CGameExporter::MakeWorldName(CAssetID WorldID)
// Find the original world name in the package resource names
TString WorldName;
for (uint32 iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++)
for (size_t iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++)
{
CPackage *pPkg = mpProject->PackageByIndex(iPkg);
for (uint32 iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
for (size_t iRes = 0; iRes < pPkg->NumNamedResources(); iRes++)
{
const SNamedResource& rkRes = pPkg->NamedResourceByIndex(iRes);

4
src/Core/GameProject/CGameProject.h
View File

@ -87,8 +87,8 @@ public:
void SetProjectName(TString name) { mProjectName = std::move(name); }
TString Name() const { return mProjectName; }
uint32 NumPackages() const { return mPackages.size(); }
CPackage* PackageByIndex(uint32 Index) const { return mPackages[Index].get(); }
size_t NumPackages() const { return mPackages.size(); }
CPackage* PackageByIndex(size_t Index) const { return mPackages[Index].get(); }
void AddPackage(std::unique_ptr<CPackage>&& package) { mPackages.push_back(std::move(package)); }
CResourceStore* ResourceStore() const { return mpResourceStore.get(); }
CGameInfo* GameInfo() const { return mpGameInfo.get(); }

2
src/Core/GameProject/CResourceEntry.cpp
View File

@ -330,7 +330,7 @@ bool CResourceEntry::Save(bool SkipCacheSave /*= false*/, bool FlagForRecook /*=
// Flag dirty any packages that contain this resource.
if (FlagForRecook)
{
for (uint32 iPkg = 0; iPkg < mpStore->Project()->NumPackages(); iPkg++)
for (size_t iPkg = 0; iPkg < mpStore->Project()->NumPackages(); iPkg++)
{
CPackage *pPkg = mpStore->Project()->PackageByIndex(iPkg);

4
src/Editor/CEditorApplication.cpp
View File

@ -216,7 +216,7 @@ bool CEditorApplication::CookAllDirtyPackages()
ASSERT(mpActiveProject != nullptr);
QList<CPackage*> PackageList;
for (uint32 iPkg = 0; iPkg < mpActiveProject->NumPackages(); iPkg++)
for (size_t iPkg = 0; iPkg < mpActiveProject->NumPackages(); iPkg++)
{
CPackage *pPackage = mpActiveProject->PackageByIndex(iPkg);
@ -258,7 +258,7 @@ bool CEditorApplication::HasAnyDirtyPackages()
if (!mpActiveProject)
return false;
for (uint32 PkgIdx = 0; PkgIdx < mpActiveProject->NumPackages(); PkgIdx++)
for (size_t PkgIdx = 0; PkgIdx < mpActiveProject->NumPackages(); PkgIdx++)
{
CPackage *pPackage = mpActiveProject->PackageByIndex(PkgIdx);

17
src/Editor/CProjectSettingsDialog.cpp
View File

@ -102,26 +102,27 @@ void CProjectSettingsDialog::SetupPackagesList()
mpUI->PackagesList->clear();
if (!mpProject) return;
for (uint32 iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++)
for (size_t iPkg = 0; iPkg < mpProject->NumPackages(); iPkg++)
{
CPackage *pPackage = mpProject->PackageByIndex(iPkg);
ASSERT(pPackage != nullptr);
QString PackageName = TO_QSTRING(pPackage->Name());
if (pPackage->NeedsRecook()) PackageName += '*';
if (pPackage->NeedsRecook())
PackageName += '*';
mpUI->PackagesList->addItem(PackageName);
}
}
void CProjectSettingsDialog::CookPackage()
{
uint32 PackageIdx = mpUI->PackagesList->currentRow();
const auto PackageIdx = static_cast<uint32>(mpUI->PackagesList->currentRow());
if (PackageIdx != -1)
{
CPackage *pPackage = mpProject->PackageByIndex(PackageIdx);
gpEdApp->CookPackage(pPackage);
}
if (PackageIdx == UINT32_MAX)
return;
CPackage *pPackage = mpProject->PackageByIndex(PackageIdx);
gpEdApp->CookPackage(pPackage);
}
void CProjectSettingsDialog::CookAllDirtyPackages()