From 4feccd4587bb4591fcc09641bdc50ce549228d8b Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Tue, 6 Jan 2026 10:30:16 +0000 Subject: [PATCH] refactor: add game name to generated load and write files --- src/ZoneCode.lua | 49 ++++++++++----- .../Templates/AssetStructTestsTemplate.cpp | 5 +- .../Generating/Templates/ZoneLoadTemplate.cpp | 55 +++++++++++++++-- .../Generating/Templates/ZoneLoadTemplate.h | 3 + .../Generating/Templates/ZoneMarkTemplate.cpp | 18 +++--- .../Templates/ZoneWriteTemplate.cpp | 59 +++++++++++++++++-- .../Generating/Templates/ZoneWriteTemplate.h | 3 + src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp | 26 +------- src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp | 36 +---------- src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp | 41 +------------ src/ZoneLoading/Game/T5/ContentLoaderT5.cpp | 33 +---------- src/ZoneLoading/Game/T6/ContentLoaderT6.cpp | 49 +-------------- src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp | 26 +------- src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp | 36 +---------- src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp | 41 +------------ src/ZoneWriting/Game/T5/ContentWriterT5.cpp | 33 +---------- src/ZoneWriting/Game/T6/ContentWriterT6.cpp | 49 +-------------- 17 files changed, 168 insertions(+), 394 deletions(-) diff --git a/src/ZoneCode.lua b/src/ZoneCode.lua index 29c9a75d..61f6694f 100644 --- a/src/ZoneCode.lua +++ b/src/ZoneCode.lua @@ -198,16 +198,22 @@ ZoneCode.Assets = { } function ZoneCode:outputForAssets(assetList) + buildoutputs { + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/AssetLoader%{file.basename}.h", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/AssetMarker%{file.basename}.h", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/AssetWriter%{file.basename}.h", + } + for i = 1, #assetList do local assetNameLower = string.lower(assetList[i]) buildoutputs { - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.cpp", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.h", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_write_db.cpp", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_write_db.h", - "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_struct_test.cpp", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_load_db.cpp", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_load_db.h", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_mark_db.cpp", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_mark_db.h", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_write_db.cpp", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_write_db.h", + "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_%{string.lower(file.basename)}_struct_test.cpp", } end end @@ -216,9 +222,11 @@ function ZoneCode:allTestFiles() result = {} for game, assets in pairs(self.Assets) do + local gameLower = string.lower(game) + for i, assetName in ipairs(assets) do local assetNameLower = string.lower(assetName) - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_struct_test.cpp") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_struct_test.cpp") end end @@ -229,12 +237,13 @@ function ZoneCode:allMarkFiles() result = {} for game, assets in pairs(self.Assets) do + local gameLower = string.lower(game) -- PerAsset for i, assetName in ipairs(assets) do local assetNameLower = string.lower(assetName) - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp") - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_mark_db.cpp") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_mark_db.h") end -- PerTemplate @@ -248,11 +257,17 @@ function ZoneCode:allLoadFiles() result = {} for game, assets in pairs(self.Assets) do + local gameLower = string.lower(game) + + -- PerAsset for i, assetName in ipairs(assets) do local assetNameLower = string.lower(assetName) - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.cpp") - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.h") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_load_db.cpp") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_load_db.h") end + + -- PerTemplate + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetLoader" .. game .. ".h") end return result @@ -262,11 +277,17 @@ function ZoneCode:allWriteFiles() result = {} for game, assets in pairs(self.Assets) do + local gameLower = string.lower(game) + + -- PerAsset for i, assetName in ipairs(assets) do local assetNameLower = string.lower(assetName) - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_write_db.cpp") - table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_write_db.h") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_write_db.cpp") + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_" .. gameLower .. "_write_db.h") end + + -- PerTemplate + table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/AssetWriter" .. game .. ".h") end return result diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp index f908d324..4cfa9078 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/AssetStructTestsTemplate.cpp @@ -87,7 +87,10 @@ std::vector AssetStructTestsTemplate::GetFilesToRenderOncePerA auto assetName = context.m_asset->m_definition->m_name; utils::MakeStringLowerCase(assetName); - files.emplace_back(std::format("XAssets/{0}/{0}_struct_test.cpp", assetName), TAG_SOURCE); + auto gameName = context.m_game; + utils::MakeStringLowerCase(gameName); + + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_struct_test.cpp", assetName, gameName), TAG_SOURCE); return files; } diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp index 9a0f58ba..128d0770 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.cpp @@ -12,6 +12,33 @@ namespace { constexpr int TAG_HEADER = 1; constexpr int TAG_SOURCE = 2; + constexpr int TAG_ALL_LOADERS = 3; + + class PerTemplate final : BaseTemplate + { + public: + PerTemplate(std::ostream& stream, const OncePerTemplateRenderingContext& context) + : BaseTemplate(stream), + m_env(context) + { + } + + void AllLoaders() const + { + AddGeneratedHint(); + + LINE("#pragma once") + LINE("") + + for (const auto* asset : m_env.m_assets) + { + LINEF("#include \"Game/{0}/XAssets/{1}/{1}_{2}_load_db.h\"", m_env.m_game, Lower(asset->m_definition->m_name), Lower(m_env.m_game)) + } + } + + private: + const OncePerTemplateRenderingContext& m_env; + }; class PerAsset final : BaseTemplate { @@ -135,7 +162,7 @@ namespace { AddGeneratedHint(); - LINEF("#include \"{0}_load_db.h\"", Lower(m_env.m_asset->m_definition->m_name)) + LINEF("#include \"{0}_{1}_load_db.h\"", Lower(m_env.m_asset->m_definition->m_name), Lower(m_env.m_game)) LINE("") LINEF("#include \"Game/{0}/AssetMarker{0}.h\"", m_env.m_game) LINE("") @@ -147,7 +174,7 @@ namespace LINE("// Referenced Assets:") for (const auto* type : m_env.m_referenced_assets) { - LINEF("#include \"../{0}/{0}_load_db.h\"", Lower(type->m_type->m_name)) + LINEF("#include \"../{0}/{0}_{1}_load_db.h\"", Lower(type->m_type->m_name), Lower(m_env.m_game)) } } @@ -2192,6 +2219,23 @@ namespace }; } // namespace +std::vector ZoneLoadTemplate::GetFilesToRenderOncePerTemplate(const OncePerTemplateRenderingContext& context) +{ + std::vector files; + + files.emplace_back(std::format("AssetLoader{0}.h", context.m_game), TAG_ALL_LOADERS); + + return files; +} + +void ZoneLoadTemplate::RenderOncePerTemplateFile(std::ostream& stream, const CodeTemplateFileTag fileTag, const OncePerTemplateRenderingContext& context) +{ + assert(fileTag == TAG_ALL_LOADERS); + + const PerTemplate t(stream, context); + t.AllLoaders(); +} + std::vector ZoneLoadTemplate::GetFilesToRenderOncePerAsset(const OncePerAssetRenderingContext& context) { std::vector files; @@ -2199,8 +2243,11 @@ std::vector ZoneLoadTemplate::GetFilesToRenderOncePerAsset(con auto assetName = context.m_asset->m_definition->m_name; utils::MakeStringLowerCase(assetName); - files.emplace_back(std::format("XAssets/{0}/{0}_load_db.h", assetName), TAG_HEADER); - files.emplace_back(std::format("XAssets/{0}/{0}_load_db.cpp", assetName), TAG_SOURCE); + auto gameName = context.m_game; + utils::MakeStringLowerCase(gameName); + + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_load_db.h", assetName, gameName), TAG_HEADER); + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_load_db.cpp", assetName, gameName), TAG_SOURCE); return files; } diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.h b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.h index d269b57c..04787ea8 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.h +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneLoadTemplate.h @@ -5,6 +5,9 @@ class ZoneLoadTemplate final : public ICodeTemplate { public: + std::vector GetFilesToRenderOncePerTemplate(const OncePerTemplateRenderingContext& context) override; + void RenderOncePerTemplateFile(std::ostream& stream, CodeTemplateFileTag fileTag, const OncePerTemplateRenderingContext& context) override; + std::vector GetFilesToRenderOncePerAsset(const OncePerAssetRenderingContext& context) override; void RenderOncePerAssetFile(std::ostream& stream, CodeTemplateFileTag fileTag, const OncePerAssetRenderingContext& context) override; }; diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp index 4c29fcfc..df1177cb 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp @@ -32,10 +32,7 @@ namespace for (const auto* asset : m_env.m_assets) { - auto lowerAssetName = asset->m_definition->m_name; - utils::MakeStringLowerCase(lowerAssetName); - - LINEF("#include \"Game/{0}/XAssets/{1}/{1}_mark_db.h\"", m_env.m_game, lowerAssetName) + LINEF("#include \"Game/{0}/XAssets/{1}/{1}_{2}_mark_db.h\"", m_env.m_game, Lower(asset->m_definition->m_name), Lower(m_env.m_game)) } } @@ -142,7 +139,7 @@ namespace { AddGeneratedHint(); - LINEF("#include \"{0}_mark_db.h\"", Lower(m_env.m_asset->m_definition->m_name)) + LINEF("#include \"{0}_{1}_mark_db.h\"", Lower(m_env.m_asset->m_definition->m_name), Lower(m_env.m_game)) if (!m_env.m_referenced_assets.empty()) { @@ -150,7 +147,7 @@ namespace LINE("// Referenced Assets:") for (const auto* type : m_env.m_referenced_assets) { - LINEF("#include \"../{0}/{0}_mark_db.h\"", Lower(type->m_type->m_name)) + LINEF("#include \"../{0}/{0}_{1}_mark_db.h\"", Lower(type->m_type->m_name), Lower(m_env.m_game)) } } LINE("") @@ -802,7 +799,7 @@ void ZoneMarkTemplate::RenderOncePerTemplateFile(std::ostream& stream, const Cod { assert(fileTag == TAG_ALL_MARKERS); - PerTemplate t(stream, context); + const PerTemplate t(stream, context); t.AllMarkers(); } @@ -813,8 +810,11 @@ std::vector ZoneMarkTemplate::GetFilesToRenderOncePerAsset(con auto assetName = context.m_asset->m_definition->m_name; utils::MakeStringLowerCase(assetName); - files.emplace_back(std::format("XAssets/{0}/{0}_mark_db.h", assetName), TAG_HEADER); - files.emplace_back(std::format("XAssets/{0}/{0}_mark_db.cpp", assetName), TAG_SOURCE); + auto gameName = context.m_game; + utils::MakeStringLowerCase(gameName); + + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_mark_db.h", assetName, gameName), TAG_HEADER); + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_mark_db.cpp", assetName, gameName), TAG_SOURCE); return files; } diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp index 69b016c8..921a3388 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp @@ -2,6 +2,7 @@ #include "Domain/Computations/StructureComputations.h" #include "Internal/BaseTemplate.h" +#include "Utils/StringUtils.h" #include #include @@ -11,6 +12,33 @@ namespace { constexpr CodeTemplateFileTag TAG_HEADER = 1; constexpr CodeTemplateFileTag TAG_SOURCE = 2; + constexpr CodeTemplateFileTag TAG_ALL_WRITERS = 3; + + class PerTemplate final : BaseTemplate + { + public: + PerTemplate(std::ostream& stream, const OncePerTemplateRenderingContext& context) + : BaseTemplate(stream), + m_env(context) + { + } + + void AllWriters() const + { + AddGeneratedHint(); + + LINE("#pragma once") + LINE("") + + for (const auto* asset : m_env.m_assets) + { + LINEF("#include \"Game/{0}/XAssets/{1}/{1}_{2}_write_db.h\"", m_env.m_game, Lower(asset->m_definition->m_name), Lower(m_env.m_game)) + } + } + + private: + const OncePerTemplateRenderingContext& m_env; + }; class PerAsset final : BaseTemplate { @@ -111,7 +139,7 @@ namespace { AddGeneratedHint(); - LINEF("#include \"{0}_write_db.h\"", Lower(m_env.m_asset->m_definition->m_name)) + LINEF("#include \"{0}_{1}_write_db.h\"", Lower(m_env.m_asset->m_definition->m_name), Lower(m_env.m_game)) if (!m_env.m_referenced_assets.empty()) { @@ -119,7 +147,7 @@ namespace LINE("// Referenced Assets:") for (const auto* type : m_env.m_referenced_assets) { - LINEF("#include \"../{0}/{0}_write_db.h\"", Lower(type->m_type->m_name)) + LINEF("#include \"../{0}/{0}_{1}_write_db.h\"", Lower(type->m_type->m_name), Lower(m_env.m_game)) } } @@ -1228,16 +1256,35 @@ namespace }; } // namespace +std::vector ZoneWriteTemplate::GetFilesToRenderOncePerTemplate(const OncePerTemplateRenderingContext& context) +{ + std::vector files; + + files.emplace_back(std::format("AssetWriter{0}.h", context.m_game), TAG_ALL_WRITERS); + + return files; +} + +void ZoneWriteTemplate::RenderOncePerTemplateFile(std::ostream& stream, const CodeTemplateFileTag fileTag, const OncePerTemplateRenderingContext& context) +{ + assert(fileTag == TAG_ALL_WRITERS); + + const PerTemplate t(stream, context); + t.AllWriters(); +} + std::vector ZoneWriteTemplate::GetFilesToRenderOncePerAsset(const OncePerAssetRenderingContext& context) { std::vector files; auto assetName = context.m_asset->m_definition->m_name; - for (auto& c : assetName) - c = static_cast(tolower(c)); + utils::MakeStringLowerCase(assetName); - files.emplace_back(std::format("XAssets/{0}/{0}_write_db.h", assetName), TAG_HEADER); - files.emplace_back(std::format("XAssets/{0}/{0}_write_db.cpp", assetName), TAG_SOURCE); + auto gameName = context.m_game; + utils::MakeStringLowerCase(gameName); + + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_write_db.h", assetName, gameName), TAG_HEADER); + files.emplace_back(std::format("XAssets/{0}/{0}_{1}_write_db.cpp", assetName, gameName), TAG_SOURCE); return files; } diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.h b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.h index 84b1bfd4..ab6220cd 100644 --- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.h +++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.h @@ -5,6 +5,9 @@ class ZoneWriteTemplate final : public ICodeTemplate { public: + std::vector GetFilesToRenderOncePerTemplate(const OncePerTemplateRenderingContext& context) override; + void RenderOncePerTemplateFile(std::ostream& stream, CodeTemplateFileTag fileTag, const OncePerTemplateRenderingContext& context) override; + std::vector GetFilesToRenderOncePerAsset(const OncePerAssetRenderingContext& context) override; void RenderOncePerAssetFile(std::ostream& stream, CodeTemplateFileTag fileTag, const OncePerAssetRenderingContext& context) override; }; diff --git a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp index 169efdf6..eadf6c3c 100644 --- a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp +++ b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp @@ -1,31 +1,7 @@ #include "ContentLoaderIW3.h" +#include "Game/IW3/AssetLoaderIW3.h" #include "Game/IW3/IW3.h" -#include "Game/IW3/XAssets/clipmap_t/clipmap_t_load_db.h" -#include "Game/IW3/XAssets/comworld/comworld_load_db.h" -#include "Game/IW3/XAssets/font_s/font_s_load_db.h" -#include "Game/IW3/XAssets/fxeffectdef/fxeffectdef_load_db.h" -#include "Game/IW3/XAssets/fximpacttable/fximpacttable_load_db.h" -#include "Game/IW3/XAssets/gameworldmp/gameworldmp_load_db.h" -#include "Game/IW3/XAssets/gameworldsp/gameworldsp_load_db.h" -#include "Game/IW3/XAssets/gfximage/gfximage_load_db.h" -#include "Game/IW3/XAssets/gfxlightdef/gfxlightdef_load_db.h" -#include "Game/IW3/XAssets/gfxworld/gfxworld_load_db.h" -#include "Game/IW3/XAssets/loadedsound/loadedsound_load_db.h" -#include "Game/IW3/XAssets/localizeentry/localizeentry_load_db.h" -#include "Game/IW3/XAssets/mapents/mapents_load_db.h" -#include "Game/IW3/XAssets/material/material_load_db.h" -#include "Game/IW3/XAssets/materialtechniqueset/materialtechniqueset_load_db.h" -#include "Game/IW3/XAssets/menudef_t/menudef_t_load_db.h" -#include "Game/IW3/XAssets/menulist/menulist_load_db.h" -#include "Game/IW3/XAssets/physpreset/physpreset_load_db.h" -#include "Game/IW3/XAssets/rawfile/rawfile_load_db.h" -#include "Game/IW3/XAssets/snd_alias_list_t/snd_alias_list_t_load_db.h" -#include "Game/IW3/XAssets/sndcurve/sndcurve_load_db.h" -#include "Game/IW3/XAssets/stringtable/stringtable_load_db.h" -#include "Game/IW3/XAssets/weapondef/weapondef_load_db.h" -#include "Game/IW3/XAssets/xanimparts/xanimparts_load_db.h" -#include "Game/IW3/XAssets/xmodel/xmodel_load_db.h" #include "Loading/Exception/UnsupportedAssetTypeException.h" #include diff --git a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp index 50650731..6f041a62 100644 --- a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp +++ b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp @@ -1,41 +1,7 @@ #include "ContentLoaderIW4.h" +#include "Game/IW4/AssetLoaderIW4.h" #include "Game/IW4/IW4.h" -#include "Game/IW4/XAssets/addonmapents/addonmapents_load_db.h" -#include "Game/IW4/XAssets/clipmap_t/clipmap_t_load_db.h" -#include "Game/IW4/XAssets/comworld/comworld_load_db.h" -#include "Game/IW4/XAssets/font_s/font_s_load_db.h" -#include "Game/IW4/XAssets/fxeffectdef/fxeffectdef_load_db.h" -#include "Game/IW4/XAssets/fximpacttable/fximpacttable_load_db.h" -#include "Game/IW4/XAssets/fxworld/fxworld_load_db.h" -#include "Game/IW4/XAssets/gameworldmp/gameworldmp_load_db.h" -#include "Game/IW4/XAssets/gameworldsp/gameworldsp_load_db.h" -#include "Game/IW4/XAssets/gfximage/gfximage_load_db.h" -#include "Game/IW4/XAssets/gfxlightdef/gfxlightdef_load_db.h" -#include "Game/IW4/XAssets/gfxworld/gfxworld_load_db.h" -#include "Game/IW4/XAssets/leaderboarddef/leaderboarddef_load_db.h" -#include "Game/IW4/XAssets/loadedsound/loadedsound_load_db.h" -#include "Game/IW4/XAssets/localizeentry/localizeentry_load_db.h" -#include "Game/IW4/XAssets/mapents/mapents_load_db.h" -#include "Game/IW4/XAssets/material/material_load_db.h" -#include "Game/IW4/XAssets/materialpixelshader/materialpixelshader_load_db.h" -#include "Game/IW4/XAssets/materialtechniqueset/materialtechniqueset_load_db.h" -#include "Game/IW4/XAssets/materialvertexdeclaration/materialvertexdeclaration_load_db.h" -#include "Game/IW4/XAssets/materialvertexshader/materialvertexshader_load_db.h" -#include "Game/IW4/XAssets/menudef_t/menudef_t_load_db.h" -#include "Game/IW4/XAssets/menulist/menulist_load_db.h" -#include "Game/IW4/XAssets/physcollmap/physcollmap_load_db.h" -#include "Game/IW4/XAssets/physpreset/physpreset_load_db.h" -#include "Game/IW4/XAssets/rawfile/rawfile_load_db.h" -#include "Game/IW4/XAssets/snd_alias_list_t/snd_alias_list_t_load_db.h" -#include "Game/IW4/XAssets/sndcurve/sndcurve_load_db.h" -#include "Game/IW4/XAssets/stringtable/stringtable_load_db.h" -#include "Game/IW4/XAssets/structureddatadefset/structureddatadefset_load_db.h" -#include "Game/IW4/XAssets/tracerdef/tracerdef_load_db.h" -#include "Game/IW4/XAssets/vehicledef/vehicledef_load_db.h" -#include "Game/IW4/XAssets/weaponcompletedef/weaponcompletedef_load_db.h" -#include "Game/IW4/XAssets/xanimparts/xanimparts_load_db.h" -#include "Game/IW4/XAssets/xmodel/xmodel_load_db.h" #include "Loading/Exception/UnsupportedAssetTypeException.h" #include diff --git a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp index ada66414..b36e2df5 100644 --- a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp +++ b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp @@ -1,46 +1,7 @@ #include "ContentLoaderIW5.h" +#include "Game/IW5/AssetLoaderIW5.h" #include "Game/IW5/IW5.h" -#include "Game/IW5/XAssets/addonmapents/addonmapents_load_db.h" -#include "Game/IW5/XAssets/clipmap_t/clipmap_t_load_db.h" -#include "Game/IW5/XAssets/comworld/comworld_load_db.h" -#include "Game/IW5/XAssets/font_s/font_s_load_db.h" -#include "Game/IW5/XAssets/fxeffectdef/fxeffectdef_load_db.h" -#include "Game/IW5/XAssets/fximpacttable/fximpacttable_load_db.h" -#include "Game/IW5/XAssets/fxworld/fxworld_load_db.h" -#include "Game/IW5/XAssets/gfximage/gfximage_load_db.h" -#include "Game/IW5/XAssets/gfxlightdef/gfxlightdef_load_db.h" -#include "Game/IW5/XAssets/gfxworld/gfxworld_load_db.h" -#include "Game/IW5/XAssets/glassworld/glassworld_load_db.h" -#include "Game/IW5/XAssets/leaderboarddef/leaderboarddef_load_db.h" -#include "Game/IW5/XAssets/loadedsound/loadedsound_load_db.h" -#include "Game/IW5/XAssets/localizeentry/localizeentry_load_db.h" -#include "Game/IW5/XAssets/mapents/mapents_load_db.h" -#include "Game/IW5/XAssets/material/material_load_db.h" -#include "Game/IW5/XAssets/materialpixelshader/materialpixelshader_load_db.h" -#include "Game/IW5/XAssets/materialtechniqueset/materialtechniqueset_load_db.h" -#include "Game/IW5/XAssets/materialvertexdeclaration/materialvertexdeclaration_load_db.h" -#include "Game/IW5/XAssets/materialvertexshader/materialvertexshader_load_db.h" -#include "Game/IW5/XAssets/menudef_t/menudef_t_load_db.h" -#include "Game/IW5/XAssets/menulist/menulist_load_db.h" -#include "Game/IW5/XAssets/pathdata/pathdata_load_db.h" -#include "Game/IW5/XAssets/physcollmap/physcollmap_load_db.h" -#include "Game/IW5/XAssets/physpreset/physpreset_load_db.h" -#include "Game/IW5/XAssets/rawfile/rawfile_load_db.h" -#include "Game/IW5/XAssets/scriptfile/scriptfile_load_db.h" -#include "Game/IW5/XAssets/snd_alias_list_t/snd_alias_list_t_load_db.h" -#include "Game/IW5/XAssets/sndcurve/sndcurve_load_db.h" -#include "Game/IW5/XAssets/stringtable/stringtable_load_db.h" -#include "Game/IW5/XAssets/structureddatadefset/structureddatadefset_load_db.h" -#include "Game/IW5/XAssets/surfacefxtable/surfacefxtable_load_db.h" -#include "Game/IW5/XAssets/tracerdef/tracerdef_load_db.h" -#include "Game/IW5/XAssets/vehicledef/vehicledef_load_db.h" -#include "Game/IW5/XAssets/vehicletrack/vehicletrack_load_db.h" -#include "Game/IW5/XAssets/weaponattachment/weaponattachment_load_db.h" -#include "Game/IW5/XAssets/weaponcompletedef/weaponcompletedef_load_db.h" -#include "Game/IW5/XAssets/xanimparts/xanimparts_load_db.h" -#include "Game/IW5/XAssets/xmodel/xmodel_load_db.h" -#include "Game/IW5/XAssets/xmodelsurfs/xmodelsurfs_load_db.h" #include "Loading/Exception/UnsupportedAssetTypeException.h" #include diff --git a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp index d8549be4..2959c432 100644 --- a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp +++ b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp @@ -1,38 +1,7 @@ #include "ContentLoaderT5.h" +#include "Game/T5/AssetLoaderT5.h" #include "Game/T5/T5.h" -#include "Game/T5/XAssets/clipmap_t/clipmap_t_load_db.h" -#include "Game/T5/XAssets/comworld/comworld_load_db.h" -#include "Game/T5/XAssets/ddlroot_t/ddlroot_t_load_db.h" -#include "Game/T5/XAssets/destructibledef/destructibledef_load_db.h" -#include "Game/T5/XAssets/emblemset/emblemset_load_db.h" -#include "Game/T5/XAssets/font_s/font_s_load_db.h" -#include "Game/T5/XAssets/fxeffectdef/fxeffectdef_load_db.h" -#include "Game/T5/XAssets/fximpacttable/fximpacttable_load_db.h" -#include "Game/T5/XAssets/gameworldmp/gameworldmp_load_db.h" -#include "Game/T5/XAssets/gameworldsp/gameworldsp_load_db.h" -#include "Game/T5/XAssets/gfximage/gfximage_load_db.h" -#include "Game/T5/XAssets/gfxlightdef/gfxlightdef_load_db.h" -#include "Game/T5/XAssets/gfxworld/gfxworld_load_db.h" -#include "Game/T5/XAssets/glasses/glasses_load_db.h" -#include "Game/T5/XAssets/localizeentry/localizeentry_load_db.h" -#include "Game/T5/XAssets/mapents/mapents_load_db.h" -#include "Game/T5/XAssets/material/material_load_db.h" -#include "Game/T5/XAssets/materialtechniqueset/materialtechniqueset_load_db.h" -#include "Game/T5/XAssets/menudef_t/menudef_t_load_db.h" -#include "Game/T5/XAssets/menulist/menulist_load_db.h" -#include "Game/T5/XAssets/packindex/packindex_load_db.h" -#include "Game/T5/XAssets/physconstraints/physconstraints_load_db.h" -#include "Game/T5/XAssets/physpreset/physpreset_load_db.h" -#include "Game/T5/XAssets/rawfile/rawfile_load_db.h" -#include "Game/T5/XAssets/sndbank/sndbank_load_db.h" -#include "Game/T5/XAssets/snddriverglobals/snddriverglobals_load_db.h" -#include "Game/T5/XAssets/sndpatch/sndpatch_load_db.h" -#include "Game/T5/XAssets/stringtable/stringtable_load_db.h" -#include "Game/T5/XAssets/weaponvariantdef/weaponvariantdef_load_db.h" -#include "Game/T5/XAssets/xanimparts/xanimparts_load_db.h" -#include "Game/T5/XAssets/xglobals/xglobals_load_db.h" -#include "Game/T5/XAssets/xmodel/xmodel_load_db.h" #include "Loading/Exception/UnsupportedAssetTypeException.h" #include diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp index 9c6dce81..86cb2bd7 100644 --- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp +++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp @@ -1,54 +1,7 @@ #include "ContentLoaderT6.h" +#include "Game/T6/AssetLoaderT6.h" #include "Game/T6/T6.h" -#include "Game/T6/XAssets/addonmapents/addonmapents_load_db.h" -#include "Game/T6/XAssets/clipmap_t/clipmap_t_load_db.h" -#include "Game/T6/XAssets/comworld/comworld_load_db.h" -#include "Game/T6/XAssets/ddlroot_t/ddlroot_t_load_db.h" -#include "Game/T6/XAssets/destructibledef/destructibledef_load_db.h" -#include "Game/T6/XAssets/emblemset/emblemset_load_db.h" -#include "Game/T6/XAssets/font_s/font_s_load_db.h" -#include "Game/T6/XAssets/fonticon/fonticon_load_db.h" -#include "Game/T6/XAssets/footstepfxtabledef/footstepfxtabledef_load_db.h" -#include "Game/T6/XAssets/footsteptabledef/footsteptabledef_load_db.h" -#include "Game/T6/XAssets/fxeffectdef/fxeffectdef_load_db.h" -#include "Game/T6/XAssets/fximpacttable/fximpacttable_load_db.h" -#include "Game/T6/XAssets/gameworldmp/gameworldmp_load_db.h" -#include "Game/T6/XAssets/gameworldsp/gameworldsp_load_db.h" -#include "Game/T6/XAssets/gfximage/gfximage_load_db.h" -#include "Game/T6/XAssets/gfxlightdef/gfxlightdef_load_db.h" -#include "Game/T6/XAssets/gfxworld/gfxworld_load_db.h" -#include "Game/T6/XAssets/glasses/glasses_load_db.h" -#include "Game/T6/XAssets/keyvaluepairs/keyvaluepairs_load_db.h" -#include "Game/T6/XAssets/leaderboarddef/leaderboarddef_load_db.h" -#include "Game/T6/XAssets/localizeentry/localizeentry_load_db.h" -#include "Game/T6/XAssets/mapents/mapents_load_db.h" -#include "Game/T6/XAssets/material/material_load_db.h" -#include "Game/T6/XAssets/materialtechniqueset/materialtechniqueset_load_db.h" -#include "Game/T6/XAssets/memoryblock/memoryblock_load_db.h" -#include "Game/T6/XAssets/menudef_t/menudef_t_load_db.h" -#include "Game/T6/XAssets/menulist/menulist_load_db.h" -#include "Game/T6/XAssets/physconstraints/physconstraints_load_db.h" -#include "Game/T6/XAssets/physpreset/physpreset_load_db.h" -#include "Game/T6/XAssets/qdb/qdb_load_db.h" -#include "Game/T6/XAssets/rawfile/rawfile_load_db.h" -#include "Game/T6/XAssets/scriptparsetree/scriptparsetree_load_db.h" -#include "Game/T6/XAssets/skinnedvertsdef/skinnedvertsdef_load_db.h" -#include "Game/T6/XAssets/slug/slug_load_db.h" -#include "Game/T6/XAssets/sndbank/sndbank_load_db.h" -#include "Game/T6/XAssets/snddriverglobals/snddriverglobals_load_db.h" -#include "Game/T6/XAssets/sndpatch/sndpatch_load_db.h" -#include "Game/T6/XAssets/stringtable/stringtable_load_db.h" -#include "Game/T6/XAssets/tracerdef/tracerdef_load_db.h" -#include "Game/T6/XAssets/vehicledef/vehicledef_load_db.h" -#include "Game/T6/XAssets/weaponattachment/weaponattachment_load_db.h" -#include "Game/T6/XAssets/weaponattachmentunique/weaponattachmentunique_load_db.h" -#include "Game/T6/XAssets/weaponcamo/weaponcamo_load_db.h" -#include "Game/T6/XAssets/weaponvariantdef/weaponvariantdef_load_db.h" -#include "Game/T6/XAssets/xanimparts/xanimparts_load_db.h" -#include "Game/T6/XAssets/xglobals/xglobals_load_db.h" -#include "Game/T6/XAssets/xmodel/xmodel_load_db.h" -#include "Game/T6/XAssets/zbarrierdef/zbarrierdef_load_db.h" #include "Loading/Exception/UnsupportedAssetTypeException.h" #include diff --git a/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp b/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp index 04765117..9e07914c 100644 --- a/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp +++ b/src/ZoneWriting/Game/IW3/ContentWriterIW3.cpp @@ -1,30 +1,6 @@ #include "ContentWriterIW3.h" -#include "Game/IW3/XAssets/clipmap_t/clipmap_t_write_db.h" -#include "Game/IW3/XAssets/comworld/comworld_write_db.h" -#include "Game/IW3/XAssets/font_s/font_s_write_db.h" -#include "Game/IW3/XAssets/fxeffectdef/fxeffectdef_write_db.h" -#include "Game/IW3/XAssets/fximpacttable/fximpacttable_write_db.h" -#include "Game/IW3/XAssets/gameworldmp/gameworldmp_write_db.h" -#include "Game/IW3/XAssets/gameworldsp/gameworldsp_write_db.h" -#include "Game/IW3/XAssets/gfximage/gfximage_write_db.h" -#include "Game/IW3/XAssets/gfxlightdef/gfxlightdef_write_db.h" -#include "Game/IW3/XAssets/gfxworld/gfxworld_write_db.h" -#include "Game/IW3/XAssets/loadedsound/loadedsound_write_db.h" -#include "Game/IW3/XAssets/localizeentry/localizeentry_write_db.h" -#include "Game/IW3/XAssets/mapents/mapents_write_db.h" -#include "Game/IW3/XAssets/material/material_write_db.h" -#include "Game/IW3/XAssets/materialtechniqueset/materialtechniqueset_write_db.h" -#include "Game/IW3/XAssets/menudef_t/menudef_t_write_db.h" -#include "Game/IW3/XAssets/menulist/menulist_write_db.h" -#include "Game/IW3/XAssets/physpreset/physpreset_write_db.h" -#include "Game/IW3/XAssets/rawfile/rawfile_write_db.h" -#include "Game/IW3/XAssets/snd_alias_list_t/snd_alias_list_t_write_db.h" -#include "Game/IW3/XAssets/sndcurve/sndcurve_write_db.h" -#include "Game/IW3/XAssets/stringtable/stringtable_write_db.h" -#include "Game/IW3/XAssets/weapondef/weapondef_write_db.h" -#include "Game/IW3/XAssets/xanimparts/xanimparts_write_db.h" -#include "Game/IW3/XAssets/xmodel/xmodel_write_db.h" +#include "Game/IW3/AssetWriterIW3.h" #include "Writing/WritingException.h" #include diff --git a/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp b/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp index 26cf1935..0d3e0d06 100644 --- a/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp +++ b/src/ZoneWriting/Game/IW4/ContentWriterIW4.cpp @@ -1,40 +1,6 @@ #include "ContentWriterIW4.h" -#include "Game/IW4/XAssets/addonmapents/addonmapents_write_db.h" -#include "Game/IW4/XAssets/clipmap_t/clipmap_t_write_db.h" -#include "Game/IW4/XAssets/comworld/comworld_write_db.h" -#include "Game/IW4/XAssets/font_s/font_s_write_db.h" -#include "Game/IW4/XAssets/fxeffectdef/fxeffectdef_write_db.h" -#include "Game/IW4/XAssets/fximpacttable/fximpacttable_write_db.h" -#include "Game/IW4/XAssets/fxworld/fxworld_write_db.h" -#include "Game/IW4/XAssets/gameworldmp/gameworldmp_write_db.h" -#include "Game/IW4/XAssets/gameworldsp/gameworldsp_write_db.h" -#include "Game/IW4/XAssets/gfximage/gfximage_write_db.h" -#include "Game/IW4/XAssets/gfxlightdef/gfxlightdef_write_db.h" -#include "Game/IW4/XAssets/gfxworld/gfxworld_write_db.h" -#include "Game/IW4/XAssets/leaderboarddef/leaderboarddef_write_db.h" -#include "Game/IW4/XAssets/loadedsound/loadedsound_write_db.h" -#include "Game/IW4/XAssets/localizeentry/localizeentry_write_db.h" -#include "Game/IW4/XAssets/mapents/mapents_write_db.h" -#include "Game/IW4/XAssets/material/material_write_db.h" -#include "Game/IW4/XAssets/materialpixelshader/materialpixelshader_write_db.h" -#include "Game/IW4/XAssets/materialtechniqueset/materialtechniqueset_write_db.h" -#include "Game/IW4/XAssets/materialvertexdeclaration/materialvertexdeclaration_write_db.h" -#include "Game/IW4/XAssets/materialvertexshader/materialvertexshader_write_db.h" -#include "Game/IW4/XAssets/menudef_t/menudef_t_write_db.h" -#include "Game/IW4/XAssets/menulist/menulist_write_db.h" -#include "Game/IW4/XAssets/physcollmap/physcollmap_write_db.h" -#include "Game/IW4/XAssets/physpreset/physpreset_write_db.h" -#include "Game/IW4/XAssets/rawfile/rawfile_write_db.h" -#include "Game/IW4/XAssets/snd_alias_list_t/snd_alias_list_t_write_db.h" -#include "Game/IW4/XAssets/sndcurve/sndcurve_write_db.h" -#include "Game/IW4/XAssets/stringtable/stringtable_write_db.h" -#include "Game/IW4/XAssets/structureddatadefset/structureddatadefset_write_db.h" -#include "Game/IW4/XAssets/tracerdef/tracerdef_write_db.h" -#include "Game/IW4/XAssets/vehicledef/vehicledef_write_db.h" -#include "Game/IW4/XAssets/weaponcompletedef/weaponcompletedef_write_db.h" -#include "Game/IW4/XAssets/xanimparts/xanimparts_write_db.h" -#include "Game/IW4/XAssets/xmodel/xmodel_write_db.h" +#include "Game/IW4/AssetWriterIW4.h" #include "Writing/WritingException.h" #include diff --git a/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp b/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp index 266d8cfb..ee0af8d3 100644 --- a/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp +++ b/src/ZoneWriting/Game/IW5/ContentWriterIW5.cpp @@ -1,45 +1,6 @@ #include "ContentWriterIW5.h" -#include "Game/IW5/XAssets/addonmapents/addonmapents_write_db.h" -#include "Game/IW5/XAssets/clipmap_t/clipmap_t_write_db.h" -#include "Game/IW5/XAssets/comworld/comworld_write_db.h" -#include "Game/IW5/XAssets/font_s/font_s_write_db.h" -#include "Game/IW5/XAssets/fxeffectdef/fxeffectdef_write_db.h" -#include "Game/IW5/XAssets/fximpacttable/fximpacttable_write_db.h" -#include "Game/IW5/XAssets/fxworld/fxworld_write_db.h" -#include "Game/IW5/XAssets/gfximage/gfximage_write_db.h" -#include "Game/IW5/XAssets/gfxlightdef/gfxlightdef_write_db.h" -#include "Game/IW5/XAssets/gfxworld/gfxworld_write_db.h" -#include "Game/IW5/XAssets/glassworld/glassworld_write_db.h" -#include "Game/IW5/XAssets/leaderboarddef/leaderboarddef_write_db.h" -#include "Game/IW5/XAssets/loadedsound/loadedsound_write_db.h" -#include "Game/IW5/XAssets/localizeentry/localizeentry_write_db.h" -#include "Game/IW5/XAssets/mapents/mapents_write_db.h" -#include "Game/IW5/XAssets/material/material_write_db.h" -#include "Game/IW5/XAssets/materialpixelshader/materialpixelshader_write_db.h" -#include "Game/IW5/XAssets/materialtechniqueset/materialtechniqueset_write_db.h" -#include "Game/IW5/XAssets/materialvertexdeclaration/materialvertexdeclaration_write_db.h" -#include "Game/IW5/XAssets/materialvertexshader/materialvertexshader_write_db.h" -#include "Game/IW5/XAssets/menudef_t/menudef_t_write_db.h" -#include "Game/IW5/XAssets/menulist/menulist_write_db.h" -#include "Game/IW5/XAssets/pathdata/pathdata_write_db.h" -#include "Game/IW5/XAssets/physcollmap/physcollmap_write_db.h" -#include "Game/IW5/XAssets/physpreset/physpreset_write_db.h" -#include "Game/IW5/XAssets/rawfile/rawfile_write_db.h" -#include "Game/IW5/XAssets/scriptfile/scriptfile_write_db.h" -#include "Game/IW5/XAssets/snd_alias_list_t/snd_alias_list_t_write_db.h" -#include "Game/IW5/XAssets/sndcurve/sndcurve_write_db.h" -#include "Game/IW5/XAssets/stringtable/stringtable_write_db.h" -#include "Game/IW5/XAssets/structureddatadefset/structureddatadefset_write_db.h" -#include "Game/IW5/XAssets/surfacefxtable/surfacefxtable_write_db.h" -#include "Game/IW5/XAssets/tracerdef/tracerdef_write_db.h" -#include "Game/IW5/XAssets/vehicledef/vehicledef_write_db.h" -#include "Game/IW5/XAssets/vehicletrack/vehicletrack_write_db.h" -#include "Game/IW5/XAssets/weaponattachment/weaponattachment_write_db.h" -#include "Game/IW5/XAssets/weaponcompletedef/weaponcompletedef_write_db.h" -#include "Game/IW5/XAssets/xanimparts/xanimparts_write_db.h" -#include "Game/IW5/XAssets/xmodel/xmodel_write_db.h" -#include "Game/IW5/XAssets/xmodelsurfs/xmodelsurfs_write_db.h" +#include "Game/IW5/AssetWriterIW5.h" #include "Writing/WritingException.h" #include diff --git a/src/ZoneWriting/Game/T5/ContentWriterT5.cpp b/src/ZoneWriting/Game/T5/ContentWriterT5.cpp index 08efc2ee..e57067d5 100644 --- a/src/ZoneWriting/Game/T5/ContentWriterT5.cpp +++ b/src/ZoneWriting/Game/T5/ContentWriterT5.cpp @@ -1,37 +1,6 @@ #include "ContentWriterT5.h" -#include "Game/T5/XAssets/clipmap_t/clipmap_t_write_db.h" -#include "Game/T5/XAssets/comworld/comworld_write_db.h" -#include "Game/T5/XAssets/ddlroot_t/ddlroot_t_write_db.h" -#include "Game/T5/XAssets/destructibledef/destructibledef_write_db.h" -#include "Game/T5/XAssets/emblemset/emblemset_write_db.h" -#include "Game/T5/XAssets/font_s/font_s_write_db.h" -#include "Game/T5/XAssets/fxeffectdef/fxeffectdef_write_db.h" -#include "Game/T5/XAssets/fximpacttable/fximpacttable_write_db.h" -#include "Game/T5/XAssets/gameworldmp/gameworldmp_write_db.h" -#include "Game/T5/XAssets/gameworldsp/gameworldsp_write_db.h" -#include "Game/T5/XAssets/gfximage/gfximage_write_db.h" -#include "Game/T5/XAssets/gfxlightdef/gfxlightdef_write_db.h" -#include "Game/T5/XAssets/gfxworld/gfxworld_write_db.h" -#include "Game/T5/XAssets/glasses/glasses_write_db.h" -#include "Game/T5/XAssets/localizeentry/localizeentry_write_db.h" -#include "Game/T5/XAssets/mapents/mapents_write_db.h" -#include "Game/T5/XAssets/material/material_write_db.h" -#include "Game/T5/XAssets/materialtechniqueset/materialtechniqueset_write_db.h" -#include "Game/T5/XAssets/menudef_t/menudef_t_write_db.h" -#include "Game/T5/XAssets/menulist/menulist_write_db.h" -#include "Game/T5/XAssets/packindex/packindex_write_db.h" -#include "Game/T5/XAssets/physconstraints/physconstraints_write_db.h" -#include "Game/T5/XAssets/physpreset/physpreset_write_db.h" -#include "Game/T5/XAssets/rawfile/rawfile_write_db.h" -#include "Game/T5/XAssets/sndbank/sndbank_write_db.h" -#include "Game/T5/XAssets/snddriverglobals/snddriverglobals_write_db.h" -#include "Game/T5/XAssets/sndpatch/sndpatch_write_db.h" -#include "Game/T5/XAssets/stringtable/stringtable_write_db.h" -#include "Game/T5/XAssets/weaponvariantdef/weaponvariantdef_write_db.h" -#include "Game/T5/XAssets/xanimparts/xanimparts_write_db.h" -#include "Game/T5/XAssets/xglobals/xglobals_write_db.h" -#include "Game/T5/XAssets/xmodel/xmodel_write_db.h" +#include "Game/T5/AssetWriterT5.h" #include "Writing/WritingException.h" #include diff --git a/src/ZoneWriting/Game/T6/ContentWriterT6.cpp b/src/ZoneWriting/Game/T6/ContentWriterT6.cpp index 95c4eb04..d929bfa5 100644 --- a/src/ZoneWriting/Game/T6/ContentWriterT6.cpp +++ b/src/ZoneWriting/Game/T6/ContentWriterT6.cpp @@ -1,53 +1,6 @@ #include "ContentWriterT6.h" -#include "Game/T6/XAssets/addonmapents/addonmapents_write_db.h" -#include "Game/T6/XAssets/clipmap_t/clipmap_t_write_db.h" -#include "Game/T6/XAssets/comworld/comworld_write_db.h" -#include "Game/T6/XAssets/ddlroot_t/ddlroot_t_write_db.h" -#include "Game/T6/XAssets/destructibledef/destructibledef_write_db.h" -#include "Game/T6/XAssets/emblemset/emblemset_write_db.h" -#include "Game/T6/XAssets/font_s/font_s_write_db.h" -#include "Game/T6/XAssets/fonticon/fonticon_write_db.h" -#include "Game/T6/XAssets/footstepfxtabledef/footstepfxtabledef_write_db.h" -#include "Game/T6/XAssets/footsteptabledef/footsteptabledef_write_db.h" -#include "Game/T6/XAssets/fxeffectdef/fxeffectdef_write_db.h" -#include "Game/T6/XAssets/fximpacttable/fximpacttable_write_db.h" -#include "Game/T6/XAssets/gameworldmp/gameworldmp_write_db.h" -#include "Game/T6/XAssets/gameworldsp/gameworldsp_write_db.h" -#include "Game/T6/XAssets/gfximage/gfximage_write_db.h" -#include "Game/T6/XAssets/gfxlightdef/gfxlightdef_write_db.h" -#include "Game/T6/XAssets/gfxworld/gfxworld_write_db.h" -#include "Game/T6/XAssets/glasses/glasses_write_db.h" -#include "Game/T6/XAssets/keyvaluepairs/keyvaluepairs_write_db.h" -#include "Game/T6/XAssets/leaderboarddef/leaderboarddef_write_db.h" -#include "Game/T6/XAssets/localizeentry/localizeentry_write_db.h" -#include "Game/T6/XAssets/mapents/mapents_write_db.h" -#include "Game/T6/XAssets/material/material_write_db.h" -#include "Game/T6/XAssets/materialtechniqueset/materialtechniqueset_write_db.h" -#include "Game/T6/XAssets/memoryblock/memoryblock_write_db.h" -#include "Game/T6/XAssets/menudef_t/menudef_t_write_db.h" -#include "Game/T6/XAssets/menulist/menulist_write_db.h" -#include "Game/T6/XAssets/physconstraints/physconstraints_write_db.h" -#include "Game/T6/XAssets/physpreset/physpreset_write_db.h" -#include "Game/T6/XAssets/qdb/qdb_write_db.h" -#include "Game/T6/XAssets/rawfile/rawfile_write_db.h" -#include "Game/T6/XAssets/scriptparsetree/scriptparsetree_write_db.h" -#include "Game/T6/XAssets/skinnedvertsdef/skinnedvertsdef_write_db.h" -#include "Game/T6/XAssets/slug/slug_write_db.h" -#include "Game/T6/XAssets/sndbank/sndbank_write_db.h" -#include "Game/T6/XAssets/snddriverglobals/snddriverglobals_write_db.h" -#include "Game/T6/XAssets/sndpatch/sndpatch_write_db.h" -#include "Game/T6/XAssets/stringtable/stringtable_write_db.h" -#include "Game/T6/XAssets/tracerdef/tracerdef_write_db.h" -#include "Game/T6/XAssets/vehicledef/vehicledef_write_db.h" -#include "Game/T6/XAssets/weaponattachment/weaponattachment_write_db.h" -#include "Game/T6/XAssets/weaponattachmentunique/weaponattachmentunique_write_db.h" -#include "Game/T6/XAssets/weaponcamo/weaponcamo_write_db.h" -#include "Game/T6/XAssets/weaponvariantdef/weaponvariantdef_write_db.h" -#include "Game/T6/XAssets/xanimparts/xanimparts_write_db.h" -#include "Game/T6/XAssets/xglobals/xglobals_write_db.h" -#include "Game/T6/XAssets/xmodel/xmodel_write_db.h" -#include "Game/T6/XAssets/zbarrierdef/zbarrierdef_write_db.h" +#include "Game/T6/AssetWriterT6.h" #include "Writing/WritingException.h" #include