refactor: use variants in zone instead of only game

This commit is contained in:
Jan Laupetin committed 2026-10-31 07:50:48 +01:00
1 parent 04642067b1
commit c6ab3162eb
138 files changed
+542 -549

No files matched your search

@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/_testimage.dds", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/testimage.iwi", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -274,7 +274,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -20,7 +20,7 @@ namespace
{
public:
MenuLoadingTestHelper()
: m_zone("MockZone", 0, GameId::IW3, GamePlatform::PC),
: m_zone("MockZone", 0, GameVariantId::IW3_PC),
m_creator_collection(m_zone),
m_context(m_zone, &m_creator_collection, &m_ignored_asset_lookup)
{
@@ -21,7 +21,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::IW3, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::IW3_PC);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -18,7 +18,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::IW3, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW3_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/_testimage.dds", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/testimage.iwi", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -277,7 +277,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -30,7 +30,7 @@ namespace test::game::iw4::menu::parsing::it
public:
MenuParsingItHelper()
: m_zone("MockZone", 0, GameId::IW4, GamePlatform::PC),
: m_zone("MockZone", 0, GameVariantId::IW4_PC32),
m_creator_collection(m_zone),
m_ignored_asset_lookup(),
m_context(m_zone, &m_creator_collection, &m_ignored_asset_lookup)
@@ -21,7 +21,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::IW4, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::IW4_PC32);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -20,7 +20,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW4_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -85,7 +85,7 @@ tag_trophy_04_fx)"
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("vehicles/test_vehicle", RAW_VEHICLE);
Zone zone("LoadingZone", 0, GameId::IW4, GamePlatform::PC);
Zone zone("LoadingZone", 0, GameVariantId::IW4_PC32);
auto* physPresetInfo = GivenTestPhysPreset("vehicle_tank", zone);
auto* weaponInfo = GivenTestWeapon("sp/bradley_turret", zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/_testimage.dds", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/testimage.iwi", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -301,7 +301,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -24,7 +24,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::IW5, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::IW5_PC32);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -19,7 +19,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::IW5_PC32);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -111,7 +111,7 @@ tag_trophy_04_fx\trophyExplodeFx\testfx1\trophyFlashFx\testfx2)"
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("vehicles/test_vehicle", RAW_VEHICLE);
Zone zone("LoadingZone", 0, GameId::IW5, GamePlatform::PC);
Zone zone("LoadingZone", 0, GameVariantId::IW5_PC32);
auto* physPresetInfo = GivenTestPhysPreset("vehicle_tank", zone);
auto* weaponInfo = GivenTestWeapon("sp/bradley_turret", zone);
@@ -20,7 +20,7 @@ namespace
{
public:
MenuLoadingTestHelper()
: m_zone("MockZone", 0, GameId::T4, GamePlatform::PC),
: m_zone("MockZone", 0, GameVariantId::T4_PC),
m_creator_collection(m_zone),
m_context(m_zone, &m_creator_collection, &m_ignored_asset_lookup)
{
@@ -22,7 +22,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::T4, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::T4_PC);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -19,7 +19,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::T4, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T4_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/_testimage.dds", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::T5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T5_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/testimage.iwi", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::T5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T5_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -358,7 +358,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::T5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T5_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -24,7 +24,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::T5, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::T5_PC);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -19,7 +19,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::T5, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T5_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -79,7 +79,7 @@ namespace
]
})FONT_ICON");
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/_testimage.dds", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -32,7 +32,7 @@ namespace
searchPath.AddFileData("images/testimage.iwi", std::string(data.get(), fileSize));
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -241,7 +241,7 @@ namespace
]
})MATERIAL");
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);
@@ -24,7 +24,7 @@ namespace
MockSearchPath loadingSearchPath;
loadingSearchPath.AddFileData("physic/test_phys_preset", RAW_PHYS_PRESET);
Zone loadingZone("LoadingZone", 0, GameId::T6, GamePlatform::PC);
Zone loadingZone("LoadingZone", 0, GameVariantId::T6_PC);
AssetCreatorCollection creatorCollection(loadingZone);
IgnoredAssetLookup ignoredAssetLookup;
AssetCreationContext loadingContext(loadingZone, &creatorCollection, &ignoredAssetLookup);
@@ -19,7 +19,7 @@ namespace
"test,data,lol\n"
"lorem,ipsum");
Zone zone("MockZone", 0, GameId::T6, GamePlatform::PC);
Zone zone("MockZone", 0, GameVariantId::T6_PC);
MemoryManager memory;
AssetCreatorCollection creatorCollection(zone);