INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: use IObjLoader directly instead of indirection of ObjLoading

Browse Source
This commit is contained in:
Jan
2024-10-19 12:07:12 +02:00
parent c034ac790a
commit 4c9a84777f
21 changed files with 62 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Unlinker/Unlinker.cpp
View File

@ -2,6 +2,7 @@
#include "ContentLister/ContentPrinter.h"
#include "ContentLister/ZoneDefWriter.h"
#include "IObjLoader.h"
#include "ObjContainer/IWD/IWD.h"
#include "ObjLoading.h"
#include "ObjWriting.h"
@ -325,7 +326,10 @@ private:
std::cout << std::format("Loaded zone \"{}\"\n", zone->m_name);
if (ShouldLoadObj())
ObjLoading::LoadReferencedContainersForZone(searchPathsForZone, *zone);
{
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
objLoader->LoadReferencedContainersForZone(searchPathsForZone, *zone);
}
m_loaded_zones.emplace_back(std::move(zone));
}
@ -343,7 +347,10 @@ private:
const auto zoneName = loadedZone->m_name;
if (ShouldLoadObj())
ObjLoading::UnloadContainersOfZone(*loadedZone);
{
const auto* objLoader = IObjLoader::GetObjLoaderForGame(loadedZone->m_game->GetId());
objLoader->UnloadContainersOfZone(*loadedZone);
}
loadedZone.reset();
@ -383,14 +390,15 @@ private:
if (m_args.m_verbose)
std::cout << std::format("Loaded zone \"{}\"\n", zoneName);
const auto* objLoader = IObjLoader::GetObjLoaderForGame(zone->m_game->GetId());
if (ShouldLoadObj())
ObjLoading::LoadReferencedContainersForZone(searchPathsForZone, *zone);
objLoader->LoadReferencedContainersForZone(searchPathsForZone, *zone);
if (!HandleZone(searchPathsForZone, *zone))
return false;
if (ShouldLoadObj())
ObjLoading::UnloadContainersOfZone(*zone);
objLoader->UnloadContainersOfZone(*zone);
zone.reset();
if (m_args.m_verbose)