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/Dumping/AbstractAssetDumper.h

@@ -2,10 +2,6 @@
 
 #include "IAssetDumper.h"
 
-#include <fstream>
-#include <filesystem>
-#include <iostream>
-
 template<class T>
 class AbstractAssetDumper : public IAssetDumper<T>
 {
@@ -15,77 +11,19 @@ protected:
         return true;
     }
 
-    virtual bool CanDumpAsRaw()
+    virtual void DumpAsset(AssetDumpingContext& context, XAssetInfo<T>* asset) = 0;
-    {
-        return false;
-    }
-
-    virtual bool CanDumpAsGdtEntry()
-    {
-        return false;
-    }
-
-    virtual std::string GetFileNameForAsset(Zone* zone, XAssetInfo<T>* asset)
-    {
-        return asset->m_name;
-    }
-
-    virtual void DumpRaw(AssetDumpingContext& context, XAssetInfo<T>* asset, std::ostream& stream)
-    {
-        
-    }
-
-    virtual GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<T>* asset)
-    {
-        return GdtEntry();
-    }
 
 public:
     void DumpPool(AssetDumpingContext& context, AssetPool<T>* pool) override
-    {
-        if(context.m_gdt && CanDumpAsGdtEntry())
     {
         for (auto assetInfo : *pool)
         {
-                if (assetInfo->m_name[0] == ','
+            if (assetInfo->m_name[0] == ',' || !ShouldDump(assetInfo))
-                    || !ShouldDump(assetInfo))
             {
                 continue;
             }
 
-                auto entry = DumpGdtEntry(context, assetInfo);
+            DumpAsset(context, assetInfo);
-                context.m_gdt->WriteEntry(entry);
-            }
-        }
-        else if(CanDumpAsRaw())
-        {
-            for (auto assetInfo : *pool)
-            {
-                if (assetInfo->m_name[0] == ','
-                    || !ShouldDump(assetInfo))
-                {
-                    continue;
-                }
-
-                std::filesystem::path assetFilePath(context.m_base_path);
-                assetFilePath.append(GetFileNameForAsset(context.m_zone, assetInfo));
-
-                auto assetFileFolder(assetFilePath);
-                assetFileFolder.replace_filename("");
-                create_directories(assetFileFolder);
-
-                std::ofstream file(assetFilePath, std::fstream::out | std::fstream::binary);
-                if (file.is_open())
-                {
-                    DumpRaw(context, assetInfo, file);
-
-                    file.close();
-                }
-                else
-                {
-                    std::cout << "Failed to open file '" << assetFilePath.string() << "' to dump asset '" << assetInfo->m_name.c_str() << "'\n";
-                }
-            }
         }
     }
 };

src/ObjWriting/Dumping/AssetDumpingContext.cpp

@@ -1,6 +1,29 @@
 #include "AssetDumpingContext.h"
 
+#include <filesystem>
+#include <fstream>
+
 AssetDumpingContext::AssetDumpingContext()
     : m_zone(nullptr)
 {
 }
+
+std::unique_ptr<std::ostream> AssetDumpingContext::OpenAssetFile(const std::string& fileName) const
+{
+    std::filesystem::path assetFilePath(m_base_path);
+    assetFilePath.append(fileName);
+
+    auto assetFileFolder(assetFilePath);
+    assetFileFolder.replace_filename("");
+    create_directories(assetFileFolder);
+
+    auto file = std::make_unique<std::ofstream>(assetFilePath, std::fstream::out | std::fstream::binary);
+
+    if (!file->is_open())
+    {
+        std::cout << "Failed to open file '" << assetFilePath.string() << "' to dump asset '" << fileName << "'\n";
+        return nullptr;
+    }
+
+    return std::move(file);
+}

src/ObjWriting/Dumping/AssetDumpingContext.h

@@ -1,7 +1,10 @@
 #pragma once
 
 #include <string>
+#include <ostream>
+#include <memory>
 
+#include "Utils/ClassUtils.h"
 #include "Obj/Gdt/GdtStream.h"
 #include "Zone/Zone.h"
 
@@ -13,4 +16,6 @@ public:
     std::unique_ptr<GdtOutputStream> m_gdt;
 
     AssetDumpingContext();
+
+    _NODISCARD std::unique_ptr<std::ostream> OpenAssetFile(const std::string& fileName) const;
 };

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()
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
-{
-    return true;
-}
-
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
 {
     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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<GfxImage>* asset, std::ostream& stream) 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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<LoadedSound>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset, std::ostream& stream) override;
     };
 }

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

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
+#include <sstream>
-#include <filesystem>
 
 #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);
+    if (assetFile)
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if (stringFile.is_open())
     {
-        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()
+void AssetDumperMapEnts::DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset)
-{
-    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)
 {
     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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<MapEnts>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<MapEnts>* asset, std::ostream& stream) override;
     };
 }

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

@@ -7,18 +7,14 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
+void AssetDumperRawFile::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-{
-    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)
 {
     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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream) override;
     };
 }

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

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-{
-    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)
 {
     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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset) override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<StringTable>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<StringTable>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.cpp

@@ -10,18 +10,15 @@ bool AssetDumperAddonMapEnts::ShouldDump(XAssetInfo<AddonMapEnts>* asset)
     return true;
 }
 
-bool AssetDumperAddonMapEnts::CanDumpAsRaw()
+void AssetDumperAddonMapEnts::DumpAsset(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset)
-{
-    return true;
-}
-
-std::string AssetDumperAddonMapEnts::GetFileNameForAsset(Zone* zone, XAssetInfo<AddonMapEnts>* asset)
-{
-    return asset->m_name;
-}
-
-void AssetDumperAddonMapEnts::DumpRaw(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset, std::ostream& stream)
 {
     const auto* addonMapEnts = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
+
     stream.write(addonMapEnts->entityString, std::max(addonMapEnts->numEntityChars - 1, 0));
 }

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperAddonMapEnts.h

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

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

@@ -31,12 +31,7 @@ bool AssetDumperGfxImage::ShouldDump(XAssetInfo<GfxImage>* asset)
     return image->cardMemory.platform[0] > 0;
 }
 
-bool AssetDumperGfxImage::CanDumpAsRaw()
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
-{
-    return true;
-}
-
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
 {
     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/IW4/AssetDumpers/AssetDumperGfxImage.h

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

src/ObjWriting/Game/IW4/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/IW4/AssetDumpers/AssetDumperLoadedSound.h

@@ -10,8 +10,6 @@ namespace IW4
         static void DumpWavPcm(AssetDumpingContext& context, const LoadedSound* asset, std::ostream& stream);
     protected:
         bool ShouldDump(XAssetInfo<LoadedSound>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<LoadedSound>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset, std::ostream& stream) override;
     };
 }

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

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
+#include <sstream>
-#include <filesystem>
 
 #include "Localize/LocalizeCommon.h"
 #include "Dumping/Localize/StringFileDumper.h"
 
 using namespace IW4;
-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);
+    if (assetFile)
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if (stringFile.is_open())
     {
-        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/IW4/AssetDumpers/AssetDumperRawFile.cpp

@@ -10,19 +10,15 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
+void AssetDumperRawFile::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-{
-    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)
 {
     const auto* rawFile = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     if (rawFile->compressedLen > 0)
     {
         z_stream_s zs{};

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

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

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

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-{
-    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)
 {
     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/IW4/AssetDumpers/AssetDumperStringTable.h

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

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.cpp

@@ -233,33 +233,26 @@ bool AssetDumperVehicle::ShouldDump(XAssetInfo<VehicleDef>* asset)
     return true;
 }
 
-bool AssetDumperVehicle::CanDumpAsRaw()
+void AssetDumperVehicle::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperVehicle::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperVehicle::GetFileNameForAsset(Zone* zone, XAssetInfo<VehicleDef>* asset)
-{
-    return "vehicles/" + asset->m_name;
-}
-
-GdtEntry AssetDumperVehicle::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, GDF_NAME);
         infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperVehicle::DumpRaw(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("vehicles/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(FILE_TYPE_STR);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperVehicle.h

@@ -16,11 +16,6 @@ namespace IW4
 
     protected:
         bool ShouldDump(XAssetInfo<VehicleDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<VehicleDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.cpp

@@ -1013,33 +1013,26 @@ bool AssetDumperWeapon::ShouldDump(XAssetInfo<WeaponCompleteDef>* asset)
     return true;
 }
 
-bool AssetDumperWeapon::CanDumpAsRaw()
+void AssetDumperWeapon::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperWeapon::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperWeapon::GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponCompleteDef>* asset)
-{
-    return "weapons/" + asset->m_name;
-}
-
-GdtEntry AssetDumperWeapon::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, GDF_NAME);
         infoString.ToGdtProperties(FILE_TYPE_STR, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperWeapon::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("weapons/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(FILE_TYPE_STR);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperWeapon.h

@@ -17,11 +17,6 @@ namespace IW4
 
     protected:
         bool ShouldDump(XAssetInfo<WeaponCompleteDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponCompleteDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponCompleteDef>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.cpp

@@ -10,18 +10,14 @@ bool AssetDumperAddonMapEnts::ShouldDump(XAssetInfo<AddonMapEnts>* asset)
     return true;
 }
 
-bool AssetDumperAddonMapEnts::CanDumpAsRaw()
+void AssetDumperAddonMapEnts::DumpAsset(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset)
-{
-    return true;
-}
-
-std::string AssetDumperAddonMapEnts::GetFileNameForAsset(Zone* zone, XAssetInfo<AddonMapEnts>* asset)
-{
-    return asset->m_name;
-}
-
-void AssetDumperAddonMapEnts::DumpRaw(AssetDumpingContext& context, XAssetInfo<AddonMapEnts>* asset, std::ostream& stream)
 {
     const auto* addonMapEnts = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
+
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     stream.write(addonMapEnts->entityString, std::max(addonMapEnts->numEntityChars - 1, 0));
 }

src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperAddonMapEnts.h

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

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

@@ -31,12 +31,7 @@ bool AssetDumperGfxImage::ShouldDump(XAssetInfo<GfxImage>* asset)
     return image->cardMemory.platform[0] > 0;
 }
 
-bool AssetDumperGfxImage::CanDumpAsRaw()
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
-{
-    return true;
-}
-
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
 {
     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/IW5/AssetDumpers/AssetDumperGfxImage.h

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

src/ObjWriting/Game/IW5/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/IW5/AssetDumpers/AssetDumperLoadedSound.h

@@ -8,10 +8,9 @@ namespace IW5
     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;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<LoadedSound>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<LoadedSound>* asset, std::ostream& stream) override;
     };
 }

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

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
+#include <sstream>
-#include <filesystem>
 
 #include "Localize/LocalizeCommon.h"
 #include "Dumping/Localize/StringFileDumper.h"
 
 using namespace IW5;
-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);
+    if (assetFile)
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if (stringFile.is_open())
     {
-        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/IW5/AssetDumpers/AssetDumperRawFile.cpp

@@ -10,12 +10,7 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
+std::string AssetDumperRawFile::GetAssetFileName(XAssetInfo<GfxImage>* asset)
-{
-    return true;
-}
-
-std::string AssetDumperRawFile::GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset)
 {
     std::string cleanAssetName = asset->m_name;
     for (auto& c : cleanAssetName)
@@ -34,9 +29,15 @@ std::string AssetDumperRawFile::GetFileNameForAsset(Zone* zone, XAssetInfo<RawFi
     return cleanAssetName;
 }
 
-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;
     if (rawFile->compressedLen <= 0)
         return;
 

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

@@ -7,10 +7,10 @@ namespace IW5
 {
     class AssetDumperRawFile final : public AbstractAssetDumper<RawFile>
     {
+        static std::string GetAssetFileName(XAssetInfo<GfxImage>* asset);
+
     protected:
         bool ShouldDump(XAssetInfo<RawFile>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset) override;
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream) override;
     };
 }

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

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-{
-    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)
 {
     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/IW5/AssetDumpers/AssetDumperStringTable.h

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

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

@@ -31,18 +31,33 @@ bool AssetDumperGfxImage::ShouldDump(XAssetInfo<GfxImage>* asset)
     return image->loadedSize > 0;
 }
 
-bool AssetDumperGfxImage::CanDumpAsRaw()
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
 {
-    return true;
+    std::string cleanAssetName = asset->m_name;
+    for (auto& c : cleanAssetName)
+    {
+        switch (c)
+        {
+        case '*':
+            c = '_';
+            break;
+
+        default:
+            break;
+        }
     }
 
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
+    return "images/" + cleanAssetName + m_writer->GetFileExtension();
-{
-    return "images/" + asset->m_name + 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/T5/AssetDumpers/AssetDumperGfxImage.h

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

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

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
+#include <sstream>
-#include <filesystem>
 
 #include "Localize/LocalizeCommon.h"
 #include "Dumping/Localize/StringFileDumper.h"
 
 using namespace T5;
-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);
+    if (assetFile)
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if (stringFile.is_open())
     {
-        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/T5/AssetDumpers/AssetDumperRawFile.cpp

@@ -91,20 +91,15 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
+void AssetDumperRawFile::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-{
-    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)
 {
     const auto* rawFile = asset->Asset();
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
 
+    if (!assetFile)
+        return;
+
+    auto& stream = *assetFile;
     const fs::path rawFilePath(rawFile->name);
     const auto extension = rawFilePath.extension().string();
 

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

@@ -9,13 +9,10 @@ namespace T5
     {
         constexpr static size_t GSC_MAX_SIZE = 0xC000000;
 
-        void DumpGsc(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream);
+        static void DumpGsc(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream);
 
     protected:
         bool ShouldDump(XAssetInfo<RawFile>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset) override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<RawFile>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<RawFile>* asset, std::ostream& stream) override;
     };
 }

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

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-{
-    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)
 {
     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/T5/AssetDumpers/AssetDumperStringTable.h

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperFontIcon.cpp

@@ -260,18 +260,13 @@ bool AssetDumperFontIcon::ShouldDump(XAssetInfo<FontIcon>* asset)
     return true;
 }
 
-bool AssetDumperFontIcon::CanDumpAsRaw()
+void AssetDumperFontIcon::DumpAsset(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset)
 {
-    return true;
+    const auto assetFile = context.OpenAssetFile(asset->m_name);
-}
 
-std::string AssetDumperFontIcon::GetFileNameForAsset(Zone* zone, XAssetInfo<FontIcon>* asset)
+    if (!assetFile)
-{
+        return;
-    return asset->m_name;
-}
 
-void AssetDumperFontIcon::DumpRaw(AssetDumpingContext& context, XAssetInfo<FontIcon>* asset, std::ostream& stream)
+    AssetDumperFontIconInternal dumper(*assetFile);
-{
-    AssetDumperFontIconInternal dumper(stream);
     dumper.DumpFontIcon(asset->Asset());
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperFontIcon.h

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

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

@@ -31,12 +31,7 @@ bool AssetDumperGfxImage::ShouldDump(XAssetInfo<GfxImage>* asset)
     return image->loadedSize > 0;
 }
 
-bool AssetDumperGfxImage::CanDumpAsRaw()
+std::string AssetDumperGfxImage::GetAssetFileName(XAssetInfo<GfxImage>* asset) const
-{
-    return true;
-}
-
-std::string AssetDumperGfxImage::GetFileNameForAsset(Zone* zone, XAssetInfo<GfxImage>* asset)
 {
     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/T6/AssetDumpers/AssetDumperGfxImage.h

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

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

@@ -1,13 +1,11 @@
 #include "AssetDumperLocalizeEntry.h"
 
-#include <fstream>
+#include <sstream>
-#include <filesystem>
 
 #include "Localize/LocalizeCommon.h"
 #include "Dumping/Localize/StringFileDumper.h"
 
 using namespace T6;
-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);
+    if (assetFile)
-    stringFilePath.append(context.m_zone->m_name + ".str");
-
-    std::ofstream stringFile(stringFilePath, std::fstream::out | std::ofstream::binary);
-
-    if(stringFile.is_open())
     {
-        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/T6/AssetDumpers/AssetDumperPhysConstraints.cpp

@@ -58,33 +58,26 @@ bool AssetDumperPhysConstraints::ShouldDump(XAssetInfo<PhysConstraints>* asset)
     return true;
 }
 
-bool AssetDumperPhysConstraints::CanDumpAsRaw()
+void AssetDumperPhysConstraints::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperPhysConstraints::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperPhysConstraints::GetFileNameForAsset(Zone* zone, XAssetInfo<PhysConstraints>* asset)
-{
-    return "physconstraints/" + asset->m_name;
-}
-
-GdtEntry AssetDumperPhysConstraints::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_CONSTRAINTS);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperPhysConstraints::DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("physconstraints/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_PHYS_CONSTRAINTS);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysConstraints.h

@@ -12,11 +12,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<PhysConstraints>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<PhysConstraints>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysConstraints>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.cpp

@@ -78,33 +78,26 @@ bool AssetDumperPhysPreset::ShouldDump(XAssetInfo<PhysPreset>* asset)
     return true;
 }
 
-bool AssetDumperPhysPreset::CanDumpAsRaw()
+void AssetDumperPhysPreset::DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperPhysPreset::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperPhysPreset::GetFileNameForAsset(Zone* zone, XAssetInfo<PhysPreset>* asset)
-{
-    return "physic/" + asset->m_name;
-}
-
-GdtEntry AssetDumperPhysPreset::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_PHYS_PRESET);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperPhysPreset::DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("physic/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_PHYS_PRESET);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperPhysPreset.h

@@ -13,11 +13,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<PhysPreset>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<PhysPreset>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<PhysPreset>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.cpp

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperQdb.h

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

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

@@ -7,18 +7,14 @@ bool AssetDumperRawFile::ShouldDump(XAssetInfo<RawFile>* asset)
     return true;
 }
 
-bool AssetDumperRawFile::CanDumpAsRaw()
+void AssetDumperRawFile::DumpAsset(AssetDumpingContext& context, XAssetInfo<RawFile>* asset)
-{
-    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)
 {
     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/T6/AssetDumpers/AssetDumperRawFile.h

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.cpp

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperScriptParseTree.h

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.cpp

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSlug.h

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperSndBank.cpp

@@ -1,5 +1,6 @@
 #include "AssetDumperSndBank.h"
 
+#include <fstream>
 #include <filesystem>
 #include <unordered_map>
 

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

@@ -9,20 +9,15 @@ bool AssetDumperStringTable::ShouldDump(XAssetInfo<StringTable>* asset)
     return true;
 }
 
-bool AssetDumperStringTable::CanDumpAsRaw()
+void AssetDumperStringTable::DumpAsset(AssetDumpingContext& context, XAssetInfo<StringTable>* asset)
-{
-    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)
 {
     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/T6/AssetDumpers/AssetDumperStringTable.h

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

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.cpp

@@ -57,33 +57,26 @@ bool AssetDumperTracer::ShouldDump(XAssetInfo<TracerDef>* asset)
     return true;
 }
 
-bool AssetDumperTracer::CanDumpAsRaw()
+void AssetDumperTracer::DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperTracer::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperTracer::GetFileNameForAsset(Zone* zone, XAssetInfo<TracerDef>* asset)
-{
-    return "tracer/" + asset->m_name;
-}
-
-GdtEntry AssetDumperTracer::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_TRACER);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_TRACER, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperTracer::DumpRaw(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("tracer/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_TRACER);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperTracer.h

@@ -12,11 +12,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<TracerDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<TracerDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<TracerDef>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.cpp

@@ -107,33 +107,26 @@ bool AssetDumperVehicle::ShouldDump(XAssetInfo<VehicleDef>* asset)
     return true;
 }
 
-bool AssetDumperVehicle::CanDumpAsRaw()
+void AssetDumperVehicle::DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperVehicle::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperVehicle::GetFileNameForAsset(Zone* zone, XAssetInfo<VehicleDef>* asset)
-{
-    return "vehicles/" + asset->m_name;
-}
-
-GdtEntry AssetDumperVehicle::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_VEHICLE);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_VEHICLE, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperVehicle::DumpRaw(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("vehicles/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_VEHICLE);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperVehicle.h

@@ -12,11 +12,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<VehicleDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<VehicleDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<VehicleDef>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.cpp

@@ -417,33 +417,26 @@ bool AssetDumperWeapon::ShouldDump(XAssetInfo<WeaponVariantDef>* asset)
     return true;
 }
 
-bool AssetDumperWeapon::CanDumpAsRaw()
+void AssetDumperWeapon::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperWeapon::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperWeapon::GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponVariantDef>* asset)
-{
-    return "weapons/" + asset->m_name;
-}
-
-GdtEntry AssetDumperWeapon::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperWeapon::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("weapons/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeapon.h

@@ -13,11 +13,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<WeaponVariantDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponVariantDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponVariantDef>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.cpp

@@ -63,33 +63,26 @@ bool AssetDumperWeaponAttachment::ShouldDump(XAssetInfo<WeaponAttachment>* asset
     return true;
 }
 
-bool AssetDumperWeaponAttachment::CanDumpAsRaw()
+void AssetDumperWeaponAttachment::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperWeaponAttachment::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperWeaponAttachment::GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponAttachment>* asset)
-{
-    return "attachment/" + asset->m_name;
-}
-
-GdtEntry AssetDumperWeaponAttachment::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperWeaponAttachment::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("attachment/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachment.h

@@ -12,11 +12,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<WeaponAttachment>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponAttachment>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachment>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.cpp

@@ -131,33 +131,26 @@ bool AssetDumperWeaponAttachmentUnique::ShouldDump(XAssetInfo<WeaponAttachmentUn
     return true;
 }
 
-bool AssetDumperWeaponAttachmentUnique::CanDumpAsRaw()
+void AssetDumperWeaponAttachmentUnique::DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperWeaponAttachmentUnique::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperWeaponAttachmentUnique::GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponAttachmentUnique>* asset)
-{
-    return "attachmentunique/" + asset->m_name;
-}
-
-GdtEntry AssetDumperWeaponAttachmentUnique::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_WEAPON_ATTACHMENT_UNIQUE);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperWeaponAttachmentUnique::DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("attachmentunique/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_WEAPON_ATTACHMENT_UNIQUE);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperWeaponAttachmentUnique.h

@@ -13,11 +13,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<WeaponAttachmentUnique>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<WeaponAttachmentUnique>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<WeaponAttachmentUnique>* asset, std::ostream& stream) override;
     };
 }

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.cpp

@@ -46,33 +46,26 @@ bool AssetDumperZBarrier::ShouldDump(XAssetInfo<ZBarrierDef>* asset)
     return true;
 }
 
-bool AssetDumperZBarrier::CanDumpAsRaw()
+void AssetDumperZBarrier::DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
 {
-    return true;
+    // Only dump raw when no gdt available
-}
+    if (context.m_gdt)
-
-bool AssetDumperZBarrier::CanDumpAsGdtEntry()
-{
-    return true;
-}
-
-std::string AssetDumperZBarrier::GetFileNameForAsset(Zone* zone, XAssetInfo<ZBarrierDef>* asset)
-{
-    return "zbarrier/" + asset->m_name;
-}
-
-GdtEntry AssetDumperZBarrier::DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset)
     {
         const auto infoString = CreateInfoString(asset);
         GdtEntry gdtEntry(asset->m_name, ObjConstants::GDF_FILENAME_ZBARRIER);
         infoString.ToGdtProperties(ObjConstants::INFO_STRING_PREFIX_ZBARRIER, gdtEntry);
-
+        context.m_gdt->WriteEntry(gdtEntry);
-    return gdtEntry;
     }
-
+    else
-void AssetDumperZBarrier::DumpRaw(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset, std::ostream& stream)
     {
+        const auto assetFile = context.OpenAssetFile("zbarrier/" + asset->m_name);
+
+        if (!assetFile)
+            return;
+
+        auto& stream = *assetFile;
         const auto infoString = CreateInfoString(asset);
         const auto stringValue = infoString.ToString(ObjConstants::INFO_STRING_PREFIX_ZBARRIER);
         stream.write(stringValue.c_str(), stringValue.size());
     }
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperZBarrier.h

@@ -12,11 +12,6 @@ namespace T6
 
     protected:
         bool ShouldDump(XAssetInfo<ZBarrierDef>* asset) override;
-        bool CanDumpAsRaw() override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset) override;
-        bool CanDumpAsGdtEntry() override;
-
-        std::string GetFileNameForAsset(Zone* zone, XAssetInfo<ZBarrierDef>* asset) override;
-        GdtEntry DumpGdtEntry(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset) override;
-        void DumpRaw(AssetDumpingContext& context, XAssetInfo<ZBarrierDef>* asset, std::ostream& stream) override;
     };
 }