chore: use IObjWriter directly instead of indirection of ObjWriting

src/ObjWriting/Game/IW3/ObjWriterIW3.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW3.h"
+#include "ObjWriterIW3.h"
 
 #include "AssetDumpers/AssetDumperGfxImage.h"
 #include "AssetDumpers/AssetDumperLoadedSound.h"
@@ -10,17 +10,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW3/GameAssetPoolIW3.h"
-#include "Game/IW3/GameIW3.h"
 #include "ObjWriting.h"
 
 using namespace IW3;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW3;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW3/ObjWriterIW3.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW3
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW3

src/ObjWriting/Game/IW3/ZoneDumperIW3.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW3
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW3

src/ObjWriting/Game/IW4/ObjWriterIW4.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW4.h"
+#include "ObjWriterIW4.h"
 
 #include "AssetDumpers/AssetDumperAddonMapEnts.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -23,17 +23,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW4/GameAssetPoolIW4.h"
-#include "Game/IW4/GameIW4.h"
 #include "ObjWriting.h"
 
 using namespace IW4;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW4;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW4/ObjWriterIW4.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW4
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW4

src/ObjWriting/Game/IW4/ZoneDumperIW4.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW4
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW4

src/ObjWriting/Game/IW5/ObjWriterIW5.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperIW5.h"
+#include "ObjWriterIW5.h"
 
 #include "AssetDumpers/AssetDumperAddonMapEnts.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -15,17 +15,11 @@
 #include "AssetDumpers/AssetDumperWeaponAttachment.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/IW5/GameAssetPoolIW5.h"
-#include "Game/IW5/GameIW5.h"
 #include "ObjWriting.h"
 
 using namespace IW5;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameIW5;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/IW5/ObjWriterIW5.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace IW5
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace IW5

src/ObjWriting/Game/IW5/ZoneDumperIW5.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace IW5
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace IW5

src/ObjWriting/Game/T5/ObjWriterT5.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperT5.h"
+#include "ObjWriterT5.h"
 
 #include "AssetDumpers/AssetDumperGfxImage.h"
 #include "AssetDumpers/AssetDumperLocalizeEntry.h"
@@ -10,17 +10,11 @@
 #include "AssetDumpers/AssetDumperWeapon.h"
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "Game/T5/GameAssetPoolT5.h"
-#include "Game/T5/GameT5.h"
 #include "ObjWriting.h"
 
 using namespace T5;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameT5;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/T5/ObjWriterT5.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace T5
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace T5

src/ObjWriting/Game/T5/ZoneDumperT5.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace T5
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace T5

src/ObjWriting/Game/T6/ObjWriterT6.cpp

@@ -1,4 +1,4 @@
-#include "ZoneDumperT6.h"
+#include "ObjWriterT6.h"
 
 #include "AssetDumpers/AssetDumperFontIcon.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
@@ -24,17 +24,11 @@
 #include "AssetDumpers/AssetDumperXModel.h"
 #include "AssetDumpers/AssetDumperZBarrier.h"
 #include "Game/T6/GameAssetPoolT6.h"
-#include "Game/T6/GameT6.h"
 #include "ObjWriting.h"
 
 using namespace T6;
 
-bool ZoneDumper::CanHandleZone(AssetDumpingContext& context) const
-{
-    return context.m_zone->m_game == &g_GameT6;
-}
-
-bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
+bool ObjWriter::DumpZone(AssetDumpingContext& context) const
 {
 #define DUMP_ASSET_POOL(dumperType, poolName, assetType)                                                                                                       \
     if (assetPools->poolName && ObjWriting::ShouldHandleAssetType(assetType))                                                                                  \

src/ObjWriting/Game/T6/ObjWriterT6.h

@@ -0,0 +1,11 @@
+#pragma once
+#include "IObjWriter.h"
+
+namespace T6
+{
+    class ObjWriter final : public IObjWriter
+    {
+    public:
+        bool DumpZone(AssetDumpingContext& context) const override;
+    };
+} // namespace T6

src/ObjWriting/Game/T6/ZoneDumperT6.h

@@ -1,12 +0,0 @@
-#pragma once
-#include "Dumping/IZoneDumper.h"
-
-namespace T6
-{
-    class ZoneDumper final : public IZoneDumper
-    {
-    public:
-        bool CanHandleZone(AssetDumpingContext& context) const override;
-        bool DumpZone(AssetDumpingContext& context) const override;
-    };
-} // namespace T6