From 28a82818de68cc5a562cf47adce1d8579160bfa8 Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 28 Jun 2025 19:16:13 +0100 Subject: [PATCH] refactor: move iw4 techset and vertexdecl compiling to ObjCompiling --- src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp | 2 +- src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp | 6 +++++- .../Game/IW4/Techset/CompilerTechsetIW4.cpp} | 2 +- .../Game/IW4/Techset/CompilerTechsetIW4.h} | 0 .../Game/IW4/Techset/CompilerVertexDeclIW4.cpp} | 2 +- .../Game/IW4/Techset/CompilerVertexDeclIW4.h} | 0 src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp | 5 +---- 7 files changed, 9 insertions(+), 8 deletions(-) rename src/{ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp => ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp} (99%) rename src/{ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.h => ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h} (100%) rename src/{ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.cpp => ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.cpp} (99%) rename src/{ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.h => ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.h} (100%) diff --git a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp index a1584078..7b54ceaa 100644 --- a/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp @@ -4,7 +4,7 @@ #include "Game/IW4/IW4.h" #include "Game/IW4/MaterialConstantsIW4.h" #include "Game/IW4/ObjConstantsIW4.h" -#include "Game/IW4/Techset/LoaderTechsetIW4.h" +#include "Game/IW4/Techset/CompilerTechsetIW4.h" #include "Game/IW4/TechsetConstantsIW4.h" #include "Gdt/AbstractGdtEntryReader.h" #include "Gdt/IGdtQueryable.h" diff --git a/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp b/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp index cdee56db..f33dd566 100644 --- a/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp +++ b/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp @@ -3,6 +3,8 @@ #include "Game/IW4/IW4.h" #include "Image/ImageIwdPostProcessor.h" #include "Material/CompilerMaterialIW4.h" +#include "Techset/CompilerTechsetIW4.h" +#include "Techset/CompilerVertexDeclIW4.h" #include @@ -15,8 +17,10 @@ namespace auto& memory = zone.Memory(); #ifdef EXPERIMENTAL_MATERIAL_COMPILATION - collection.AddAssetCreator(CreateCompilingMaterialLoader(memory, searchPath, gdt)); + collection.AddAssetCreator(CreateMaterialCompiler(memory, searchPath, gdt)); + collection.AddAssetCreator(CreateTechsetLoader(memory, searchPath)); #endif + collection.AddAssetCreator(CreateVertexDeclLoader(memory)); } void ConfigurePostProcessors(AssetCreatorCollection& collection, diff --git a/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp similarity index 99% rename from src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp rename to src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp index 97c1f76a..bb53a3d5 100644 --- a/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp @@ -1,4 +1,4 @@ -#include "LoaderTechsetIW4.h" +#include "CompilerTechsetIW4.h" #include "Game/IW4/IW4.h" #include "Game/IW4/Shader/LoaderPixelShaderIW4.h" diff --git a/src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.h b/src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h similarity index 100% rename from src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.h rename to src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h diff --git a/src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.cpp b/src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.cpp similarity index 99% rename from src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.cpp rename to src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.cpp index 64071166..391975ee 100644 --- a/src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.cpp +++ b/src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.cpp @@ -1,4 +1,4 @@ -#include "LoaderVertexDeclIW4.h" +#include "CompilerVertexDeclIW4.h" #include "Game/IW4/IW4.h" #include "Game/IW4/TechsetConstantsIW4.h" diff --git a/src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.h b/src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.h similarity index 100% rename from src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.h rename to src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.h diff --git a/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp b/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp index e8b1cf5e..021cc4b3 100644 --- a/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp +++ b/src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp @@ -17,8 +17,6 @@ #include "Sound/LoaderSoundCurveIW4.h" #include "StringTable/LoaderStringTableIW4.h" #include "StructuredDataDef/LoaderStructuredDataDefIW4.h" -#include "Techset/LoaderTechsetIW4.h" -#include "Techset/LoaderVertexDeclIW4.h" #include "Weapon/GdtLoaderWeaponIW4.h" #include "Weapon/RawLoaderWeaponIW4.h" @@ -129,8 +127,7 @@ namespace collection.AddAssetCreator(CreateMaterialLoader(memory, searchPath)); collection.AddAssetCreator(CreatePixelShaderLoader(memory, searchPath)); collection.AddAssetCreator(CreateVertexShaderLoader(memory, searchPath)); - collection.AddAssetCreator(CreateVertexDeclLoader(memory)); - collection.AddAssetCreator(CreateTechsetLoader(memory, searchPath)); + // collection.AddAssetCreator(std::make_unique(memory)); // collection.AddAssetCreator(std::make_unique(memory)); // collection.AddAssetCreator(std::make_unique(memory)); collection.AddAssetCreator(CreateSoundCurveLoader(memory, searchPath));