zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-02 08:29:36 +00:00
Code Activity

feat: add techset compiling for IW3

Browse Source
This commit is contained in:
Jan Laupetin
2026-03-14 20:46:58 +01:00
parent 5993c88897
commit daa891a922
14 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp
+8 -1
View File
@@ -1,6 +1,9 @@
#include "ObjCompilerIW3.h"
#include "Game/IW3/IW3.h"
#include "Game/IW3/Techset/TechniqueCompilerIW3.h"
#include "Game/IW3/Techset/TechsetCompilerIW3.h"
#include "Game/IW3/Techset/VertexDeclCompilerIW3.h"
#include "Image/ImageIwdPostProcessor.h"
#include <memory>
@@ -13,7 +16,10 @@ namespace
{
auto& memory = zone.Memory();
// No compilers yet
collection.AddAssetCreator(techset::CreateTechsetCompilerIW3(memory, searchPath));
collection.AddSubAssetCreator(techset::CreateTechniqueCompilerIW3(memory, zone, searchPath));
collection.AddSubAssetCreator(techset::CreateVertexDeclCompilerIW3(memory));
}
void ConfigurePostProcessors(AssetCreatorCollection& collection,
@@ -39,5 +45,6 @@ void ObjCompiler::ConfigureCreatorCollection(AssetCreatorCollection& collection,
IOutputPath& outDir,
IOutputPath& cacheDir) const
{
ConfigureCompilers(collection, zone, searchPath);
ConfigurePostProcessors(collection, zone, zoneDefinition, searchPath, zoneStates, outDir);
}
src/ObjCompiling/Techset/TechniqueCompiler.cpp.template
+8 -6
View File
@@ -1,4 +1,4 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/TechniqueCompiler" + GAME + ".cpp"
@@ -9,6 +9,7 @@
#if GAME == "IW3"
#define FEATURE_IW3
#define IS_DX9
#define SHADERS_ARE_SUBASSETS
#elif GAME == "IW4"
#define FEATURE_IW4
#define IS_DX9
@@ -278,7 +279,10 @@ namespace
std::string lowerTechniqueName(commonTechnique.m_name);
utils::MakeStringLowerCase(lowerTechniqueName);
#if defined(FEATURE_IW4)
#if defined(FEATURE_IW3)
if (lowerTechniqueName == "zprepass")
technique.flags |= MTL_TECHFLAG_ZPREPASS;
#elif defined(FEATURE_IW4)
// Not a particularly cool way to do this but...
// the game actually does this :shrug:
if (lowerTechniqueName == "zprepass")
@@ -290,7 +294,7 @@ namespace
if (technique.flags & MTL_TECHFLAG_USES_FLOATZ && lowerTechniqueName.starts_with("distortion_"))
technique.flags = (technique.flags & ~MTL_TECHFLAG_USES_FLOATZ) | MTL_TECHFLAG_USES_DISTORTION_FLOATZ;
if (ShouldApplyFlag200(technique))
technique.flags |= TECHNIQUE_FLAG_200;
#elif defined(FEATURE_T6)
@@ -454,9 +458,7 @@ namespace
void FinalizeZone(AssetCreationContext& context) override
{
#if defined(FEATURE_IW4)
// TODO
#elif defined(FEATURE_T6)
#if defined(FEATURE_T6)
const auto materials = m_zone.m_pools.PoolAssets<AssetMaterial>();
for (auto* materialAsset : materials)
{
src/ObjCompiling/Techset/TechniqueCompiler.h.template
+1 -1
View File
@@ -1,4 +1,4 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/TechniqueCompiler" + GAME + ".h"
src/ObjCompiling/Techset/TechsetCompiler.cpp.template
+1 -1
View File
@@ -1,4 +1,4 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/TechsetCompiler" + GAME + ".cpp"
src/ObjCompiling/Techset/TechsetCompiler.h.template
+1 -1
View File
@@ -1,4 +1,4 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/TechsetCompiler" + GAME + ".h"
src/ObjCompiling/Techset/VertexDeclCompiler.cpp.template
+2 -1
View File
@@ -1,4 +1,4 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/VertexDeclCompiler" + GAME + ".cpp"
@@ -8,6 +8,7 @@
#if GAME == "IW3"
#define FEATURE_IW3
#define IS_SUB_ASSET
#elif GAME == "IW4"
#define FEATURE_IW4
#elif GAME == "IW5"
src/ObjCompiling/Techset/VertexDeclCompiler.h.template
+4 -2
View File
@@ -1,9 +1,10 @@
#options GAME(IW4, T6)
#options GAME(IW3, IW4, T6)
#filename "Game/" + GAME + "/Techset/VertexDeclCompiler" + GAME + ".h"
#if GAME == "IW3"
#define FEATURE_IW3
#define IS_SUB_ASSET
#elif GAME == "IW4"
#define FEATURE_IW4
#elif GAME == "IW5"
@@ -12,6 +13,7 @@
#define FEATURE_T5
#elif GAME == "T6"
#define FEATURE_T6
#define IS_SUB_ASSET
#endif
// This file was templated.
@@ -27,7 +29,7 @@
#set CREATE_COMPILER_METHOD "CreateVertexDeclCompiler" + GAME
#if defined(FEATURE_T6)
#if defined(IS_SUB_ASSET)
#define INTERFACE_NAME ISubAssetCreator
#else
#define INTERFACE_NAME IAssetCreator