games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

Route roads away from zone borders

Browse Source
This commit is contained in:
Tomasz Zieliński 2024-05-10 15:35:33 +02:00
parent d72afb1acc
commit a6fa6855dc
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/rmg/RmgArea.cpp
View File

@ -254,6 +254,11 @@ bool Area::overlap(const Area & area) const
return overlap(area.getTilesVector()); return overlap(area.getTilesVector());
} }
int Area::distance(const int3 & tile) const
{
return nearest(tile).dist2d(tile);
}
int Area::distanceSqr(const int3 & tile) const int Area::distanceSqr(const int3 & tile) const
{ {
return nearest(tile).dist2dSQ(tile); return nearest(tile).dist2dSQ(tile);

1
lib/rmg/RmgArea.h
View File

@ -51,6 +51,7 @@ namespace rmg
bool contains(const Area & area) const; bool contains(const Area & area) const;
bool overlap(const Area & area) const; bool overlap(const Area & area) const;
bool overlap(const std::vector<int3> & tiles) const; bool overlap(const std::vector<int3> & tiles) const;
int distance(const int3 & tile) const;
int distanceSqr(const int3 & tile) const; int distanceSqr(const int3 & tile) const;
int distanceSqr(const Area & area) const; int distanceSqr(const Area & area) const;
int3 nearest(const int3 & tile) const; int3 nearest(const int3 & tile) const;

24
lib/rmg/modificators/RoadPlacer.cpp
View File

@ -68,12 +68,14 @@ bool RoadPlacer::createRoad(const int3 & dst)
{ {
auto searchArea = zone.areaPossible() + zone.freePaths() + areaRoads + roads; auto searchArea = zone.areaPossible() + zone.freePaths() + areaRoads + roads;
rmg::Area border(zone.area()->getBorder());
rmg::Path path(searchArea); rmg::Path path(searchArea);
path.connect(roads); path.connect(roads);
const float VISITABLE_PENALTY = 1.33f; const float VISITABLE_PENALTY = 1.33f;
auto simpleRoutig = [this, VISITABLE_PENALTY](const int3& src, const int3& dst) auto simpleRoutig = [this, &border, &VISITABLE_PENALTY](const int3& src, const int3& dst)
{ {
if(areaIsolated().contains(dst)) if(areaIsolated().contains(dst))
{ {
@ -81,13 +83,19 @@ bool RoadPlacer::createRoad(const int3 & dst)
} }
else else
{ {
float weight = dst.dist2dSQ(src); float ret = dst.dist2d(src);
auto ret = weight * weight;
// TODO: Prefer zig-zag connections
if (visitableTiles.contains(src) || visitableTiles.contains(dst)) if (visitableTiles.contains(src) || visitableTiles.contains(dst))
{ {
ret *= VISITABLE_PENALTY; ret *= VISITABLE_PENALTY;
} }
float dist = border.distance(dst);
if(dist > 1)
{
ret /= dist;
}
return ret; return ret;
} }
}; };
@ -95,7 +103,7 @@ bool RoadPlacer::createRoad(const int3 & dst)
auto res = path.search(dst, true, simpleRoutig); auto res = path.search(dst, true, simpleRoutig);
if(!res.valid()) if(!res.valid())
{ {
auto desperateRoutig = [this, VISITABLE_PENALTY](const int3& src, const int3& dst) -> float auto desperateRoutig = [this, &border, &VISITABLE_PENALTY](const int3& src, const int3& dst) -> float
{ {
//Do not allow connections straight up through object not visitable from top //Do not allow connections straight up through object not visitable from top
if(std::abs((src - dst).y) == 1) if(std::abs((src - dst).y) == 1)
@ -113,13 +121,17 @@ bool RoadPlacer::createRoad(const int3 & dst)
} }
} }
float weight = dst.dist2dSQ(src); auto ret = dst.dist2d(src);
auto ret = weight * weight;
if (visitableTiles.contains(src) || visitableTiles.contains(dst)) if (visitableTiles.contains(src) || visitableTiles.contains(dst))
{ {
ret *= VISITABLE_PENALTY; ret *= VISITABLE_PENALTY;
} }
float dist = border.distance(dst);
if(dist > 1)
{
ret /= dist;
}
return ret; return ret;
}; };
res = path.search(dst, false, desperateRoutig); res = path.search(dst, false, desperateRoutig);