zone/OpenAssetTools
2
0 Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-10-30 06:11:59 +00:00
Code Activity

refactor: use variants in zone instead of only game

Browse Source
This commit is contained in:
Jan Laupetin committed 2026-10-22 20:01:05 +02:00
1 parent 041501fb5d
commit 594bf41eaf
138 files changed
+542 -549
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/ObjWritingTests/Game/IW3/Material/MaterialJsonDumperIW3Test.cpp
+1 -1
View File
@@ -550,7 +550,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/IW3/Menu/MenuDumperIW3Test.cpp
+4 -4
View File
@@ -212,7 +212,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
@@ -377,7 +377,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
@@ -426,7 +426,7 @@ namespace
menuList.menuCount = static_cast<int>(std::size(menus));
menuList.menus = menus;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<MenuList>>(ASSET_TYPE_MENULIST, menuList.name, &menuList));
@@ -531,7 +531,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/IW3/Menu/MenuListDumperIW3Test.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ namespace
menuList.menuCount = static_cast<int>(std::size(menus));
menuList.menus = menus;
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<MenuList>>(ASSET_TYPE_MENULIST, menuList.name, &menuList));
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/IW3/PhysPreset/PhysPresetInfoStringDumperIW3Test.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::IW3, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::IW3_PC);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/IW3/Techset/TechsetDumperIW3Test.cpp
+1 -1
View File
@@ -255,7 +255,7 @@ namespace
TEST_CASE("TechsetDumperIW3", "[iw3][techset][dumper]")
{
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
zone.Register();
MemoryManager memory;
test/ObjWritingTests/Game/IW4/Material/MaterialJsonDumperIW4Test.cpp
+1 -1
View File
@@ -531,7 +531,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/IW4/PhysPreset/PhysPresetInfoStringDumperIW4Test.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::IW4, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::IW4_PC32);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/IW4/Techset/TechsetDumperIW4Test.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ namespace
TEST_CASE("TechsetDumperIW4", "[iw4][techset][dumper]")
{
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
zone.Register();
MemoryManager memory;
test/ObjWritingTests/Game/IW4/Vehicle/VehicleDumperIW4Test.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ namespace
std::string DumpVehicle(VehicleDef& vehicle)
{
Zone dumpingZone("DumpingZone", 0, GameId::IW4, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::IW4_PC32);
vehicle.trophyTags[0] = dumpingZone.m_script_strings.AddOrGetScriptString("tag_trophy_left");
vehicle.trophyTags[1] = dumpingZone.m_script_strings.AddOrGetScriptString("tag_trophy_right");
dumpingZone.m_pools.AddAsset(ASSET_TYPE_VEHICLE, vehicle.name, &vehicle, {}, {}, {});
test/ObjWritingTests/Game/IW5/Material/MaterialJsonDumperIW5Test.cpp
+1 -1
View File
@@ -584,7 +584,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/IW5/PhysPreset/PhysPresetInfoStringDumperIW5Test.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::IW5, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::IW5_PC32);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/IW5/Techset/TechsetDumperIW5Test.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ namespace
TEST_CASE("TechsetDumperIW5", "[iw5][techset][dumper]")
{
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
zone.Register();
MemoryManager memory;
test/ObjWritingTests/Game/IW5/Vehicle/VehicleDumperIW5Test.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ namespace
std::string DumpVehicle(VehicleDef& vehicle)
{
Zone dumpingZone("DumpingZone", 0, GameId::IW5, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::IW5_PC32);
vehicle.trophyTags[0] = dumpingZone.m_script_strings.AddOrGetScriptString("tag_trophy_iw5");
vehicle.audioOriginTag = dumpingZone.m_script_strings.AddOrGetScriptString("tag_audio_origin");
vehicle.audioOriginTagAlt = dumpingZone.m_script_strings.AddOrGetScriptString("tag_audio_origin_alt");
test/ObjWritingTests/Game/T4/Menu/MenuDumperT4Test.cpp
+5 -5
View File
@@ -212,7 +212,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
@@ -377,7 +377,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
@@ -426,7 +426,7 @@ namespace
menuList.menuCount = static_cast<int>(std::size(menus));
menuList.menus = menus;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<MenuList>>(ASSET_TYPE_MENULIST, menuList.name, &menuList));
@@ -531,7 +531,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
@@ -628,7 +628,7 @@ namespace
menu.itemCount = static_cast<int>(std::size(items));
menu.items = items;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<menuDef_t>>(ASSET_TYPE_MENU, menu.window.name, &menu));
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/T4/Menu/MenuListDumperT4Test.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ namespace
menuList.menuCount = static_cast<int>(std::size(menus));
menuList.menus = menus;
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
zone.m_pools.AddAsset(std::make_unique<XAssetInfo<MenuList>>(ASSET_TYPE_MENULIST, menuList.name, &menuList));
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/T4/PhysPreset/PhysPresetInfoStringDumperT4Test.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::T4, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::T4_PC);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/T4/Sound/LoadedSoundDumperT4Test.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ namespace
TEST_CASE("LoadedSoundDumperT4: Can dump PCM WAV loaded sound", "[t4][loaded-sound][assetdumper]")
{
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
MockSearchPath mockObjPath;
MockOutputPath mockOutput;
AssetDumpingContext context(zone, "", mockOutput, mockObjPath, std::nullopt);
test/ObjWritingTests/Game/T4/XModel/XModelGltfWriterT4Test.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ namespace
"tag_clip",
};
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
std::array<ScriptString, boneNameValues.size()> boneNames{};
for (auto boneIndex = 0u; boneIndex < boneNameValues.size(); boneIndex++)
test/ObjWritingTests/Game/T5/Material/MaterialJsonDumperT5Test.cpp
+1 -1
View File
@@ -613,7 +613,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::T5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T5_PC);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/T5/PhysPreset/PhysPresetInfoStringDumperT5Test.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::T5, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::T5_PC);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/T5/Techset/TechsetDumperT5Test.cpp
+1 -1
View File
@@ -430,7 +430,7 @@ namespace
TEST_CASE("TechsetDumperT5", "[t5][techset][dumper]")
{
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
zone.Register();
MemoryManager memory;
test/ObjWritingTests/Game/T6/FontIcon/FontIconJsonDumperT6Test.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ namespace
]
})FONT_ICON");
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/T6/Material/MaterialJsonDumperT6Test.cpp
+1 -1
View File
@@ -461,7 +461,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
MockSearchPath mockObjPath;
test/ObjWritingTests/Game/T6/PhysPreset/PhysPresetInfoStringDumperT6Test.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ namespace
std::string DumpPhysPreset(PhysPreset& physPreset)
{
Zone dumpingZone("DumpingZone", 0, GameId::T6, GamePlatform::PC);
Zone dumpingZone("DumpingZone", 0, GameVariantId::T6_PC);
dumpingZone.m_pools.AddAsset(std::make_unique<XAssetInfo<PhysPreset>>(ASSET_TYPE_PHYSPRESET, physPreset.name, &physPreset));
MockSearchPath dumpingObjPath;
test/ObjWritingTests/Game/T6/Techset/TechsetDumperT6Test.cpp
+1 -1
View File
@@ -274,7 +274,7 @@ namespace
TEST_CASE("TechsetDumperT6", "[t6][techset][dumper]")
{
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
zone.Register();
MemoryManager memory;