diff options
| author | Archez <Archez@users.noreply.github.com> | 2024-09-06 23:59:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-06 23:59:31 -0400 |
| commit | 854685155a6addaf72ec2415ac481a08ace9f9ce (patch) | |
| tree | f8cb1bc957df0b2239263fd26c3caf458d7ee6e0 | |
| parent | 375489d5f1f5fa4b9144ac9669c411e3b149f32a (diff) | |
Export additional data types on arrays (#30)
* export additional data types on arrays
* add o2r git ignore
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | OTRExporter/ArrayExporter.cpp | 30 |
2 files changed, 20 insertions, 11 deletions
@@ -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 +}
|