INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-30 16:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move iw4 techset and vertexdecl compiling to ObjCompiling

Browse Source
This commit is contained in:
Jan
2025-06-28 19:16:13 +01:00
parent f23b47ca13
commit 28a82818de
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjCompiling/Game/IW4/Material/CompilerMaterialIW4.cpp
View File

@ -4,7 +4,7 @@
#include "Game/IW4/IW4.h" #include "Game/IW4/IW4.h"
#include "Game/IW4/MaterialConstantsIW4.h" #include "Game/IW4/MaterialConstantsIW4.h"
#include "Game/IW4/ObjConstantsIW4.h" #include "Game/IW4/ObjConstantsIW4.h"
#include "Game/IW4/Techset/LoaderTechsetIW4.h" #include "Game/IW4/Techset/CompilerTechsetIW4.h"
#include "Game/IW4/TechsetConstantsIW4.h" #include "Game/IW4/TechsetConstantsIW4.h"
#include "Gdt/AbstractGdtEntryReader.h" #include "Gdt/AbstractGdtEntryReader.h"
#include "Gdt/IGdtQueryable.h" #include "Gdt/IGdtQueryable.h"

6
src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp
View File

@ -3,6 +3,8 @@
#include "Game/IW4/IW4.h" #include "Game/IW4/IW4.h"
#include "Image/ImageIwdPostProcessor.h" #include "Image/ImageIwdPostProcessor.h"
#include "Material/CompilerMaterialIW4.h" #include "Material/CompilerMaterialIW4.h"
#include "Techset/CompilerTechsetIW4.h"
#include "Techset/CompilerVertexDeclIW4.h"
#include <memory> #include <memory>
@ -15,8 +17,10 @@ namespace
auto& memory = zone.Memory(); auto& memory = zone.Memory();
#ifdef EXPERIMENTAL_MATERIAL_COMPILATION #ifdef EXPERIMENTAL_MATERIAL_COMPILATION
collection.AddAssetCreator(CreateCompilingMaterialLoader(memory, searchPath, gdt)); collection.AddAssetCreator(CreateMaterialCompiler(memory, searchPath, gdt));
collection.AddAssetCreator(CreateTechsetLoader(memory, searchPath));
#endif #endif
collection.AddAssetCreator(CreateVertexDeclLoader(memory));
} }
void ConfigurePostProcessors(AssetCreatorCollection& collection, void ConfigurePostProcessors(AssetCreatorCollection& collection,

2
src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.cpp → src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.cpp
View File

@ -1,4 +1,4 @@
#include "LoaderTechsetIW4.h" #include "CompilerTechsetIW4.h"
#include "Game/IW4/IW4.h" #include "Game/IW4/IW4.h"
#include "Game/IW4/Shader/LoaderPixelShaderIW4.h" #include "Game/IW4/Shader/LoaderPixelShaderIW4.h"

0
src/ObjLoading/Game/IW4/Techset/LoaderTechsetIW4.h → src/ObjCompiling/Game/IW4/Techset/CompilerTechsetIW4.h
View File

2
src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.cpp → src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.cpp
View File

@ -1,4 +1,4 @@
#include "LoaderVertexDeclIW4.h" #include "CompilerVertexDeclIW4.h"
#include "Game/IW4/IW4.h" #include "Game/IW4/IW4.h"
#include "Game/IW4/TechsetConstantsIW4.h" #include "Game/IW4/TechsetConstantsIW4.h"

0
src/ObjLoading/Game/IW4/Techset/LoaderVertexDeclIW4.h → src/ObjCompiling/Game/IW4/Techset/CompilerVertexDeclIW4.h
View File

5
src/ObjLoading/Game/IW4/ObjLoaderIW4.cpp
View File

@ -17,8 +17,6 @@
#include "Sound/LoaderSoundCurveIW4.h" #include "Sound/LoaderSoundCurveIW4.h"
#include "StringTable/LoaderStringTableIW4.h" #include "StringTable/LoaderStringTableIW4.h"
#include "StructuredDataDef/LoaderStructuredDataDefIW4.h" #include "StructuredDataDef/LoaderStructuredDataDefIW4.h"
#include "Techset/LoaderTechsetIW4.h"
#include "Techset/LoaderVertexDeclIW4.h"
#include "Weapon/GdtLoaderWeaponIW4.h" #include "Weapon/GdtLoaderWeaponIW4.h"
#include "Weapon/RawLoaderWeaponIW4.h" #include "Weapon/RawLoaderWeaponIW4.h"
@ -129,8 +127,7 @@ namespace
collection.AddAssetCreator(CreateMaterialLoader(memory, searchPath)); collection.AddAssetCreator(CreateMaterialLoader(memory, searchPath));
collection.AddAssetCreator(CreatePixelShaderLoader(memory, searchPath)); collection.AddAssetCreator(CreatePixelShaderLoader(memory, searchPath));
collection.AddAssetCreator(CreateVertexShaderLoader(memory, searchPath)); collection.AddAssetCreator(CreateVertexShaderLoader(memory, searchPath));
collection.AddAssetCreator(CreateVertexDeclLoader(memory)); // collection.AddAssetCreator(std::make_unique<AssetLoaderTechset>(memory));
collection.AddAssetCreator(CreateTechsetLoader(memory, searchPath));
// collection.AddAssetCreator(std::make_unique<AssetLoaderImage>(memory)); // collection.AddAssetCreator(std::make_unique<AssetLoaderImage>(memory));
// collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory)); // collection.AddAssetCreator(std::make_unique<AssetLoaderSound>(memory));
collection.AddAssetCreator(CreateSoundCurveLoader(memory, searchPath)); collection.AddAssetCreator(CreateSoundCurveLoader(memory, searchPath));