From 11a252e601522d840c5c2ceb3331495c51a2e5d3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 6 Jul 2024 12:56:59 +0200 Subject: Tools/vmap_assembler: Multithread building vmaps --- src/tools/vmap4_assembler/TileAssembler.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/tools/vmap4_assembler/TileAssembler.h') diff --git a/src/tools/vmap4_assembler/TileAssembler.h b/src/tools/vmap4_assembler/TileAssembler.h index f803793a5b5..3586a9daec6 100644 --- a/src/tools/vmap4_assembler/TileAssembler.h +++ b/src/tools/vmap4_assembler/TileAssembler.h @@ -56,6 +56,7 @@ namespace VMAP { uint32 MapId = 0; std::map UniqueEntries; + std::set SpawnedModelFiles; std::map> TileEntries; std::map> ParentTileEntries; }; @@ -92,17 +93,18 @@ namespace VMAP class TileAssembler { private: - std::string iDestDir; std::string iSrcDir; + std::string iDestDir; + uint32 iThreads; std::set spawnedModelFiles; public: - TileAssembler(std::string pSrcDirName, std::string pDestDirName); + TileAssembler(std::string srcDirName, std::string destDirName, uint32 threads); bool convertWorld2(); - bool convertMap(MapSpawns& data); + bool convertMap(MapSpawns& data) const; static bool readMapSpawns(FILE* dirf, MapSpawns* data); - bool calculateTransformedBound(ModelSpawn &spawn); + bool calculateTransformedBound(ModelSpawn &spawn) const; void exportGameobjectModels(); bool convertRawFile(const std::string& pModelFilename); -- cgit v1.2.3