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

Replace FileAPI with c++ streams and std::filesystem

Browse Source
This commit is contained in:
Jan
2021-03-03 14:04:35 +01:00
parent b6b0a57232
commit 1cd06668e0
96 changed files with 1355 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/ObjLoading/SearchPath/SearchPaths.cpp
View File

@ -5,15 +5,7 @@
SearchPaths::SearchPaths() = default;
SearchPaths::~SearchPaths()
{
for(auto searchPathToFree : m_to_free)
{
delete searchPathToFree;
}
m_to_free.clear();
m_search_paths.clear();
}
= default;
SearchPaths::SearchPaths(const SearchPaths& other)
: m_search_paths(other.m_search_paths)
@ -41,15 +33,15 @@ SearchPaths& SearchPaths::operator=(SearchPaths&& other) noexcept
return *this;
}
FileAPI::IFile* SearchPaths::Open(const std::string& fileName)
std::unique_ptr<std::istream> SearchPaths::Open(const std::string& fileName)
{
for(auto searchPathEntry : m_search_paths)
for(auto* searchPathEntry : m_search_paths)
{
auto* file = searchPathEntry->Open(fileName);
auto file = searchPathEntry->Open(fileName);
if(file != nullptr)
if(file)
{
return file;
return std::move(file);
}
}
@ -63,16 +55,16 @@ std::string SearchPaths::GetPath()
void SearchPaths::Find(const SearchPathSearchOptions& options, const std::function<void(const std::string&)>& callback)
{
for (auto searchPathEntry : m_search_paths)
for (auto* searchPathEntry : m_search_paths)
{
searchPathEntry->Find(options, callback);
}
}
void SearchPaths::CommitSearchPath(ISearchPath* searchPath)
void SearchPaths::CommitSearchPath(std::unique_ptr<ISearchPath> searchPath)
{
m_search_paths.push_back(searchPath);
m_to_free.push_back(searchPath);
m_search_paths.push_back(searchPath.get());
m_owned_search_paths.emplace_back(std::move(searchPath));
}
void SearchPaths::IncludeSearchPath(ISearchPath* searchPath)