games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Thread pool kinda works.

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-05-07 07:48:12 +02:00
parent 3d25c2c6dc
commit a58094aefe
6 changed files with 287 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/rmg/Zone.cpp
View File

@@ -24,7 +24,8 @@ std::function<bool(const int3 &)> AREA_NO_FILTER = [](const int3 & t)
};
Zone::Zone(RmgMap & map, CMapGenerator & generator)
: townType(ETownType::NEUTRAL)
: finished(false)
, townType(ETownType::NEUTRAL)
, terrainType(ETerrainId::GRASS)
, map(map)
, generator(generator)
@@ -152,12 +153,12 @@ rmg::Path Zone::searchPath(const rmg::Area & src, bool onlyStraight, const std::
return 2;
return 3;
};
auto area = (dAreaPossible + dAreaFree).getSubarea(areafilter);
rmg::Path freePath(area);
rmg::Path resultPath(area);
freePath.connect(dAreaFree);
//connect to all pieces
auto goals = connectedAreas(src, onlyStraight);
for(auto & goal : goals)
@@ -165,42 +166,23 @@ rmg::Path Zone::searchPath(const rmg::Area & src, bool onlyStraight, const std::
auto path = freePath.search(goal, onlyStraight, movementCost);
if(path.getPathArea().empty())
return rmg::Path::invalid();
freePath.connect(path.getPathArea());
resultPath.connect(path.getPathArea());
}
return resultPath;
}
rmg::Path Zone::searchPath(const int3 & src, bool onlyStraight, const std::function<bool(const int3 &)> & areafilter) const
///connect current tile to any other free tile within zone
{
return searchPath(rmg::Area({src}), onlyStraight, areafilter);
return searchPath(rmg::Area({ src }), onlyStraight, areafilter);
}
TRMGJob Zone::getNextJob()
TModificators Zone::getModificators()
{
for (auto& modificator : modificators)
{
if (modificator->hasJobs())
{
return modificator->getNextJob();
}
}
return TRMGJob();
}
bool Zone::hasJobs()
{
for (auto& modificator : modificators)
{
if (modificator->hasJobs())
{
return true;
}
}
return false;
return modificators;
}
void Zone::connectPath(const rmg::Path & path)
@@ -303,21 +285,4 @@ void Zone::initModificators()
logGlobal->info("Zone %d modificators initialized", getId());
}
void Zone::processModificators()
{
for(auto & modificator : modificators)
{
try
{
modificator->run();
}
catch (const rmgException & e)
{
logGlobal->info("Zone %d, modificator %s - FAILED: %s", getId(), e.what());
throw e;
}
}
logGlobal->info("Zone %d filled successfully", getId());
}
VCMI_LIB_NAMESPACE_END