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

Clean up duplicated code

Browse Source
This commit is contained in:
Tomasz Zieliński 2024-03-24 18:04:33 +01:00
parent c6a9d94630
commit 0b8dc02d2b
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/rmg/CZonePlacer.cpp
View File

@ -873,6 +873,11 @@ void CZonePlacer::assignZones(CRandomGenerator * rand)
int levels = map.levels(); int levels = map.levels();
// Find current center of mass for each zone. Move zone to that center to balance zones sizes // Find current center of mass for each zone. Move zone to that center to balance zones sizes
std::vector<RmgMap::Zones> zonesOnLevel;
for(int level = 0; level < levels; level++)
{
zonesOnLevel.push_back(map.getZonesOnLevel(level));
}
int3 pos; int3 pos;
@ -883,12 +888,9 @@ void CZonePlacer::assignZones(CRandomGenerator * rand)
for(pos.y = 0; pos.y < height; pos.y++) for(pos.y = 0; pos.y < height; pos.y++)
{ {
distances.clear(); distances.clear();
for(const auto & zone : zones) for(const auto & zone : zonesOnLevel[pos.z])
{ {
if (zone.second->getPos().z == pos.z)
distances.emplace_back(zone.second, static_cast<float>(pos.dist2dSQ(zone.second->getPos()))); distances.emplace_back(zone.second, static_cast<float>(pos.dist2dSQ(zone.second->getPos())));
else
distances.emplace_back(zone.second, std::numeric_limits<float>::max());
} }
boost::min_element(distances, compareByDistance)->first->area().add(pos); //closest tile belongs to zone boost::min_element(distances, compareByDistance)->first->area().add(pos); //closest tile belongs to zone
} }
@ -920,15 +922,10 @@ void CZonePlacer::assignZones(CRandomGenerator * rand)
for (const auto & vertex : vertices) for (const auto & vertex : vertices)
{ {
distances.clear(); distances.clear();
for(const auto & zone : zones) for(const auto & zone : zonesOnLevel[level])
{ {
if (zone.second->isUnderground() == level)
{
// FIXME: Only take into account zones on the same level as vertex
// TODO: Create separate mapping for zones on different levels
distances.emplace_back(zone.second, zone.second->getCenter().dist2dSQ(float3(vertex.x(), vertex.y(), level))); distances.emplace_back(zone.second, zone.second->getCenter().dist2dSQ(float3(vertex.x(), vertex.y(), level)));
} }
}
auto closestZone = boost::min_element(distances, compareByDistance)->first; auto closestZone = boost::min_element(distances, compareByDistance)->first;
vertexMapping[closestZone].insert(int3(vertex.x() * width, vertex.y() * height, level)); //Closest vertex belongs to zone vertexMapping[closestZone].insert(int3(vertex.x() * width, vertex.y() * height, level)); //Closest vertex belongs to zone
@ -946,10 +943,7 @@ void CZonePlacer::assignZones(CRandomGenerator * rand)
auto zone = zoneVertex.first; auto zone = zoneVertex.first;
for (const auto & vertex : zoneVertex.second) for (const auto & vertex : zoneVertex.second)
{ {
if (zone->isUnderground() == level)
distances.emplace_back(zone, metric(pos, vertex)); distances.emplace_back(zone, metric(pos, vertex));
else
distances.emplace_back(zone, std::numeric_limits<float>::max());
} }
} }
@ -960,9 +954,9 @@ void CZonePlacer::assignZones(CRandomGenerator * rand)
} }
} }
for(const auto & zone : zones) for(const auto & zone : zonesOnLevel[level])
{ {
if(zone.second->isUnderground() == level && zone.second->area().empty()) if(zone.second->area().empty())
{ {
// FIXME: Some vertices are duplicated, but it's not a source of problem // FIXME: Some vertices are duplicated, but it's not a source of problem
logGlobal->error("Zone %d at %s is empty, dumping Penrose tiling", zone.second->getId(), zone.second->getCenter().toString()); logGlobal->error("Zone %d at %s is empty, dumping Penrose tiling", zone.second->getId(), zone.second->getCenter().toString());

13
lib/rmg/RmgMap.cpp
View File

@ -239,6 +239,19 @@ RmgMap::Zones & RmgMap::getZones()
return zones; return zones;
} }
RmgMap::Zones RmgMap::getZonesOnLevel(int level) const
{
Zones zonesOnLevel;
for(const auto& zonePair : zones)
{
if(zonePair.second->isUnderground() == level)
{
zonesOnLevel.insert(zonePair);
}
}
return zonesOnLevel;
}
bool RmgMap::isBlocked(const int3 &tile) const bool RmgMap::isBlocked(const int3 &tile) const
{ {
assertOnMap(tile); assertOnMap(tile);

1
lib/rmg/RmgMap.h
View File

@ -74,6 +74,7 @@ public:
using ZoneVector = std::vector<ZonePair>; using ZoneVector = std::vector<ZonePair>;
Zones & getZones(); Zones & getZones();
Zones getZonesOnLevel(int level) const;
void registerZone(FactionID faction); void registerZone(FactionID faction);
ui32 getZoneCount(FactionID faction); ui32 getZoneCount(FactionID faction);