zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

State whenever a zone is unloaded in unlinker

Browse Source
This commit is contained in:
Jan 2022-04-16 16:39:46 +02:00
parent 1a36912b44
commit 4a03efe636
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Unlinker/Unlinker.cpp
View File

@ -216,7 +216,7 @@ class Unlinker::Impl
ObjWriting::Configuration.AssetTypesToHandleBitfield = std::vector<bool>(assetTypeCount); ObjWriting::Configuration.AssetTypesToHandleBitfield = std::vector<bool>(assetTypeCount);
for(auto i = 0; i < assetTypeCount; i++) for (auto i = 0; i < assetTypeCount; i++)
{ {
const auto assetTypeName = std::string(context.m_zone->m_pools->GetAssetTypeName(i)); const auto assetTypeName = std::string(context.m_zone->m_pools->GetAssetTypeName(i));
@ -321,12 +321,20 @@ class Unlinker::Impl
void UnloadZones() void UnloadZones()
{ {
if (ShouldLoadObj()) for (auto i = m_loaded_zones.rbegin(); i != m_loaded_zones.rend(); ++i)
{ {
for (auto& loadedZone : m_loaded_zones) auto& loadedZone = *i;
std::string zoneName = loadedZone->m_name;
if (ShouldLoadObj())
{ {
ObjLoading::UnloadContainersOfZone(loadedZone.get()); ObjLoading::UnloadContainersOfZone(loadedZone.get());
} }
loadedZone.reset();
if (m_args.m_verbose)
std::cout << "Unloaded zone \"" << zoneName << "\"\n";
} }
m_loaded_zones.clear(); m_loaded_zones.clear();
} }
@ -346,6 +354,7 @@ class Unlinker::Impl
auto searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory); auto searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory);
searchPathsForZone.IncludeSearchPath(&m_search_paths); searchPathsForZone.IncludeSearchPath(&m_search_paths);
std::string zoneName;
auto zone = ZoneLoading::LoadZone(zonePath); auto zone = ZoneLoading::LoadZone(zonePath);
if (zone == nullptr) if (zone == nullptr)
{ {
@ -353,10 +362,9 @@ class Unlinker::Impl
return false; return false;
} }
zoneName = zone->m_name;
if (m_args.m_verbose) if (m_args.m_verbose)
{ std::cout << "Loaded zone \"" << zoneName << "\"\n";
printf("Loaded zone \"%s\"\n", zone->m_name.c_str());
}
if (ShouldLoadObj()) if (ShouldLoadObj())
{ {
@ -369,6 +377,10 @@ class Unlinker::Impl
if (ShouldLoadObj()) if (ShouldLoadObj())
ObjLoading::UnloadContainersOfZone(zone.get()); ObjLoading::UnloadContainersOfZone(zone.get());
zone.reset();
if (m_args.m_verbose)
std::cout << "Unloaded zone \"" << zoneName << "\"\n";
} }
return true; return true;