izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added support for external files instead of a rom

Browse Source
This commit is contained in:
KiritoDv
2024-04-29 12:58:04 -06:00
parent 4d6744dcac
commit e6de326810
2 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+49 -21
View File
@@ -223,8 +223,14 @@ std::optional<ParseResultData> Companion::ParseNode(YAML::Node& node, std::strin
input.close();
result = impl->parse_modding(data, node);
} else {
} else if(this->gConfig.parseMode == ParseMode::Default) {
result = impl->parse(this->gRomData, node);
} else if(this->gConfig.parseMode == ParseMode::Directory) {
auto path = GetSafeNode<std::string>(node, "path");
std::ifstream input( path, std::ios::binary );
auto data = std::vector<uint8_t>( std::istreambuf_iterator( input ), {} );
result = impl->parse(data, node);
input.close();
}
if(!result.has_value()){
@@ -910,26 +916,32 @@ void Companion::Process() {
}
auto start = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
std::ifstream input( this->gRomPath, std::ios::binary );
this->gRomData = std::vector<uint8_t>( std::istreambuf_iterator( input ), {} );
input.close();
this->gCartridge = std::make_shared<N64::Cartridge>(this->gRomData);
this->gCartridge->Initialize();
YAML::Node config = YAML::LoadFile("config.yml");
if(!config[this->gCartridge->GetHash()]){
SPDLOG_ERROR("No config found for {}", this->gCartridge->GetHash());
return;
bool isDirectoryMode = config["mode"] && config["mode"].as<std::string>() == "directory";
if(!isDirectoryMode) {
std::ifstream input( this->gRomPath, std::ios::binary );
this->gRomData = std::vector<uint8_t>( std::istreambuf_iterator( input ), {} );
input.close();
this->gCartridge = std::make_shared<N64::Cartridge>(this->gRomData);
this->gCartridge->Initialize();
if(!config[this->gCartridge->GetHash()]){
SPDLOG_ERROR("No config found for {}", this->gCartridge->GetHash());
return;
}
this->gConfig.parseMode = ParseMode::Default;
} else {
this->gConfig.parseMode = ParseMode::Directory;
}
auto rom = config[this->gCartridge->GetHash()];
auto rom = !isDirectoryMode ? config[this->gCartridge->GetHash()] : config;
auto cfg = rom["config"];
if(!cfg) {
SPDLOG_ERROR("No config found for {}", this->gCartridge->GetHash());
SPDLOG_ERROR("No config found for {}", !isDirectoryMode ? this->gCartridge->GetHash() : GetSafeNode<std::string>(config, "folder"));
return;
}
@@ -1052,12 +1064,19 @@ void Companion::Process() {
spdlog::set_pattern(line);
SPDLOG_INFO("Starting Torch...");
SPDLOG_INFO("Game: {}", this->gCartridge->GetGameTitle());
SPDLOG_INFO("CRC: {}", this->gCartridge->GetCRC());
SPDLOG_INFO("Version: {}", this->gCartridge->GetVersion());
SPDLOG_INFO("Country: [{}]", this->gCartridge->GetCountryCode());
SPDLOG_INFO("Hash: {}", this->gCartridge->GetHash());
SPDLOG_INFO("Assets: {}", this->gAssetPath);
if(this->gConfig.parseMode == ParseMode::Default) {
SPDLOG_INFO("ROM: {}", this->gRomPath);
SPDLOG_INFO("Game: {}", this->gCartridge->GetGameTitle());
SPDLOG_INFO("CRC: {}", this->gCartridge->GetCRC());
SPDLOG_INFO("Version: {}", this->gCartridge->GetVersion());
SPDLOG_INFO("Country: [{}]", this->gCartridge->GetCountryCode());
SPDLOG_INFO("Hash: {}", this->gCartridge->GetHash());
SPDLOG_INFO("Assets: {}", this->gAssetPath);
} else {
SPDLOG_INFO("Mode: Directory");
SPDLOG_INFO("Directory: {}", rom["folder"].as<std::string>());
}
AudioManager::Instance = new AudioManager();
auto wrapper = this->gConfig.exporterType == ExportType::Binary ? new SWrapper(this->gConfig.outputPath) : nullptr;
@@ -1066,7 +1085,12 @@ void Companion::Process() {
auto vWriter = LUS::BinaryWriter();
vWriter.SetEndianness(LUS::Endianness::Big);
vWriter.Write(static_cast<uint8_t>(LUS::Endianness::Big));
vWriter.Write(this->gCartridge->GetCRC());
if(this->gConfig.parseMode == ParseMode::Default) {
vWriter.Write(this->gCartridge->GetCRC());
} else {
vWriter.Write((uint32_t) 0);
}
for (const auto & entry : fs::recursive_directory_iterator(this->gAssetPath)){
if(entry.is_directory()) {
@@ -1079,6 +1103,10 @@ void Companion::Process() {
continue;
}
if(yamlPath.find("config.yml") != std::string::npos) {
continue;
}
YAML::Node root = YAML::LoadFile(yamlPath);
this->gCurrentDirectory = relative(entry.path(), this->gAssetPath).replace_extension("");
this->gCurrentFile = yamlPath;