From 854685155a6addaf72ec2415ac481a08ace9f9ce Mon Sep 17 00:00:00 2001 From: Archez Date: Fri, 6 Sep 2024 23:59:31 -0400 Subject: Export additional data types on arrays (#30) * export additional data types on arrays * add o2r git ignore --- .gitignore | 1 + OTRExporter/ArrayExporter.cpp | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0f4e9a8..3f5299d 100644 --- a/.gitignore +++ b/.gitignore @@ -344,6 +344,7 @@ baserom/ baserom_ntsc/ *.vtx.inc *.otr +*.o2r *.swp *.a *.z64 diff --git a/OTRExporter/ArrayExporter.cpp b/OTRExporter/ArrayExporter.cpp index ed9ee40..10c2faf 100644 --- a/OTRExporter/ArrayExporter.cpp +++ b/OTRExporter/ArrayExporter.cpp @@ -37,28 +37,32 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit // OTRTODO: Duplicate code here. Cleanup at a later date... switch (vec->scalarType) { - case ZScalarType::ZSCALAR_U8: - writer->Write(vec->scalars[k].scalarData.u8); - break; case ZScalarType::ZSCALAR_S8: writer->Write(vec->scalars[k].scalarData.s8); break; - case ZScalarType::ZSCALAR_U16: - writer->Write(vec->scalars[k].scalarData.u16); + case ZScalarType::ZSCALAR_U8: + case ZScalarType::ZSCALAR_X8: + writer->Write(vec->scalars[k].scalarData.u8); break; case ZScalarType::ZSCALAR_S16: writer->Write(vec->scalars[k].scalarData.s16); break; + case ZScalarType::ZSCALAR_U16: + case ZScalarType::ZSCALAR_X16: + writer->Write(vec->scalars[k].scalarData.u16); + break; case ZScalarType::ZSCALAR_S32: writer->Write(vec->scalars[k].scalarData.s32); break; case ZScalarType::ZSCALAR_U32: + case ZScalarType::ZSCALAR_X32: writer->Write(vec->scalars[k].scalarData.u32); break; case ZScalarType::ZSCALAR_S64: writer->Write(vec->scalars[k].scalarData.s64); break; case ZScalarType::ZSCALAR_U64: + case ZScalarType::ZSCALAR_X64: writer->Write(vec->scalars[k].scalarData.u64); break; // OTRTODO: ADD OTHER TYPES @@ -75,28 +79,32 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit switch (scal->scalarType) { - case ZScalarType::ZSCALAR_U8: - writer->Write(scal->scalarData.u8); - break; case ZScalarType::ZSCALAR_S8: writer->Write(scal->scalarData.s8); break; - case ZScalarType::ZSCALAR_U16: - writer->Write(scal->scalarData.u16); + case ZScalarType::ZSCALAR_U8: + case ZScalarType::ZSCALAR_X8: + writer->Write(scal->scalarData.u8); break; case ZScalarType::ZSCALAR_S16: writer->Write(scal->scalarData.s16); break; + case ZScalarType::ZSCALAR_U16: + case ZScalarType::ZSCALAR_X16: + writer->Write(scal->scalarData.u16); + break; case ZScalarType::ZSCALAR_S32: writer->Write(scal->scalarData.s32); break; case ZScalarType::ZSCALAR_U32: + case ZScalarType::ZSCALAR_X32: writer->Write(scal->scalarData.u32); break; case ZScalarType::ZSCALAR_S64: writer->Write(scal->scalarData.s64); break; case ZScalarType::ZSCALAR_U64: + case ZScalarType::ZSCALAR_X64: writer->Write(scal->scalarData.u64); break; // OTRTODO: ADD OTHER TYPES @@ -105,4 +113,4 @@ void OTRExporter_Array::Save(ZResource* res, const fs::path& outPath, BinaryWrit } } } -} \ No newline at end of file +} -- cgit v1.2.3