MoveMapGenerator: Add proper multithreading support. (#2827)

vmangos · Nov 19, 2024 · faea064 · faea064
1 parent 0783406
commit faea064
Show file tree

Hide file tree

Showing 9 changed files with 1,299 additions and 964 deletions.
diff --git a/contrib/extractor/System.cpp b/contrib/extractor/System.cpp
@@ -84,7 +84,7 @@ enum Extract
 // Select data for extract
 int   CONF_extract = EXTRACT_MAP | EXTRACT_DBC | EXTRACT_CAMERA;
 // This option allow limit minimum height to some value (Allow save some memory)
-// see contrib/mmap/src/Tilebuilder.h, INVALID_MAP_LIQ_HEIGHT
+// see contrib/mmap/src/TerrainBuilder.h, INVALID_MAP_LIQ_HEIGHT
 bool  CONF_allow_height_limit = true;
 float CONF_use_minHeight = -500.0f;
 

diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
@@ -46,6 +46,7 @@ set(SOURCES
     ./src/MapBuilder.cpp
     ./src/TerrainBuilder.cpp
     ./src/VMapExtensions.cpp
+    ./src/TileWorker.cpp
 )
 
 add_executable(${EXECUTABLE_NAME} ${SOURCES})

diff --git a/contrib/mmap/mmap_extract.py b/contrib/mmap/mmap_extract.py
@@ -115,7 +115,7 @@ def get_subprocess_config() -> SubprocessConfig:
 def run_move_map_gen(map_id: int) -> None:
     config = get_subprocess_config()
     subprocess.check_call(
-        (config.executable, str(map_id), "--silent", *sys.argv[1:]),
+        (config.executable, str(map_id), "--silent", "--threads", "1", *sys.argv[1:]),
         startupinfo=config.startupinfo,
         creationflags=config.creation_flags,
         stdout=subprocess.DEVNULL,