zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-23 21:22:07 +00:00
Code Activity

Added the zone definition to the parameters of ConfigureCreatorCollection. ObjLoaderT6 has also been changed to conditionally add the BSP creator if the map type isn't NONE.

Browse Source
This commit is contained in:
LJW-Dev
2025-11-01 16:19:06 +08:00
parent eef269f497
commit 3d2e890e34
12 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Linker/ZoneCreation/ZoneCreator.cpp
View File

@@ -72,7 +72,7 @@ namespace zone_creator
OutputPathFilesystem cacheDir(context.m_cache_dir); OutputPathFilesystem cacheDir(context.m_cache_dir);
objCompiler->ConfigureCreatorCollection( objCompiler->ConfigureCreatorCollection(
creatorCollection, *zone, zoneDefinitionContext, *context.m_asset_search_path, lookup, creationContext, outDir, cacheDir); creatorCollection, *zone, zoneDefinitionContext, *context.m_asset_search_path, lookup, creationContext, outDir, cacheDir);
objLoader->ConfigureCreatorCollection(creatorCollection, *zone, *context.m_asset_search_path, lookup); objLoader->ConfigureCreatorCollection(creatorCollection, *zone, *context.m_asset_search_path, lookup, *context.m_definition);
for (const auto& assetEntry : context.m_definition->m_assets) for (const auto& assetEntry : context.m_definition->m_assets)
{ {

3
src/ObjLoading/Game/IW3/ObjLoaderIW3.cpp
View File

@@ -118,7 +118,8 @@ namespace
} }
} // namespace } // namespace
void ObjLoader::ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const void ObjLoader::ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const
{ {
ConfigureDefaultCreators(collection, zone); ConfigureDefaultCreators(collection, zone);
ConfigureLoaders(collection, zone, searchPath); ConfigureLoaders(collection, zone, searchPath);

3
src/ObjLoading/Game/IW3/ObjLoaderIW3.h
View File

@@ -11,6 +11,7 @@ namespace IW3
void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override; void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
void UnloadContainersOfZone(Zone& zone) const override; void UnloadContainersOfZone(Zone& zone) const override;
void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const override; void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const override;
}; };
} // namespace IW3 } // namespace IW3

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

@@ -159,7 +159,8 @@ namespace
} }
} // namespace } // namespace
void ObjLoader::ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const void ObjLoader::ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const
{ {
ConfigureDefaultCreators(collection, zone); ConfigureDefaultCreators(collection, zone);
ConfigureLoaders(collection, zone, searchPath, gdt); ConfigureLoaders(collection, zone, searchPath, gdt);

3
src/ObjLoading/Game/IW4/ObjLoaderIW4.h
View File

@@ -12,6 +12,7 @@ namespace IW4
void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override; void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
void UnloadContainersOfZone(Zone& zone) const override; void UnloadContainersOfZone(Zone& zone) const override;
void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const override; void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const override;
}; };
} // namespace IW4 } // namespace IW4

3
src/ObjLoading/Game/IW5/ObjLoaderIW5.cpp
View File

@@ -165,7 +165,8 @@ namespace
} }
} // namespace } // namespace
void ObjLoader::ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const void ObjLoader::ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const
{ {
ConfigureDefaultCreators(collection, zone); ConfigureDefaultCreators(collection, zone);
ConfigureLoaders(collection, zone, searchPath, gdt); ConfigureLoaders(collection, zone, searchPath, gdt);

3
src/ObjLoading/Game/IW5/ObjLoaderIW5.h
View File

@@ -11,6 +11,7 @@ namespace IW5
void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override; void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
void UnloadContainersOfZone(Zone& zone) const override; void UnloadContainersOfZone(Zone& zone) const override;
void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const override; void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const override;
}; };
} // namespace IW5 } // namespace IW5

3
src/ObjLoading/Game/T5/ObjLoaderT5.cpp
View File

@@ -135,7 +135,8 @@ namespace
} }
} // namespace } // namespace
void ObjLoader::ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const void ObjLoader::ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const
{ {
ConfigureDefaultCreators(collection, zone); ConfigureDefaultCreators(collection, zone);
ConfigureLoaders(collection, zone, searchPath); ConfigureLoaders(collection, zone, searchPath);

3
src/ObjLoading/Game/T5/ObjLoaderT5.h
View File

@@ -11,6 +11,7 @@ namespace T5
void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override; void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
void UnloadContainersOfZone(Zone& zone) const override; void UnloadContainersOfZone(Zone& zone) const override;
void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const override; void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const override;
}; };
} // namespace T5 } // namespace T5

11
src/ObjLoading/Game/T6/ObjLoaderT6.cpp
View File

@@ -1,3 +1,5 @@
#include "ObjLoaderT6.h"
#include "Asset/GlobalAssetPoolsLoader.h" #include "Asset/GlobalAssetPoolsLoader.h"
#include "BSP/LoaderBSP_T6.h" #include "BSP/LoaderBSP_T6.h"
#include "FontIcon/CsvLoaderFontIconT6.h" #include "FontIcon/CsvLoaderFontIconT6.h"
@@ -16,7 +18,6 @@
#include "Localize/LocalizeLoaderT6.h" #include "Localize/LocalizeLoaderT6.h"
#include "Material/LoaderMaterialT6.h" #include "Material/LoaderMaterialT6.h"
#include "ObjContainer/IPak/IPak.h" #include "ObjContainer/IPak/IPak.h"
#include "ObjLoaderT6.h"
#include "ObjLoading.h" #include "ObjLoading.h"
#include "PhysConstraints/GdtLoaderPhysConstraintsT6.h" #include "PhysConstraints/GdtLoaderPhysConstraintsT6.h"
#include "PhysConstraints/RawLoaderPhysConstraintsT6.h" #include "PhysConstraints/RawLoaderPhysConstraintsT6.h"
@@ -381,7 +382,7 @@ namespace T6
collection.AddAssetCreator(std::make_unique<GlobalAssetPoolsLoader<AssetZBarrier>>(zone)); collection.AddAssetCreator(std::make_unique<GlobalAssetPoolsLoader<AssetZBarrier>>(zone));
} }
void ConfigureLoaders(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) void ConfigureLoaders(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition)
{ {
auto& memory = zone.Memory(); auto& memory = zone.Memory();
@@ -441,14 +442,16 @@ namespace T6
collection.AddAssetCreator(z_barrier::CreateRawLoaderT6(memory, searchPath, zone)); collection.AddAssetCreator(z_barrier::CreateRawLoaderT6(memory, searchPath, zone));
collection.AddAssetCreator(z_barrier::CreateGdtLoaderT6(memory, searchPath, gdt, zone)); collection.AddAssetCreator(z_barrier::CreateGdtLoaderT6(memory, searchPath, gdt, zone));
if (definition.m_map_type != ZoneDefinitionMapType::NONE)
collection.AddAssetCreator(BSP::CreateLoaderT6(memory, searchPath, zone)); collection.AddAssetCreator(BSP::CreateLoaderT6(memory, searchPath, zone));
} }
} // namespace } // namespace
void ObjLoader::ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const void ObjLoader::ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const
{ {
ConfigureDefaultCreators(collection, zone); ConfigureDefaultCreators(collection, zone);
ConfigureLoaders(collection, zone, searchPath, gdt); ConfigureLoaders(collection, zone, searchPath, gdt, definition);
ConfigureGlobalAssetPoolsLoaders(collection, zone); ConfigureGlobalAssetPoolsLoaders(collection, zone);
} }
} // namespace T6 } // namespace T6

3
src/ObjLoading/Game/T6/ObjLoaderT6.h
View File

@@ -18,7 +18,8 @@ namespace T6
void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override; void LoadReferencedContainersForZone(ISearchPath& searchPath, Zone& zone) const override;
void UnloadContainersOfZone(Zone& zone) const override; void UnloadContainersOfZone(Zone& zone) const override;
void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const override; void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const override;
private: private:
static bool VerifySoundBankChecksum(const SoundBank& soundBank, const SndRuntimeAssetBank& sndRuntimeAssetBank); static bool VerifySoundBankChecksum(const SoundBank& soundBank, const SndRuntimeAssetBank& sndRuntimeAssetBank);

4
src/ObjLoading/IObjLoader.h
View File

@@ -3,6 +3,7 @@
#include "Asset/AssetCreatorCollection.h" #include "Asset/AssetCreatorCollection.h"
#include "Gdt/IGdtQueryable.h" #include "Gdt/IGdtQueryable.h"
#include "SearchPath/ISearchPath.h" #include "SearchPath/ISearchPath.h"
#include "Zone/Definition/ZoneDefinition.h"
#include "Zone/Zone.h" #include "Zone/Zone.h"
class IObjLoader class IObjLoader
@@ -28,7 +29,8 @@ public:
*/ */
virtual void UnloadContainersOfZone(Zone& zone) const = 0; virtual void UnloadContainersOfZone(Zone& zone) const = 0;
virtual void ConfigureCreatorCollection(AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt) const = 0; virtual void ConfigureCreatorCollection(
AssetCreatorCollection& collection, Zone& zone, ISearchPath& searchPath, IGdtQueryable& gdt, ZoneDefinition& definition) const = 0;
static const IObjLoader* GetObjLoaderForGame(GameId game); static const IObjLoader* GetObjLoaderForGame(GameId game);
}; };