Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 13:47:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Mmaps: Fixed a few mistakes in the mmaps_generator, should be somewhat faster now

Browse Source
This commit is contained in:
Subv
2012-08-25 17:37:15 -05:00
parent f0473777e2
commit 92e72b2a5c
2 changed files with 60 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/tools/mmaps_generator/MapBuilder.cpp
View File

@@ -160,30 +160,46 @@ namespace MMAP
/**************************************************************************/
void MapBuilder::buildAllMaps(int threads)
{
int running = 0;
std::vector<BuilderThread*> _threads;
for (int i = 0; i < threads; ++i)
_threads.push_back(new BuilderThread(this));
for (TileList::iterator it = m_tiles.begin(); it != m_tiles.end(); ++it)
{
uint32 mapID = (*it).first;
uint32 mapID = it->first;
if (!shouldSkipMap(mapID))
{
if (threads > 1)
{
BuilderThread* thread = new BuilderThread(this, mapID);
thread->activate();
++running;
// Do not allow more than {threads} threads running at the same time
if (running == threads)
bool next = false;
while (!next)
{
// Wait for previous threads to finish
ACE_Thread_Manager::instance()->wait();
// Reset the number of running threads
running = 0;
for (std::vector<BuilderThread*>::iterator _th = _threads.begin(); _th != _threads.end(); ++_th)
{
if ((*_th)->Free)
{
printf("Thread is free for map %03i\n", mapID);
(*_th)->SetMapId(mapID);
(*_th)->activate();
next = true;
break;
}
}
// Wait for 20 seconds
ACE_OS::sleep(ACE_Time_Value (0, 20000));
}
}
else
buildMap(mapID);
}
}
// Wait for all threads to finish before closing down
ACE_Thread_Manager::instance()->wait();
// Free memory
for (std::vector<BuilderThread*>::iterator _th = _threads.begin(); _th != _threads.end(); ++_th)
delete *_th;
}
/**************************************************************************/
@@ -311,35 +327,35 @@ namespace MMAP
tiles->insert(StaticMapTree::packTileID(i, j));
}
if (!tiles->size())
return;
// build navMesh
dtNavMesh* navMesh = NULL;
buildNavMesh(mapID, navMesh);
if (!navMesh)
if (!tiles->empty())
{
printf("Failed creating navmesh! \n");
return;
// build navMesh
dtNavMesh* navMesh = NULL;
buildNavMesh(mapID, navMesh);
if (!navMesh)
{
printf("Failed creating navmesh! \n");
return;
}
// now start building mmtiles for each tile
printf("[Map %i] We have %u tiles. \n", mapID, (unsigned int)tiles->size());
for (set<uint32>::iterator it = tiles->begin(); it != tiles->end(); ++it)
{
uint32 tileX, tileY;
// unpack tile coords
StaticMapTree::unpackTileID((*it), tileX, tileY);
if (shouldSkipTile(mapID, tileX, tileY))
continue;
buildTile(mapID, tileX, tileY, navMesh);
}
dtFreeNavMesh(navMesh);
}
// now start building mmtiles for each tile
printf("[Map %i] We have %u tiles. \n", mapID, (unsigned int)tiles->size());
for (set<uint32>::iterator it = tiles->begin(); it != tiles->end(); ++it)
{
uint32 tileX, tileY;
// unpack tile coords
StaticMapTree::unpackTileID((*it), tileX, tileY);
if (shouldSkipTile(mapID, tileX, tileY))
continue;
buildTile(mapID, tileX, tileY, navMesh);
}
dtFreeNavMesh(navMesh);
printf("[Map %i] Complete!\n", mapID);
}

8
src/tools/mmaps_generator/MapBuilder.h
View File

@@ -134,14 +134,20 @@ namespace MMAP
MapBuilder* _builder;
uint32 _mapId;
public:
BuilderThread(MapBuilder* builder, uint32 mapId) : _builder(builder), _mapId(mapId) {}
BuilderThread(MapBuilder* builder) : _builder(builder), Free(true) {}
void SetMapId(uint32 mapId) { _mapId = mapId; }
int svc()
{
Free = false;
if (_builder)
_builder->buildMap(_mapId);
Free = true;
return 0;
}
bool Free;
};
}