diff --git a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp index d0e648b4..2af4cc84 100644 --- a/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp +++ b/src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp @@ -8,6 +8,7 @@ #include "Game/IW3/Image/ImageLoaderExternalIW3.h" #include "Game/IW3/Techset/PixelShaderLoaderIW3.h" #include "Game/IW3/Techset/VertexShaderLoaderIW3.h" +#include "Game/IW3/XAnim/XAnimLoaderIW3.h" #include "Game/IW3/XModel/LoaderXModelIW3.h" #include "LightDef/LightDefLoaderIW3.h" #include "Localize/AssetLoaderLocalizeIW3.h" @@ -18,7 +19,6 @@ #include "RawFile/AssetLoaderRawFileIW3.h" #include "Sound/LoaderSoundCurveIW3.h" #include "StringTable/AssetLoaderStringTableIW3.h" -#include "XAnim/XAnimLoaderIW3.h" #include diff --git a/src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.h b/src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.h deleted file mode 100644 index 92dfab55..00000000 --- a/src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "Asset/IAssetCreator.h" -#include "Game/IW3/IW3.h" -#include "SearchPath/ISearchPath.h" -#include "Utils/MemoryManager.h" - -#include - -namespace xanim -{ - std::unique_ptr> CreateLoaderIW3(MemoryManager& memory, ISearchPath& searchPath, Zone& zone); -} // namespace xanim diff --git a/src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.cpp b/src/ObjLoading/XAnim/XAnimLoader.cpp.template similarity index 95% rename from src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.cpp rename to src/ObjLoading/XAnim/XAnimLoader.cpp.template index 9f558373..76ddc0ea 100644 --- a/src/ObjLoading/Game/IW3/XAnim/XAnimLoaderIW3.cpp +++ b/src/ObjLoading/XAnim/XAnimLoader.cpp.template @@ -1,4 +1,26 @@ -#include "XAnimLoaderIW3.h" +#options GAME(IW3) + +#filename "Game/" + GAME + "/XAnim/XAnimLoader" + GAME + ".cpp" + +#set LOADER_HEADER "\"XAnimLoader" + GAME + ".h\"" + +#if GAME == "IW3" +#define FEATURE_IW3 +#elif GAME == "IW4" +#define FEATURE_IW4 +#elif GAME == "IW5" +#define FEATURE_IW5 +#elif GAME == "T5" +#define FEATURE_T5 +#elif GAME == "T6" +#define FEATURE_T6 +#endif + +// This file was templated. +// See XAnimLoader.cpp.template. +// Do not modify, changes will be lost. + +#include LOADER_HEADER #include "Utils/Logging/Log.h" #include "XAnim/CompiledXAnimLoader.h" @@ -16,7 +38,7 @@ #include #include -using namespace IW3; +using namespace GAME; namespace { @@ -325,9 +347,11 @@ namespace }; } // namespace +#set METHOD_NAME "CreateLoader" + GAME + namespace xanim { - std::unique_ptr> CreateLoaderIW3(MemoryManager& memory, ISearchPath& searchPath, Zone& zone) + std::unique_ptr> METHOD_NAME(MemoryManager& memory, ISearchPath& searchPath, Zone& zone) { return std::make_unique(memory, searchPath, zone.m_script_strings); } diff --git a/src/ObjLoading/XAnim/XAnimLoader.h.template b/src/ObjLoading/XAnim/XAnimLoader.h.template new file mode 100644 index 00000000..27df1bb4 --- /dev/null +++ b/src/ObjLoading/XAnim/XAnimLoader.h.template @@ -0,0 +1,25 @@ +#options GAME(IW3) + +#filename "Game/" + GAME + "/XAnim/XAnimLoader" + GAME + ".h" + +#set GAME_HEADER "\"Game/" + GAME + "/" + GAME + ".h\"" + +// This file was templated. +// See XAnimLoader.h.template. +// Do not modify, changes will be lost. + +#pragma once + +#include "Asset/IAssetCreator.h" +#include GAME_HEADER +#include "SearchPath/ISearchPath.h" +#include "Utils/MemoryManager.h" + +#include + +#set METHOD_NAME "CreateLoader" + GAME + +namespace xanim +{ + std::unique_ptr> METHOD_NAME(MemoryManager& memory, ISearchPath& searchPath, Zone& zone); +} // namespace xanim