Decompressed MREA outputting

DataSpec/DNAMP2/MREA.cpp

@@ -1,3 +1,4 @@
+#include <Athena/FileWriter.hpp>
 #include <lzo/lzo1x.h>
 #include "MREA.hpp"
 
@@ -143,6 +144,16 @@ atUint64 MREA::StreamReader::readUBytesToBuf(void* buf, atUint64 len)
     return len;
 }
 
+void MREA::StreamReader::writeDecompInfos(Athena::io::IStreamWriter& writer) const
+{
+    for (const BlockInfo& info : m_blockInfos)
+    {
+        BlockInfo modInfo = info;
+        modInfo.compSize = 0;
+        modInfo.write(writer);
+    }
+}
+
 bool MREA::Extract(const SpecBase& dataSpec,
                    PAKEntryReadStream& rs,
                    const HECL::ProjectPath& outPath,
@@ -161,6 +172,14 @@ bool MREA::Extract(const SpecBase& dataSpec,
 
     /* MREA decompression stream */
     StreamReader drs(rs, head.compressedBlockCount);
+    Athena::io::FileWriter mreaDecompOut(pakRouter.getCooked(&entry).getWithExtension(_S(".decomp")).getAbsolutePath());
+    head.write(mreaDecompOut);
+    mreaDecompOut.seekAlign32();
+    drs.writeDecompInfos(mreaDecompOut);
+    mreaDecompOut.seekAlign32();
+    atUint64 decompLen = drs.length();
+    mreaDecompOut.writeBytes(drs.readBytes(decompLen).get(), decompLen);
+    drs.seek(0, Athena::Begin);
 
     /* Start up blender connection */
     HECL::BlenderConnection& conn = HECL::BlenderConnection::SharedConnection();
@@ -222,7 +241,7 @@ bool MREA::Extract(const SpecBase& dataSpec,
                   mHeader.visorFlags.disableXray() ? "True" : "False",
                   mHeader.visorFlags.thermalLevelStr());
 
-        /* Seek through unknown per-mesh sections */
+        /* Seek through AROT-relation sections */
         drs.seek(head.secSizes[curSec++], Athena::Current);
         drs.seek(head.secSizes[curSec++], Athena::Current);
     }

DataSpec/DNAMP2/MREA.hpp

@@ -45,6 +45,7 @@ struct MREA
         atUint64 position() const {return m_pos;}
         atUint64 length() const {return m_totalDecompLen;}
         atUint64 readUBytesToBuf(void* buf, atUint64 len);
+        void writeDecompInfos(Athena::io::IStreamWriter& writer) const;
     };
 
     struct Header : BigDNA

DataSpec/DNAMP3/DNAMP3.cpp

@@ -71,8 +71,10 @@ ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const PAK::Entry& entry)
         return {STRG::Extract, nullptr, {_S(".yaml")}};
     case SBIG('TXTR'):
         return {TXTR::Extract, nullptr, {_S(".png")}};
+    /*
     case SBIG('CMDL'):
         return {nullptr, CMDL::Extract, {_S(".blend")}, 1};
+     */
     }
     return {};
 }