diff options
| author | KiritoDev <36680385+KiritoDv@users.noreply.github.com> | 2022-02-23 21:37:13 -0600 |
|---|---|---|
| committer | M4xw <m4x@m4xw.net> | 2022-03-22 02:37:41 +0100 |
| commit | 47fc3a2e95cad22551c6a3a89b7a6aa077834c17 (patch) | |
| tree | 813596189657d6703455801d8378a8b8ed8d3fbf | |
| parent | 447295df842156860f07f36d08f0c217f5ad52b6 (diff) | |
Merge branch 'master' into master
| -rw-r--r-- | OTRExporter/CutsceneExporter.cpp | 24 | ||||
| -rw-r--r-- | OTRExporter/TextureExporter.cpp | 3 |
2 files changed, 24 insertions, 3 deletions
diff --git a/OTRExporter/CutsceneExporter.cpp b/OTRExporter/CutsceneExporter.cpp index a70f73e..c0a5b06 100644 --- a/OTRExporter/CutsceneExporter.cpp +++ b/OTRExporter/CutsceneExporter.cpp @@ -414,6 +414,30 @@ void OTRExporter_Cutscene::Save(ZResource* res, const fs::path& outPath, BinaryW writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->endFrame, ((CutsceneCommandTerminator*)cs->commands[i])->endFrame)); break; } + //case 0x0D: + //case 0x6D: + //case 0x47: + //case 0x16: + //case 0x70: + //case 0x71: + //case 0x1C: + //case 0x21: + //case 0x3D: + //case 0x20: + //case 0x3B: + //case 0x1B: + //{ + // writer->Write((uint32_t)(CutsceneCommands)cs->commands[i]->commandID); + // writer->Write((uint32_t)1); + // + // for (int i = 0; i < 12; i++) + // writer->Write((uint32_t)0); + + // //writer->Write((uint32_t)0); + // //writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->base, ((CutsceneCommandTerminator*)cs->commands[i])->startFrame)); + // //writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->endFrame, ((CutsceneCommandTerminator*)cs->commands[i])->endFrame)); + // break; + //} default: { //writer->Write((uint32_t)cs->commands[i]->commandID); diff --git a/OTRExporter/TextureExporter.cpp b/OTRExporter/TextureExporter.cpp index a9fc8bf..69d00b6 100644 --- a/OTRExporter/TextureExporter.cpp +++ b/OTRExporter/TextureExporter.cpp @@ -19,9 +19,6 @@ void OTRExporter_Texture::Save(ZResource* res, const fs::path& outPath, BinaryWr auto data = tex->parent->GetRawData(); - for (size_t i = tex->GetRawDataIndex(); i < tex->GetRawDataIndex() + tex->GetRawDataSize(); i++) - writer->Write(data[i]); - writer->Write((char*)data.data() + tex->GetRawDataIndex(), tex->GetRawDataSize()); auto end = std::chrono::steady_clock::now(); |