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

CollisionFactory Parse and Code Export fixes

Browse Source
This commit is contained in:
inspectredc
2024-04-03 11:31:27 -06:00
committed by Lywx
parent 8f19a5e52b
commit 9b7b9f69e4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/factories/sm64/CollisionFactory.cpp
+4 -1
View File
@@ -2,7 +2,7 @@
#include "Companion.h"
#include "spdlog/spdlog.h"
#define FORMAT_HEX(x) std::hex << x << std::dec
#define FORMAT_HEX(x) std::hex << "0x" << std::uppercase << x << std::nouppercase << std::dec
std::unordered_map<int16_t, SpecialPresetTypes> specialPresetMap = {
{ 0x00, SpecialPresetTypes::SPTYPE_YROT_NO_PARAMS },
@@ -220,6 +220,7 @@ ExportResult SM64::CollisionCodeExporter::Export(std::ostream &write, std::share
}
for (auto &envRegionBox : collision->mEnvRegionBoxes) {
write << fourSpaceTab;
write << "COL_WATER_BOX(";
write << envRegionBox.id << ", ";
write << envRegionBox.x1 << ", ";
write << envRegionBox.z1 << ", ";
@@ -412,9 +413,11 @@ std::optional<std::shared_ptr<IParsedData>> SM64::CollisionFactory::parse(std::v
switch (type) {
case SpecialPresetTypes::SPTYPE_YROT_NO_PARAMS:
extraParams.emplace_back(reader.ReadInt16());
break;
case SpecialPresetTypes::SPTYPE_PARAMS_AND_YROT:
extraParams.emplace_back(reader.ReadInt16());
extraParams.emplace_back(reader.ReadInt16());
break;
case SpecialPresetTypes::SPTYPE_UNKNOWN:
extraParams.emplace_back(reader.ReadInt16());
extraParams.emplace_back(reader.ReadInt16());