From b3aa6b3dc317a3f082384290c1dee8c402962f10 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 29 Jun 2025 08:44:50 +0100 Subject: [PATCH] chore: add game suffix to material dumping code --- .../{AssetDumperMaterial.cpp => DumperMaterialIW4.cpp} | 4 ++-- .../Material/{AssetDumperMaterial.h => DumperMaterialIW4.h} | 0 ...ConstantZoneState.cpp => MaterialConstantZoneStateIW4.cpp} | 2 +- ...rialConstantZoneState.h => MaterialConstantZoneStateIW4.h} | 0 src/ObjWriting/Game/IW4/ObjWriterIW4.cpp | 2 +- .../{AssetDumperMaterial.cpp => DumperMaterialIW5.cpp} | 4 ++-- .../Material/{AssetDumperMaterial.h => DumperMaterialIW5.h} | 0 ...ConstantZoneState.cpp => MaterialConstantZoneStateIW5.cpp} | 2 +- ...rialConstantZoneState.h => MaterialConstantZoneStateIW5.h} | 0 src/ObjWriting/Game/IW5/ObjWriterIW5.cpp | 2 +- .../{AssetDumperMaterial.cpp => DumperMaterialT6.cpp} | 4 ++-- .../T6/Material/{AssetDumperMaterial.h => DumperMaterialT6.h} | 0 ...lConstantZoneState.cpp => MaterialConstantZoneStateT6.cpp} | 2 +- ...erialConstantZoneState.h => MaterialConstantZoneStateT6.h} | 0 src/ObjWriting/Game/T6/ObjWriterT6.cpp | 2 +- src/ObjWriting/Material/JsonMaterialWriter.cpp.template | 2 +- 16 files changed, 13 insertions(+), 13 deletions(-) rename src/ObjWriting/Game/IW4/Material/{AssetDumperMaterial.cpp => DumperMaterialIW4.cpp} (91%) rename src/ObjWriting/Game/IW4/Material/{AssetDumperMaterial.h => DumperMaterialIW4.h} (100%) rename src/ObjWriting/Game/IW4/Material/{MaterialConstantZoneState.cpp => MaterialConstantZoneStateIW4.cpp} (99%) rename src/ObjWriting/Game/IW4/Material/{MaterialConstantZoneState.h => MaterialConstantZoneStateIW4.h} (100%) rename src/ObjWriting/Game/IW5/Material/{AssetDumperMaterial.cpp => DumperMaterialIW5.cpp} (89%) rename src/ObjWriting/Game/IW5/Material/{AssetDumperMaterial.h => DumperMaterialIW5.h} (100%) rename src/ObjWriting/Game/IW5/Material/{MaterialConstantZoneState.cpp => MaterialConstantZoneStateIW5.cpp} (99%) rename src/ObjWriting/Game/IW5/Material/{MaterialConstantZoneState.h => MaterialConstantZoneStateIW5.h} (100%) rename src/ObjWriting/Game/T6/Material/{AssetDumperMaterial.cpp => DumperMaterialT6.cpp} (89%) rename src/ObjWriting/Game/T6/Material/{AssetDumperMaterial.h => DumperMaterialT6.h} (100%) rename src/ObjWriting/Game/T6/Material/{MaterialConstantZoneState.cpp => MaterialConstantZoneStateT6.cpp} (99%) rename src/ObjWriting/Game/T6/Material/{MaterialConstantZoneState.h => MaterialConstantZoneStateT6.h} (100%) diff --git a/src/ObjWriting/Game/IW4/Material/AssetDumperMaterial.cpp b/src/ObjWriting/Game/IW4/Material/DumperMaterialIW4.cpp similarity index 91% rename from src/ObjWriting/Game/IW4/Material/AssetDumperMaterial.cpp rename to src/ObjWriting/Game/IW4/Material/DumperMaterialIW4.cpp index 11e62562..9d10c301 100644 --- a/src/ObjWriting/Game/IW4/Material/AssetDumperMaterial.cpp +++ b/src/ObjWriting/Game/IW4/Material/DumperMaterialIW4.cpp @@ -1,8 +1,8 @@ -#include "AssetDumperMaterial.h" +#include "DumperMaterialIW4.h" #include "DecompilingMaterialDumperIW4.h" #include "Game/IW4/Material/JsonMaterialWriterIW4.h" -#include "Game/IW4/Material/MaterialConstantZoneState.h" +#include "Game/IW4/Material/MaterialConstantZoneStateIW4.h" #include "Material/MaterialCommon.h" using namespace IW4; diff --git a/src/ObjWriting/Game/IW4/Material/AssetDumperMaterial.h b/src/ObjWriting/Game/IW4/Material/DumperMaterialIW4.h similarity index 100% rename from src/ObjWriting/Game/IW4/Material/AssetDumperMaterial.h rename to src/ObjWriting/Game/IW4/Material/DumperMaterialIW4.h diff --git a/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneState.cpp b/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneStateIW4.cpp similarity index 99% rename from src/ObjWriting/Game/IW4/Material/MaterialConstantZoneState.cpp rename to src/ObjWriting/Game/IW4/Material/MaterialConstantZoneStateIW4.cpp index e06f9697..70593610 100644 --- a/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneState.cpp +++ b/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneStateIW4.cpp @@ -1,4 +1,4 @@ -#include "MaterialConstantZoneState.h" +#include "MaterialConstantZoneStateIW4.h" #include "Game/IW4/CommonIW4.h" #include "Game/IW4/GameAssetPoolIW4.h" diff --git a/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneState.h b/src/ObjWriting/Game/IW4/Material/MaterialConstantZoneStateIW4.h similarity index 100% rename from src/ObjWriting/Game/IW4/Material/MaterialConstantZoneState.h rename to src/ObjWriting/Game/IW4/Material/MaterialConstantZoneStateIW4.h diff --git a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp index d4713942..0516a4af 100644 --- a/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp +++ b/src/ObjWriting/Game/IW4/ObjWriterIW4.cpp @@ -22,7 +22,7 @@ #include "AssetDumpers/AssetDumperWeapon.h" #include "AssetDumpers/AssetDumperXModel.h" #include "Game/IW4/GameAssetPoolIW4.h" -#include "Material/AssetDumperMaterial.h" +#include "Material/DumperMaterialIW4.h" #include "ObjWriting.h" using namespace IW4; diff --git a/src/ObjWriting/Game/IW5/Material/AssetDumperMaterial.cpp b/src/ObjWriting/Game/IW5/Material/DumperMaterialIW5.cpp similarity index 89% rename from src/ObjWriting/Game/IW5/Material/AssetDumperMaterial.cpp rename to src/ObjWriting/Game/IW5/Material/DumperMaterialIW5.cpp index 1e988f53..6b9f6e2c 100644 --- a/src/ObjWriting/Game/IW5/Material/AssetDumperMaterial.cpp +++ b/src/ObjWriting/Game/IW5/Material/DumperMaterialIW5.cpp @@ -1,7 +1,7 @@ -#include "AssetDumperMaterial.h" +#include "DumperMaterialIW5.h" #include "Game/IW5/Material/JsonMaterialWriterIW5.h" -#include "Game/IW5/Material/MaterialConstantZoneState.h" +#include "Game/IW5/Material/MaterialConstantZoneStateIW5.h" #include "Material/MaterialCommon.h" using namespace IW5; diff --git a/src/ObjWriting/Game/IW5/Material/AssetDumperMaterial.h b/src/ObjWriting/Game/IW5/Material/DumperMaterialIW5.h similarity index 100% rename from src/ObjWriting/Game/IW5/Material/AssetDumperMaterial.h rename to src/ObjWriting/Game/IW5/Material/DumperMaterialIW5.h diff --git a/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneState.cpp b/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneStateIW5.cpp similarity index 99% rename from src/ObjWriting/Game/IW5/Material/MaterialConstantZoneState.cpp rename to src/ObjWriting/Game/IW5/Material/MaterialConstantZoneStateIW5.cpp index fe6d870d..7039a12c 100644 --- a/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneState.cpp +++ b/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneStateIW5.cpp @@ -1,4 +1,4 @@ -#include "MaterialConstantZoneState.h" +#include "MaterialConstantZoneStateIW5.h" #include "Game/IW5/CommonIW5.h" #include "Game/IW5/GameAssetPoolIW5.h" diff --git a/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneState.h b/src/ObjWriting/Game/IW5/Material/MaterialConstantZoneStateIW5.h similarity index 100% rename from src/ObjWriting/Game/IW5/Material/MaterialConstantZoneState.h rename to src/ObjWriting/Game/IW5/Material/MaterialConstantZoneStateIW5.h diff --git a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp index f91bc449..09a16378 100644 --- a/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp +++ b/src/ObjWriting/Game/IW5/ObjWriterIW5.cpp @@ -14,7 +14,7 @@ #include "AssetDumpers/AssetDumperWeaponAttachment.h" #include "AssetDumpers/AssetDumperXModel.h" #include "Game/IW5/GameAssetPoolIW5.h" -#include "Material/AssetDumperMaterial.h" +#include "Material/DumperMaterialIW5.h" #include "ObjWriting.h" using namespace IW5; diff --git a/src/ObjWriting/Game/T6/Material/AssetDumperMaterial.cpp b/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp similarity index 89% rename from src/ObjWriting/Game/T6/Material/AssetDumperMaterial.cpp rename to src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp index 42581876..a245cc18 100644 --- a/src/ObjWriting/Game/T6/Material/AssetDumperMaterial.cpp +++ b/src/ObjWriting/Game/T6/Material/DumperMaterialT6.cpp @@ -1,7 +1,7 @@ -#include "AssetDumperMaterial.h" +#include "DumperMaterialT6.h" #include "Game/T6/Material/JsonMaterialWriterT6.h" -#include "Game/T6/Material/MaterialConstantZoneState.h" +#include "Game/T6/Material/MaterialConstantZoneStateT6.h" #include "Material/MaterialCommon.h" using namespace T6; diff --git a/src/ObjWriting/Game/T6/Material/AssetDumperMaterial.h b/src/ObjWriting/Game/T6/Material/DumperMaterialT6.h similarity index 100% rename from src/ObjWriting/Game/T6/Material/AssetDumperMaterial.h rename to src/ObjWriting/Game/T6/Material/DumperMaterialT6.h diff --git a/src/ObjWriting/Game/T6/Material/MaterialConstantZoneState.cpp b/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp similarity index 99% rename from src/ObjWriting/Game/T6/Material/MaterialConstantZoneState.cpp rename to src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp index 5492c775..352824f8 100644 --- a/src/ObjWriting/Game/T6/Material/MaterialConstantZoneState.cpp +++ b/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.cpp @@ -1,4 +1,4 @@ -#include "MaterialConstantZoneState.h" +#include "MaterialConstantZoneStateT6.h" #include "Game/T6/CommonT6.h" #include "Game/T6/GameAssetPoolT6.h" diff --git a/src/ObjWriting/Game/T6/Material/MaterialConstantZoneState.h b/src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.h similarity index 100% rename from src/ObjWriting/Game/T6/Material/MaterialConstantZoneState.h rename to src/ObjWriting/Game/T6/Material/MaterialConstantZoneStateT6.h diff --git a/src/ObjWriting/Game/T6/ObjWriterT6.cpp b/src/ObjWriting/Game/T6/ObjWriterT6.cpp index 57a11992..bb4bcb15 100644 --- a/src/ObjWriting/Game/T6/ObjWriterT6.cpp +++ b/src/ObjWriting/Game/T6/ObjWriterT6.cpp @@ -24,7 +24,7 @@ #include "AssetDumpers/AssetDumperXModel.h" #include "AssetDumpers/AssetDumperZBarrier.h" #include "Game/T6/GameAssetPoolT6.h" -#include "Material/AssetDumperMaterial.h" +#include "Material/DumperMaterialT6.h" #include "ObjWriting.h" using namespace T6; diff --git a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template index d0b83455..2c0ef0f0 100644 --- a/src/ObjWriting/Material/JsonMaterialWriter.cpp.template +++ b/src/ObjWriting/Material/JsonMaterialWriter.cpp.template @@ -30,7 +30,7 @@ #include COMMON_HEADER #set JSON_HEADER "\"Game/" + GAME + "/Material/JsonMaterial" + GAME + ".h\"" #include JSON_HEADER -#set CONSTANTS_HEADER "\"Game/" + GAME + "/Material/MaterialConstantZoneState.h\"" +#set CONSTANTS_HEADER "\"Game/" + GAME + "/Material/MaterialConstantZoneState" + GAME + ".h\"" #include CONSTANTS_HEADER #include