From e46cad36d2f7858b83b8cf1382655b49b761f63a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 6 Jul 2024 01:24:26 +0200 Subject: Tools/vmap_extractor: Split temporary dir_bin into multiple files (one per map) to significantly reduce peak memory usage by vmap_assembler (cherry picked from commit a0f13391a0404d859cf4f8b8dee0c801f2640473) # Conflicts: # src/tools/vmap4_extractor/vmapexport.cpp --- src/tools/vmap4_assembler/TileAssembler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5e9c963a0d7..f803793a5b5 100644 --- a/src/tools/vmap4_assembler/TileAssembler.h +++ b/src/tools/vmap4_assembler/TileAssembler.h @@ -94,14 +94,14 @@ namespace VMAP private: std::string iDestDir; std::string iSrcDir; - MapData mapData; std::set spawnedModelFiles; public: TileAssembler(std::string pSrcDirName, std::string pDestDirName); bool convertWorld2(); - bool readMapSpawns(); + bool convertMap(MapSpawns& data); + static bool readMapSpawns(FILE* dirf, MapSpawns* data); bool calculateTransformedBound(ModelSpawn &spawn); void exportGameobjectModels(); -- cgit v1.2.3