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

Fixed geo layout factory bugs and some sm64 related stuff

Browse Source
This commit is contained in:
KiritoDv
2024-03-26 00:11:46 -06:00
parent aa22c0803e
commit eb2dca9c14
11 changed files with 237 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+8 -4
View File
@@ -1079,11 +1079,14 @@ std::optional<YAML::Node> Companion::AddAsset(YAML::Node asset) {
}
auto rom = this->GetRomData();
auto factory = this->GetFactory(type)->get();
auto factory = this->GetFactory(type);
if(!factory.has_value()) {
return std::nullopt;
}
std::string output;
std::string typeId = ConvertType(type);
int index;
if(symbol != "") {
output = symbol;
@@ -1095,10 +1098,11 @@ std::optional<YAML::Node> Companion::AddAsset(YAML::Node asset) {
asset["autogen"] = true;
asset["symbol"] = output;
auto result = factory->parse(rom, asset);
auto result = this->RegisterAsset(output, asset);
if(result.has_value()){
return std::get<1>(this->RegisterAsset(output, asset).value());
asset["path"] = std::get<0>(result.value());
return std::get<1>(result.value());
}
return std::nullopt;