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

Fixed various bugs and crashes and moved more functionality into the world editor

Browse Source
This commit is contained in:
Aruki
2017-02-13 13:44:02 -07:00
parent 00a48e69f8
commit c5de322ac7
13 changed files with 105 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,6 +356,7 @@ CResource* CResourceEntry::LoadCooked(IInputStream& rInput)
bool CResourceEntry::Unload()
{
ASSERT(mpResource != nullptr);
ASSERT(!mpResource->IsReferenced());
delete mpResource;
mpResource = nullptr;
return true;

25
src/Core/GameProject/CResourceStore.cpp
View File

@@ -277,6 +277,21 @@ void CResourceStore::CloseProject()
// various TResPtrs are destroyed. There might be a cleaner solution than this.)
DestroyUnreferencedResources();
// There should be no loaded resources!!!
// If there are, that means something didn't clean up resource references properly on project close!!!
if (!mLoadedResources.empty())
{
Log::Error(TString::FromInt32(mLoadedResources.size(), 0, 10) + " resources still loaded on project close:");
for (auto Iter = mLoadedResources.begin(); Iter != mLoadedResources.end(); Iter++)
{
CResourceEntry *pEntry = Iter->second;
Log::Write("\t" + pEntry->Name().ToUTF8() + "." + pEntry->CookedExtension().ToString());
}
ASSERT(false);
}
// Delete all entries from old project
auto It = mResourceEntries.begin();
@@ -286,16 +301,6 @@ void CResourceStore::CloseProject()
if (!pEntry->IsTransient())
{
if (pEntry->IsLoaded())
{
bool UnloadSuccess = pEntry->Unload();
ASSERT(UnloadSuccess);
auto LoadIt = mLoadedResources.find(pEntry->ID());
ASSERT(LoadIt != mLoadedResources.end());
mLoadedResources.erase(LoadIt);
}
delete pEntry;
It = mResourceEntries.erase(It);
}