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

chore: respect previously set game when including additional zone files

Browse Source
This commit is contained in:
Jan
2024-10-05 11:19:41 +01:00
parent b156c7348a
commit 1861bd689c
8 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ZoneCommon/Zone/Definition/ZoneDefinitionStream.cpp
View File

@ -1,18 +1,19 @@
#include "ZoneDefinitionStream.h"
#include "Parsing/Impl/CommentRemovingStreamProxy.h"
#include "Parsing/Impl/DefinesStreamProxy.h"
#include "Parsing/Impl/ParserSingleInputStream.h"
#include "Parsing/Simple/SimpleLexer.h"
#include "Parsing/ZoneDefinition/ZoneDefinitionLexer.h"
#include "Parsing/ZoneDefinition/ZoneDefinitionParser.h"
#include <Parsing/Impl/CommentRemovingStreamProxy.h>
#include <chrono>
#include <format>
ZoneDefinitionInputStream::ZoneDefinitionInputStream(std::istream& stream, std::string fileName, bool verbose)
: m_file_name(std::move(fileName)),
m_verbose(verbose),
m_stream(nullptr)
m_stream(nullptr),
m_previously_set_game(std::nullopt)
{
OpenBaseStream(stream);
SetupStreamProxies();
@ -29,21 +30,23 @@ void ZoneDefinitionInputStream::SetupStreamProxies()
{
m_open_streams.emplace_back(std::make_unique<CommentRemovingStreamProxy>(m_open_streams.back().get()));
auto definesProxy = std::make_unique<DefinesStreamProxy>(m_open_streams.back().get());
definesProxy->AddDefine(DefinesStreamProxy::Define(ZONE_CODE_GENERATOR_DEFINE_NAME, ZONE_CODE_GENERATOR_DEFINE_VALUE));
m_open_streams.emplace_back(std::move(definesProxy));
m_stream = m_open_streams.back().get();
}
void ZoneDefinitionInputStream::SetPreviouslySetGame(GameId game)
{
m_previously_set_game = game;
}
std::unique_ptr<ZoneDefinition> ZoneDefinitionInputStream::ReadDefinition()
{
if (m_verbose)
{
std::cout << "Reading zone definition file: " << m_file_name << "\n";
}
std::cout << std::format("Reading zone definition file: {}\n", m_file_name);
const auto lexer = std::make_unique<ZoneDefinitionLexer>(m_stream);
const auto parser = std::make_unique<ZoneDefinitionParser>(lexer.get());
const auto parser = std::make_unique<ZoneDefinitionParser>(lexer.get(), m_previously_set_game);
const auto start = std::chrono::steady_clock::now();
std::unique_ptr<ZoneDefinition> definition;
@ -52,9 +55,7 @@ std::unique_ptr<ZoneDefinition> ZoneDefinitionInputStream::ReadDefinition()
const auto end = std::chrono::steady_clock::now();
if (m_verbose)
{
std::cout << "Processing zone definition took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << "ms\n";
}
std::cout << std::format("Processing zone definition took {}ms\n", std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count());
return std::move(definition);
}

28
src/ZoneCommon/Zone/Definition/ZoneDefinitionStream.h
View File

@ -1,33 +1,34 @@
#pragma once
#include "Game/IGame.h"
#include "Parsing/IParserLineStream.h"
#include "ZoneDefinition.h"
#include <iostream>
#include <memory>
#include <optional>
class ZoneDefinitionInputStream
{
static constexpr const char* ZONE_CODE_GENERATOR_DEFINE_NAME = "__zonecodegenerator";
static constexpr const char* ZONE_CODE_GENERATOR_DEFINE_VALUE = "1";
public:
ZoneDefinitionInputStream(std::istream& stream, std::string fileName, bool verbose);
void SetPreviouslySetGame(GameId game);
std::unique_ptr<ZoneDefinition> ReadDefinition();
private:
bool OpenBaseStream(std::istream& stream);
void SetupStreamProxies();
std::string m_file_name;
bool m_verbose;
IParserLineStream* m_stream;
std::vector<std::unique_ptr<IParserLineStream>> m_open_streams;
bool OpenBaseStream(std::istream& stream);
void SetupStreamProxies();
public:
ZoneDefinitionInputStream(std::istream& stream, std::string fileName, bool verbose);
std::unique_ptr<ZoneDefinition> ReadDefinition();
std::optional<GameId> m_previously_set_game;
};
class ZoneDefinitionOutputStream
{
std::ostream& m_stream;
public:
explicit ZoneDefinitionOutputStream(std::ostream& stream);
@ -35,4 +36,7 @@ public:
void WriteComment(const std::string& comment) const;
void WriteMetaData(const std::string& metaDataKey, const std::string& metaDataValue) const;
void WriteEntry(const std::string& entryKey, const std::string& entryValue) const;
private:
std::ostream& m_stream;
};