Make asset dumpers not provide different implementations for dumping to gdt and raw so any dumper can decide itself how many raw files and gdt entries it wants to make use of

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.cpp

@@ -31,12 +31,7 @@ bool AssetDumperGfxImage::ShouldDump(XAssetInfo<GfxImage>* asset)
     return image->cardMemory.platform[0] > 0;
 }
 
-bool AssetDumperGfxImage::CanDumpAsRaw()
-{
-    return true;
-}
-
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
 {
     std::string cleanAssetName = asset->m_name;
     for (auto& c : cleanAssetName)
@@ -55,8 +50,14 @@ std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxI
     return "images/" + cleanAssetName + m_writer->GetFileExtension();
 }
 
-void AssetDumperGfxImage::DumpRaw(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset, std::ostream& stream)
+void AssetDumperGfxImage::DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset)
 {
     const auto* image = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(GetAssetFileName(asset));
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     m_writer->DumpImage(stream, image->texture.texture);
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperGfxImage.h

@@ -12,11 +12,11 @@ namespace IW3
     {
         std::unique_ptr<IImageWriter> m_writer;
 
+        std::string GetAssetFileName(XAssetInfo<GfxImage>* asset) const;
+
     protected:
         bool ShouldDump(XAssetInfo<GfxImage>* asset) override;
-        bool CanDumpAsRaw() override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset, std::ostream& stream) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset) override;
 
     public:
         AssetDumperGfxImage();

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.cpp

@@ -9,16 +9,6 @@ bool AssetDumperLoadedSound::ShouldDump(XAssetInfo<LoadedSound>* asset)
     return true;
 }
 
-bool AssetDumperLoadedSound::CanDumpAsRaw()
-{
-    return true;
-}
-
-std::string AssetDumperLoadedSound::GetFileNameForAsset(Zone* zone, XAssetInfo<LoadedSound>* asset)
-{
-    return "sound/" + asset->m_name;
-}
-
 void AssetDumperLoadedSound::DumpWavPcm(AssetDumpingContext& context, const LoadedSound* asset, std::ostream& stream)
 {
     const auto riffMasterChunkSize = sizeof(WAV_CHUNK_ID_RIFF)
@@ -60,9 +50,15 @@ void AssetDumperLoadedSound::DumpWavPcm(AssetDumpingContext& context, const Load
     stream.write(asset->sound.data, asset->sound.info.data_len);
 }
 
-void AssetDumperLoadedSound::DumpRaw(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset, std::ostream& stream)
+void AssetDumperLoadedSound::DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset)
 {
     const auto* loadedSound = asset->Asset();
+    const auto assetFile = context.OpenAssetFile("sound/" + asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     switch (static_cast<WavFormat>(loadedSound->sound.info.format))
     {
     case WavFormat::PCM:

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLoadedSound.h

@@ -8,10 +8,9 @@ namespace IW3
     class AssetDumperLoadedSound final : public AbstractAssetDumper<LoadedSound>
     {
         static void DumpWavPcm(AssetDumpingContext& context, const LoadedSound* asset, std::ostream& stream);
+
     protected:
         bool ShouldDump(XAssetInfo<LoadedSound>* asset) override;
-        bool CanDumpAsRaw() override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<LoadedSound>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset, std::ostream& stream) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset) override;
     };
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperLocalizeEntry.cpp

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
-#include <filesystem>
+#include <sstream>
 
 #include "Localize/LocalizeCommon.h"
 #include "Dumping/Localize/StringFileDumper.h"
 
 using namespace IW3;
-namespace fs = std::filesystem;
 
 void AssetDumperLocalizeEntry::DumpPool(AssetDumpingContext& context, AssetPool<LocalizeEntry>* pool)
 {
@@ -15,20 +13,14 @@ void AssetDumperLocalizeEntry::DumpPool(AssetDumpingContext& context, AssetPool<
         return;
 
     const auto language = LocalizeCommon::GetNameOfLanguage(context.m_zone->m_language);
-    fs::path stringsPath(context.m_base_path);
-    stringsPath.append(language);
-    stringsPath.append("localizedstrings");
 
-    create_directories(stringsPath);
+    std::ostringstream ss;
+    ss << language << "/localizedstrings/" << context.m_zone->m_name << ".str";
+    const auto assetFile = context.OpenAssetFile(ss.str());
 
-    auto stringFilePath(stringsPath);
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if (stringFile.is_open())
+    if (assetFile)
     {
-        StringFileDumper stringFileDumper(context.m_zone, stringFile);
+        StringFileDumper stringFileDumper(context.m_zone, *assetFile);
 
         stringFileDumper.SetLanguageName(language);
 
@@ -43,8 +35,6 @@ void AssetDumperLocalizeEntry::DumpPool(AssetDumpingContext& context, AssetPool<
         }
 
         stringFileDumper.Finalize();
-
-        stringFile.close();
     }
     else
     {

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.cpp

@@ -7,18 +7,14 @@ bool AssetDumperMapEnts::ShouldDump(XAssetInfo<MapEnts>* asset)
     return true;
 }
 
-bool AssetDumperMapEnts::CanDumpAsRaw()
-{
-    return true;
-}
-
-std::string AssetDumperMapEnts::GetFileNameForAsset(Zone* zone, XAssetInfo<MapEnts>* asset)
-{
-    return asset->m_name + ".ents";
-}
-
-void AssetDumperMapEnts::DumpRaw(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset, std::ostream& stream)
+void AssetDumperMapEnts::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
 {
     const auto* mapEnts = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name + ".ents");
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     stream.write(mapEnts->entityString, mapEnts->numEntityChars);
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperMapEnts.h

@@ -9,8 +9,6 @@ namespace IW3
     {
     protected:
         bool ShouldDump(XAssetInfo<MapEnts>* asset) override;
-        bool CanDumpAsRaw() override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<MapEnts>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset, std::ostream& stream) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset) override;
     };
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.cpp

@@ -7,18 +7,14 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
-{
-    return true;
-}
-
-std::string AssetDumperRawFile::GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset)
-{
-    return asset->m_name;
-}
-
-void AssetDumperRawFile::DumpRaw(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream)
+void AssetDumperRawFile::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
 {
     const auto* rawFile = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     stream.write(rawFile->buffer, rawFile->len);
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperRawFile.h

@@ -9,8 +9,6 @@ namespace IW3
     {
     protected:
         bool ShouldDump(XAssetInfo<RawFile>* asset) override;
-        bool CanDumpAsRaw() override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset) override;
     };
 }

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.cpp

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
-{
-    return true;
-}
-
-std::string AssetDumperStringTable::GetFileNameForAsset(Zone* zone, XAssetInfo<StringTable>* asset)
-{
-    return asset->m_name;
-}
-
-void AssetDumperStringTable::DumpRaw(AssetDumpingContext& context, XAssetInfo<StringTable>* asset, std::ostream& stream)
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
 {
     const auto* stringTable = asset->Asset();
-    CsvOutputStream csv(stream);
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    CsvOutputStream csv(*assetFile);
 
     for (auto row = 0; row < stringTable->rowCount; row++)
     {

src/ObjWriting/Game/IW3/AssetDumpers/AssetDumperStringTable.h

@@ -9,9 +9,6 @@ namespace IW3
     {
     protected:
         bool ShouldDump(XAssetInfo<StringTable>* asset) override;
-        bool CanDumpAsRaw() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<StringTable>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<StringTable>* asset, std::ostream& stream) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset) override;
     };
 }