chore: use method static array for zonewriterfactory

Laupetin · Oct 19, 2024 · ce16d8e · ce16d8e
1 parent a1851b0
commit ce16d8e
Show file tree

Hide file tree

Showing 13 changed files with 209 additions and 308 deletions.
diff --git a/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp b/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.cpp
@@ -16,77 +16,57 @@
 
 using namespace IW3;
 
-class ZoneWriterFactory::Impl
+namespace
 {
-    Zone* m_zone;
-    std::unique_ptr<ZoneWriter> m_writer;
-
-public:
-    explicit Impl(Zone* zone)
-        : m_zone(zone),
-          m_writer(std::make_unique<ZoneWriter>())
-    {
-    }
-
-    void SetupBlocks() const
+    void SetupBlocks(ZoneWriter& writer)
     {
 #define XBLOCK_DEF(name, type) std::make_unique<XBlock>(STR(name), name, type)
 
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_LARGE_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_PHYSICAL_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_LARGE_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_PHYSICAL_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(IW3::XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
 
 #undef XBLOCK_DEF
     }
 
-    static ZoneHeader CreateHeaderForParams()
+    ZoneHeader CreateHeaderForParams()
     {
         ZoneHeader header{};
         header.m_version = ZoneConstants::ZONE_VERSION;
         memcpy(header.m_magic, ZoneConstants::MAGIC_UNSIGNED, sizeof(ZoneHeader::m_magic));
 
         return header;
     }
+} // namespace
 
-    std::unique_ptr<ZoneWriter> CreateWriter()
-    {
-        SetupBlocks();
-
-        auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
-            std::make_unique<ContentWriter>(), m_zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
-        auto* contentInMemoryPtr = contentInMemory.get();
-        m_writer->AddWritingStep(std::move(contentInMemory));
+std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
+{
+    std::unique_ptr<ZoneWriter> writer;
 
-        // Write zone header
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams()));
+    SetupBlocks(*writer);
 
-        m_writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
+    auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
+        std::make_unique<ContentWriter>(), zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
+    auto* contentInMemoryPtr = contentInMemory.get();
+    writer->AddWritingStep(std::move(contentInMemory));
 
-        // Start of the XFile struct
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
-        m_writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(m_zone));
+    // Write zone header
+    writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams()));
 
-        // Start of the zone content
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
 
-        // Return the fully setup zoneloader
-        return std::move(m_writer);
-    }
-};
+    // Start of the XFile struct
+    writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(zone));
 
-bool ZoneWriterFactory::SupportsZone(Zone* zone) const
-{
-    return zone->m_game == &g_GameIW3;
-}
+    // Start of the zone content
+    writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
 
-std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
-{
-    Impl impl(zone);
-    return impl.CreateWriter();
+    return std::move(writer);
 }
diff --git a/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.h b/src/ZoneWriting/Game/IW3/ZoneWriterFactoryIW3.h
@@ -8,10 +8,7 @@ namespace IW3
 {
     class ZoneWriterFactory final : public IZoneWriterFactory
     {
-        class Impl;
-
     public:
-        _NODISCARD bool SupportsZone(Zone* zone) const override;
         _NODISCARD std::unique_ptr<ZoneWriter> CreateWriter(Zone* zone) const override;
     };
 } // namespace IW3
diff --git a/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp b/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.cpp
@@ -18,35 +18,25 @@
 
 using namespace IW4;
 
-class ZoneWriterFactory::Impl
+namespace
 {
-    Zone* m_zone;
-    std::unique_ptr<ZoneWriter> m_writer;
-
-public:
-    explicit Impl(Zone* zone)
-        : m_zone(zone),
-          m_writer(std::make_unique<ZoneWriter>())
-    {
-    }
-
-    void SetupBlocks() const
+    void SetupBlocks(ZoneWriter& writer)
     {
 #define XBLOCK_DEF(name, type) std::make_unique<XBlock>(STR(name), name, type)
 
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_CALLBACK, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_CALLBACK, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
 
 #undef XBLOCK_DEF
     }
 
-    static ZoneHeader CreateHeaderForParams(const bool isSecure, const bool isOfficial)
+    ZoneHeader CreateHeaderForParams(const bool isSecure, const bool isOfficial)
     {
         ZoneHeader header{};
         header.m_version = ZoneConstants::ZONE_VERSION;
@@ -65,49 +55,39 @@ class ZoneWriterFactory::Impl
 
         return header;
     }
+}; // namespace
 
-    std::unique_ptr<ZoneWriter> CreateWriter()
-    {
-        // TODO Support signed fastfiles
-        bool isSecure = false;
-
-        SetupBlocks();
+std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
+{
+    auto writer = std::make_unique<ZoneWriter>();
 
-        auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
-            std::make_unique<ContentWriter>(), m_zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
-        auto* contentInMemoryPtr = contentInMemory.get();
-        m_writer->AddWritingStep(std::move(contentInMemory));
+    // TODO Support signed fastfiles
+    bool isSecure = false;
 
-        // Write zone header
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams(isSecure, false)));
+    SetupBlocks(*writer);
 
-        // Write dummy byte that the game ignores as well. No clue what it means.
-        m_writer->AddWritingStep(std::make_unique<StepWriteZero>(1));
+    auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
+        std::make_unique<ContentWriter>(), zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
+    auto* contentInMemoryPtr = contentInMemory.get();
+    writer->AddWritingStep(std::move(contentInMemory));
 
-        // Write timestamp
-        m_writer->AddWritingStep(std::make_unique<StepWriteTimestamp>());
+    // Write zone header
+    writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams(isSecure, false)));
 
-        m_writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
+    // Write dummy byte that the game ignores as well. No clue what it means.
+    writer->AddWritingStep(std::make_unique<StepWriteZero>(1));
 
-        // Start of the XFile struct
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
-        m_writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(m_zone));
+    // Write timestamp
+    writer->AddWritingStep(std::make_unique<StepWriteTimestamp>());
 
-        // Start of the zone content
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
 
-        // Return the fully setup zoneloader
-        return std::move(m_writer);
-    }
-};
+    // Start of the XFile struct
+    writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(zone));
 
-bool ZoneWriterFactory::SupportsZone(Zone* zone) const
-{
-    return zone->m_game == &g_GameIW4;
-}
+    // Start of the zone content
+    writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
 
-std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
-{
-    Impl impl(zone);
-    return impl.CreateWriter();
+    return std::move(writer);
 }
diff --git a/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.h b/src/ZoneWriting/Game/IW4/ZoneWriterFactoryIW4.h
@@ -8,10 +8,7 @@ namespace IW4
 {
     class ZoneWriterFactory final : public IZoneWriterFactory
     {
-        class Impl;
-
     public:
-        _NODISCARD bool SupportsZone(Zone* zone) const override;
         _NODISCARD std::unique_ptr<ZoneWriter> CreateWriter(Zone* zone) const override;
     };
 } // namespace IW4
diff --git a/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp b/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.cpp
@@ -18,36 +18,26 @@
 
 using namespace IW5;
 
-class ZoneWriterFactory::Impl
+namespace
 {
-    Zone* m_zone;
-    std::unique_ptr<ZoneWriter> m_writer;
-
-public:
-    explicit Impl(Zone* zone)
-        : m_zone(zone),
-          m_writer(std::make_unique<ZoneWriter>())
-    {
-    }
-
-    void SetupBlocks() const
+    void SetupBlocks(ZoneWriter& writer)
     {
 #define XBLOCK_DEF(name, type) std::make_unique<XBlock>(STR(name), name, type)
 
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_CALLBACK, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
-        m_writer->AddXBlock(XBLOCK_DEF(XFILE_BLOCK_SCRIPT, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_TEMP, XBlock::Type::BLOCK_TYPE_TEMP));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_PHYSICAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_RUNTIME, XBlock::Type::BLOCK_TYPE_RUNTIME));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VIRTUAL, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_LARGE, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_CALLBACK, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_VERTEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_INDEX, XBlock::Type::BLOCK_TYPE_NORMAL));
+        writer.AddXBlock(XBLOCK_DEF(XFILE_BLOCK_SCRIPT, XBlock::Type::BLOCK_TYPE_NORMAL));
 
 #undef XBLOCK_DEF
     }
 
-    static ZoneHeader CreateHeaderForParams(const bool isSecure, const bool isOfficial)
+    ZoneHeader CreateHeaderForParams(const bool isSecure, const bool isOfficial)
     {
         ZoneHeader header{};
         header.m_version = ZoneConstants::ZONE_VERSION;
@@ -66,49 +56,39 @@ class ZoneWriterFactory::Impl
 
         return header;
     }
+}; // namespace
 
-    std::unique_ptr<ZoneWriter> CreateWriter()
-    {
-        // TODO Support signed fastfiles
-        bool isSecure = false;
-
-        SetupBlocks();
+std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
+{
+    auto writer = std::make_unique<ZoneWriter>();
 
-        auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
-            std::make_unique<ContentWriter>(), m_zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
-        auto* contentInMemoryPtr = contentInMemory.get();
-        m_writer->AddWritingStep(std::move(contentInMemory));
+    // TODO Support signed fastfiles
+    bool isSecure = false;
 
-        // Write zone header
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams(isSecure, false)));
+    SetupBlocks(*writer);
 
-        // Write dummy byte that the game ignores as well. No clue what it means.
-        m_writer->AddWritingStep(std::make_unique<StepWriteZero>(1));
+    auto contentInMemory = std::make_unique<StepWriteZoneContentToMemory>(
+        std::make_unique<ContentWriter>(), zone, ZoneConstants::OFFSET_BLOCK_BIT_COUNT, ZoneConstants::INSERT_BLOCK);
+    auto* contentInMemoryPtr = contentInMemory.get();
+    writer->AddWritingStep(std::move(contentInMemory));
 
-        // Write timestamp
-        m_writer->AddWritingStep(std::make_unique<StepWriteTimestamp>());
+    // Write zone header
+    writer->AddWritingStep(std::make_unique<StepWriteZoneHeader>(CreateHeaderForParams(isSecure, false)));
 
-        m_writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
+    // Write dummy byte that the game ignores as well. No clue what it means.
+    writer->AddWritingStep(std::make_unique<StepWriteZero>(1));
 
-        // Start of the XFile struct
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
-        m_writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(m_zone));
+    // Write timestamp
+    writer->AddWritingStep(std::make_unique<StepWriteTimestamp>());
 
-        // Start of the zone content
-        m_writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepAddOutputProcessor>(std::make_unique<OutputProcessorDeflate>()));
 
-        // Return the fully setup zoneloader
-        return std::move(m_writer);
-    }
-};
+    // Start of the XFile struct
+    writer->AddWritingStep(std::make_unique<StepWriteZoneSizes>(contentInMemoryPtr));
+    writer->AddWritingStep(std::make_unique<StepWriteXBlockSizes>(zone));
 
-bool ZoneWriterFactory::SupportsZone(Zone* zone) const
-{
-    return zone->m_game == &g_GameIW5;
-}
+    // Start of the zone content
+    writer->AddWritingStep(std::make_unique<StepWriteZoneContentToFile>(contentInMemoryPtr));
 
-std::unique_ptr<ZoneWriter> ZoneWriterFactory::CreateWriter(Zone* zone) const
-{
-    Impl impl(zone);
-    return impl.CreateWriter();
+    return std::move(writer);
 }
diff --git a/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.h b/src/ZoneWriting/Game/IW5/ZoneWriterFactoryIW5.h
@@ -8,10 +8,7 @@ namespace IW5
 {
     class ZoneWriterFactory final : public IZoneWriterFactory
     {
-        class Impl;
-
     public:
-        _NODISCARD bool SupportsZone(Zone* zone) const override;
         _NODISCARD std::unique_ptr<ZoneWriter> CreateWriter(Zone* zone) const override;
     };
 } // namespace IW5