AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-14 07:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplemented save & repack button to work in the project system

Browse Source
This commit is contained in:
Aruki
2017-02-08 11:20:33 -07:00
parent 1b97cd459a
commit a7b0a2480c
13 changed files with 127 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Core/GameProject/CAssetNameMap.cpp
View File

@@ -34,6 +34,24 @@ bool CAssetNameMap::GetNameInfo(CAssetID ID, TString& rOutDirectory, TString& rO
void CAssetNameMap::CopyFromStore(CResourceStore *pStore /*= gpResourceStore*/)
{
// Do a first pass to remove old paths from used set to prevent false positives from eg. if two resources switch places
for (CResourceIterator It(pStore); It; ++It)
{
if (It->IsCategorized() || It->IsNamed())
{
auto Find = mMap.find(It->ID());
if (Find != mMap.end())
{
SAssetNameInfo& rInfo = Find->second;
auto UsedFind = mUsedSet.find(rInfo);
ASSERT(UsedFind != mUsedSet.end());
mUsedSet.erase(UsedFind);
}
}
}
// Do a second pass to add the new paths to the map
for (CResourceIterator It(pStore); It; ++It)
{
if (It->IsCategorized() || It->IsNamed())
@@ -44,17 +62,6 @@ void CAssetNameMap::CopyFromStore(CResourceStore *pStore /*= gpResourceStore*/)
CFourCC Type = It->CookedExtension();
SAssetNameInfo NameInfo { Name, Directory, Type };
// Remove old path from used set
auto Find = mMap.find(ID);
if (Find != mMap.end())
{
SAssetNameInfo& rInfo = Find->second;
auto UsedFind = mUsedSet.find(rInfo);
ASSERT(UsedFind != mUsedSet.end());
mUsedSet.erase(UsedFind);
}
// Check for conflicts with new name
if (mUsedSet.find(NameInfo) != mUsedSet.end())
{