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

Merge branch 'HarbourMasters:main' into main

Browse Source
This commit is contained in:
izzy2lost
2025-08-24 03:06:35 -04:00
committed by GitHub
parent ba303be1a3 f3febeb691
commit de3ec2d0ee
7 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+14
View File
@@ -17,6 +17,15 @@ option(BUILD_FZERO "Build with F-Zero X support" ON)
option(BUILD_MARIO_ARTIST "Build with Mario Artist support" ON)
option(BUILD_NAUDIO "Build with NAudio support" ON)
if(EMSCRIPTEN)
set(BUILD_SM64 OFF) # TODO: This is broken for some reason
add_definitions(-D__EMSCRIPTEN__)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --bind -lidbfs.js -s MODULARIZE=1 -s EXPORT_ES6=1 -s NO_DISABLE_EXCEPTION_CATCHING -s ALLOW_MEMORY_GROWTH=1 -s EXPORT_NAME=createModule -s EXPORTED_RUNTIME_METHODS='[\"FS\", \"IDBFS\"]'")
if(EMSCRIPTEN_PRELOAD)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --preload-file ${EMSCRIPTEN_PRELOAD}")
endif()
endif()
################################################################################
# Set target arch type if empty. Visual studio solution generator provides it.
################################################################################
@@ -225,6 +234,11 @@ if(NOT USE_STANDALONE)
endif()
if(USE_STANDALONE)
if(EMSCRIPTEN)
set(CMAKE_CXX_FLAGS_DEBUG "-O3")
set(SPDLOG_USE_STD_FORMAT ON)
endif()
FetchContent_Declare(
spdlog
GIT_REPOSITORY https://github.com/gabime/spdlog.git
lib/libmio0/utils.c
-3
View File
@@ -16,9 +16,6 @@
#include "utils.h"
// global verbosity setting
int g_verbosity = 0;
int read_s16_be(unsigned char *buf)
{
unsigned tmp = read_u16_be(buf);
lib/libmio0/utils.h
+1 -1
View File
@@ -69,7 +69,7 @@ typedef struct
} dir_list;
// global verbosity setting
extern int g_verbosity;
static int g_verbosity = 0;
#undef ERROR
#define ERROR(...) fprintf(stderr, __VA_ARGS__)
src/Companion.cpp
+30 -23
View File
@@ -210,8 +210,9 @@ void Companion::Init(const ExportType type) {
this->RegisterFactory("NAUDIO:V1:ADPCM_BOOK", std::make_shared<ADPCMBookFactory>());
this->RegisterFactory("NAUDIO:V1:SEQUENCE", std::make_shared<NSequenceFactory>());
#endif
#ifndef __EMSCRIPTEN__ // We call this manually
this->Process();
#endif
}
void Companion::InitFactoriesOnly(const ExportType type) {
@@ -476,6 +477,8 @@ void Companion::ParseCurrentFileConfig(YAML::Node node) {
this->gCurrentDirectory = currentDirectory;
this->gCurrentExternalFiles = currentExternalFiles;
this->gFileHeader.clear();
} else {
SPDLOG_INFO("Skipping external file {} as it has already been processed", externalFileName);
}
}
}
@@ -1030,6 +1033,7 @@ void Companion::ProcessFile(YAML::Node root) {
std::string buffer = stream.str();
if(buffer.empty()) {
SPDLOG_WARN("No data to write for {}", this->gCurrentFile);
return;
}
@@ -1040,6 +1044,7 @@ void Companion::ProcessFile(YAML::Node root) {
}
std::ofstream file(output, std::ios::binary);
SPDLOG_INFO("Writing {} to {}", this->gCurrentFile, output);
if(this->gConfig.exporterType == ExportType::Header) {
fs::path entryPath = this->gCurrentFile;
@@ -1128,7 +1133,7 @@ void Companion::Process() {
auto hash = this->gCartridge->GetHash();
SPDLOG_INFO("ROM decompressed to {}", hash);
SPDLOG_CRITICAL("ROM decompressed to {}", hash);
if (hash != target) {
throw std::runtime_error("Hash mismatch");
@@ -1294,23 +1299,25 @@ void Companion::Process() {
this->ParseHash();
SPDLOG_INFO("------------------------------------------------");
SPDLOG_CRITICAL("------------------------------------------------");
spdlog::set_pattern(line);
SPDLOG_INFO("Starting Torch...");
SPDLOG_CRITICAL("Starting Torch...");
if(this->gConfig.parseMode == ParseMode::Default) {
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);
SPDLOG_CRITICAL("Game: {}", this->gCartridge->GetGameTitle());
SPDLOG_CRITICAL("CRC: {}", this->gCartridge->GetCRC());
SPDLOG_CRITICAL("Version: {}", this->gCartridge->GetVersion());
SPDLOG_CRITICAL("Country: [{}]", this->gCartridge->GetCountryCode());
SPDLOG_CRITICAL("Hash: {}", this->gCartridge->GetHash());
SPDLOG_CRITICAL("Assets: {}", this->gAssetPath);
} else {
SPDLOG_INFO("Mode: Directory");
SPDLOG_INFO("Directory: {}", rom["folder"].as<std::string>());
SPDLOG_CRITICAL("Mode: Directory");
SPDLOG_CRITICAL("Directory: {}", rom["folder"].as<std::string>());
}
SPDLOG_CRITICAL("------------------------------------------------");
AudioManager::Instance = new AudioManager();
BinaryWrapper* wrapper = nullptr;
@@ -1368,7 +1375,7 @@ void Companion::Process() {
}
if(wrapper != nullptr) {
SPDLOG_INFO("Writing version file");
SPDLOG_CRITICAL("Writing version file");
wrapper->AddFile("version", vWriter.ToVector());
vWriter.Close();
wrapper->Close();
@@ -1382,10 +1389,10 @@ void Companion::Process() {
auto end = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
auto level = spdlog::get_level();
spdlog::set_level(spdlog::level::info);
SPDLOG_INFO("Done! Took {}ms", end.count() - start.count());
SPDLOG_CRITICAL("Done! Took {}ms", end.count() - start.count());
SPDLOG_CRITICAL("------------------------------------------------");
spdlog::set_level(level);
spdlog::set_pattern(regular);
SPDLOG_INFO("------------------------------------------------");
Decompressor::ClearCache();
this->gCartridge = nullptr;
@@ -1397,10 +1404,10 @@ void Companion::Pack(const std::string& folder, const std::string& output, const
spdlog::set_level(spdlog::level::debug);
spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
SPDLOG_INFO("------------------------------------------------");
SPDLOG_CRITICAL("------------------------------------------------");
SPDLOG_INFO("Starting Torch...");
SPDLOG_INFO("Scanning {}", folder);
SPDLOG_CRITICAL("Starting Torch...");
SPDLOG_CRITICAL("Scanning {}", folder);
auto start = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
std::unordered_map<std::string, std::vector<char>> files;
@@ -1435,14 +1442,14 @@ void Companion::Pack(const std::string& folder, const std::string& output, const
// Remove parent folder
normalized = normalized.substr(folder.length() + 1);
wrapper->AddFile(normalized, data);
SPDLOG_INFO("> Added {}", normalized);
SPDLOG_CRITICAL("> Added {}", normalized);
}
auto end = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
SPDLOG_INFO("Done! Took {}ms", end.count() - start.count());
SPDLOG_INFO("Exported to {}", output);
SPDLOG_CRITICAL("Done! Took {}ms", end.count() - start.count());
SPDLOG_CRITICAL("Exported to {}", output);
spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
SPDLOG_INFO("------------------------------------------------");
SPDLOG_CRITICAL("------------------------------------------------");
wrapper->Close();
}
@@ -1470,7 +1477,7 @@ std::optional<std::tuple<std::string, YAML::Node>> Companion::RegisterAsset(cons
void Companion::RegisterFactory(const std::string& type, const std::shared_ptr<BaseFactory>& factory) {
this->gFactories[type] = factory;
SPDLOG_DEBUG("Registered factory for {}", type);
SPDLOG_INFO("Registered factory for {}", type);
}
std::optional<std::shared_ptr<BaseFactory>> Companion::GetFactory(const std::string &type) {
src/Companion.h
+3
View File
@@ -134,6 +134,9 @@ public:
explicit Companion(std::filesystem::path rom, const ArchiveType otr, const bool debug, const std::string& srcDir = "", const std::string& destPath = "") :
Companion(rom, otr, debug, false, srcDir, destPath) {}
explicit Companion(std::vector<uint8_t> rom, const ArchiveType otr, const bool debug, const std::string& srcDir = "", const std::string& destPath = "") :
Companion(rom, otr, debug, false, srcDir, destPath) {}
void Init(ExportType type);
void InitFactoriesOnly(ExportType type); // New method to only register factories
src/lib/web.cpp
+53
View File
@@ -0,0 +1,53 @@
#ifdef __EMSCRIPTEN__
#include "Companion.h"
#include <emscripten/bind.h>
using namespace emscripten;
Companion* Companion::Instance;
void Bind(Companion* instance) {
Companion::Instance = instance;
}
EMSCRIPTEN_BINDINGS(Torch) {
register_vector<uint8_t>("VectorUInt8");
function("Bind", &Bind, allow_raw_pointers());
enum_<ExportType>("ExportType")
.value("Header", ExportType::Header)
.value("Code", ExportType::Code)
.value("Binary", ExportType::Binary)
.value("Modding", ExportType::Modding)
.value("XML", ExportType::XML);
enum_<ArchiveType>("ArchiveType")
.value("None", ArchiveType::None)
.value("OTR", ArchiveType::OTR)
.value("O2R", ArchiveType::O2R);
enum_<N64::CountryCode>("CountryCode")
.value("Japan", N64::CountryCode::Japan)
.value("NorthAmerica", N64::CountryCode::NorthAmerica)
.value("Europe", N64::CountryCode::Europe)
.value("Unknown", N64::CountryCode::Unknown);
class_<N64::Cartridge>("Cartridge")
.function("GetGameTitle", &N64::Cartridge::GetGameTitle)
.function("GetCountryCode", &N64::Cartridge::GetCountryCode)
.function("GetCountry", &N64::Cartridge::GetCountry)
.function("GetVersion", &N64::Cartridge::GetVersion)
.function("GetHash", &N64::Cartridge::GetHash)
.function("GetCRC", &N64::Cartridge::GetCRC);
class_<Companion>("Companion")
.constructor<std::vector<uint8_t>, ArchiveType, bool, bool, std::string, std::string>()
.constructor<std::vector<uint8_t>, ArchiveType, bool, bool, std::string>()
.constructor<std::vector<uint8_t>, ArchiveType, bool, bool>()
.function("Init", &Companion::Init)
.function("GetCartridge", &Companion::GetCartridge, allow_raw_pointers())
.function("Process", &Companion::Process)
.function("GetRomData", &Companion::GetRomData, allow_raw_pointers());
}
#endif
src/main.cpp
+2 -2
View File
@@ -2,9 +2,9 @@
#include "CLI11.hpp"
#include "Companion.h"
Companion* Companion::Instance;
#if defined(STANDALONE) && !defined(__EMSCRIPTEN__)
#ifdef STANDALONE
Companion* Companion::Instance;
int main(int argc, char *argv[]) {
CLI::App app{"Torch - [T]orch is [O]ur [R]esource [C]onversion [H]elper\n\