zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-09-10 16:07:06 +00:00
Code Activity

chore: parse includes and assetlists while parsing zone definition

Browse Source
This commit is contained in:
Jan
2025-01-01 18:14:43 +01:00
parent 9852f52a15
commit aa212e0958
74 changed files with 530 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Parsing/Menu/MenuFileReader.cpp
+6 -20
View File
@@ -11,36 +11,22 @@
using namespace menu;
MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const FeatureLevel featureLevel, include_callback_t includeCallback)
: m_feature_level(featureLevel),
MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const FeatureLevel featureLevel, ISearchPath& searchPath)
: SearchPathMultiInputStream(searchPath),
m_feature_level(featureLevel),
m_file_name(std::move(fileName)),
m_stream(nullptr),
m_zone_state(nullptr),
m_permissive_mode(false)
{
OpenBaseStream(stream, std::move(includeCallback));
OpenBaseStream(stream);
SetupStreamProxies();
m_stream = m_open_streams.back().get();
}
MenuFileReader::MenuFileReader(std::istream& stream, std::string fileName, const FeatureLevel featureLevel)
: m_feature_level(featureLevel),
m_file_name(std::move(fileName)),
m_stream(nullptr),
m_zone_state(nullptr),
m_permissive_mode(false)
bool MenuFileReader::OpenBaseStream(std::istream& stream)
{
OpenBaseStream(stream, nullptr);
SetupStreamProxies();
m_stream = m_open_streams.back().get();
}
bool MenuFileReader::OpenBaseStream(std::istream& stream, include_callback_t includeCallback)
{
if (includeCallback)
m_open_streams.emplace_back(std::make_unique<ParserMultiInputStream>(stream, m_file_name, std::move(includeCallback)));
else
m_open_streams.emplace_back(std::make_unique<ParserSingleInputStream>(stream, m_file_name));
m_open_streams.emplace_back(std::make_unique<ParserMultiInputStream>(stream, m_file_name, *this));
return true;
}