Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite AiFindMiningPlace using TerrainTraversal.

Browse source 
Fix bug in Terrain Traversal.
This commit is contained in:
Joris 2012-06-14 12:19:03 +02:00
parent 71fa19ef76
commit ce71bb34f2
5 changed files with 21 additions and 108 deletions

3
src/action/action_resource.cpp
View file

@ -88,7 +88,6 @@ private:
VisitResult NearReachableTerrainFinder::Visit(TerrainTraversal &terrainTraversal, const Vec2i &pos, const Vec2i &from)
{
if (!player.AiEnabled && !Map.IsFieldExplored(player, pos)) {
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
// Look if found what was required.
@ -99,14 +98,12 @@ VisitResult NearReachableTerrainFinder::Visit(TerrainTraversal &terrainTraversal
return VisitResult_Finished;
}
if (Map.CheckMask(pos, resmask)) { // reachable
terrainTraversal.Get(pos) = terrainTraversal.Get(from) + 1;
if (terrainTraversal.Get(pos) <= maxDist) {
return VisitResult_Ok;
} else {
return VisitResult_DeadEnd;
}
} else { // unreachable
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
}

114
src/ai/ai_building.cpp
View file

@ -162,7 +162,6 @@ VisitResult BuildingPlaceFinder::Visit(TerrainTraversal &terrainTraversal, const
{
#if 0
if (!player.AiEnabled && !Map.IsFieldExplored(player, pos)) {
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
#endif
@ -177,10 +176,8 @@ VisitResult BuildingPlaceFinder::Visit(TerrainTraversal &terrainTraversal, const
}
}
if (CanMoveToMask(pos, movemask)) { // reachable
terrainTraversal.Get(pos) = 1;
return VisitResult_Ok;
} else { // unreachable
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
}
@ -214,8 +211,10 @@ static int AiFindBuildingPlace2(const CUnit &worker, const CUnitType &type, cons
terrainTraversal.PushPos(it);
}
}
} else {
} else if (Map.Info.IsPointOnMap(startPos)) {
terrainTraversal.PushPos(startPos);
} else {
terrainTraversal.PushPos(worker.tilePos);
}
BuildingPlaceFinder buildingPlaceFinder(worker, type, checkSurround, dpos);
@ -284,7 +283,6 @@ VisitResult HallPlaceFinder::Visit(TerrainTraversal &terrainTraversal, const Vec
{
#if 0
if (!player.AiEnabled && !Map.IsFieldExplored(player, pos)) {
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
#endif
@ -295,10 +293,8 @@ VisitResult HallPlaceFinder::Visit(TerrainTraversal &terrainTraversal, const Vec
}
}
if (CanMoveToMask(pos, movemask)) { // reachable
terrainTraversal.Get(pos) = 1;
return VisitResult_Ok;
} else { // unreachable
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
}
@ -366,7 +362,6 @@ VisitResult LumberMillPlaceFinder::Visit(TerrainTraversal &terrainTraversal, con
{
#if 0
if (!player.AiEnabled && !Map.IsFieldExplored(player, pos)) {
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
#endif
@ -376,10 +371,8 @@ VisitResult LumberMillPlaceFinder::Visit(TerrainTraversal &terrainTraversal, con
}
}
if (CanMoveToMask(pos, movemask)) { // reachable
terrainTraversal.Get(pos) = 1;
return VisitResult_Ok;
} else { // unreachable
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
}
@ -387,16 +380,16 @@ VisitResult LumberMillPlaceFinder::Visit(TerrainTraversal &terrainTraversal, con
/**
** Find free building place for lumber mill. (flood fill version)
**
** @param worker Worker to build building.
** @param type Type of building.
** @param startPos Start search X position (if == -1 then unit X pos used).
** @param dpos OUT: Pointer for position returned.
** @param worker Worker to build building.
** @param type Type of building.
** @param startPos Start search X position (if == -1 then unit X pos used).
** @param resultPos OUT: Pointer for position returned.
**
** @return True if place found, false if not found.
**
** @todo FIXME: This is slow really slow, using two flood fills, is not a perfect solution.
*/
static bool AiFindLumberMillPlace(const CUnit &worker, const CUnitType &type, const Vec2i &startPos, Vec2i *dpos)
static bool AiFindLumberMillPlace(const CUnit &worker, const CUnitType &type, const Vec2i &startPos, Vec2i *resultPos)
{
TerrainTraversal terrainTraversal;
@ -409,98 +402,21 @@ static bool AiFindLumberMillPlace(const CUnit &worker, const CUnitType &type, co
terrainTraversal.PushPos(worker.tilePos);
}
LumberMillPlaceFinder lumberMillPlaceFinder(worker, type, dpos);
LumberMillPlaceFinder lumberMillPlaceFinder(worker, type, resultPos);
return terrainTraversal.Run(lumberMillPlaceFinder);
}
static int AiFindMiningPlace(const CUnit &worker,
const CUnitType &type,
int nx, int ny,
Vec2i *dpos,
int resource)
const Vec2i &startPos,
int resource,
Vec2i *resultPos)
{
const Vec2i offset[] = {{0, -1}, { -1, 0}, {1, 0}, {0, 1}, { -1, -1}, {1, -1}, { -1, 1}, {1, 1}};
Vec2i pos;
Vec2i rpos;
int wp;
int ep;
unsigned char *m;
CUnit *mine;
pos.x = (nx != -1 ? nx : worker.tilePos.x);
pos.y = (ny != -1 ? ny : worker.tilePos.y);
int size = Map.Info.MapWidth * Map.Info.MapHeight / 4;
Vec2i *points = new Vec2i[size];
//
// Make movement matrix. FIXME: can create smaller matrix.
//
unsigned char *morg = MakeMatrix();
int w = Map.Info.MapWidth + 2;
unsigned char *matrix = morg + w + w + 1;
points[0] = pos;
int rp = 0;
//if(worker->tilePos == pos)
matrix[pos.x + pos.y * w] = 1; // mark start point
ep = wp = 1; // start with one point
int mask = worker.Type->MovementMask;
//
// Pop a point from stack, push all neighbors which could be entered.
//
for (;;) {
while (rp != ep) {
rpos = points[rp];
for (int i = 0; i < 8; ++i) { // mark all neighbors
pos = rpos + offset[i];
m = matrix + pos.x + pos.y * w;
if (*m) { // already checked
continue;
}
//
// Look if there is a mine area
//
if ((mine = ResourceOnMap(pos, resource, false)) &&
AiFindBuildingPlace2(worker, type, mine->tilePos, mine, dpos, false)) {
delete[] morg;
delete[] points;
return 1;
}
if (CanMoveToMask(pos, mask)) { // reachable
*m = 1;
points[wp] = pos; // push the point
if (++wp >= size) { // round about
wp = 0;
}
} else { // unreachable
*m = 99;
}
}
if (++rp >= size) { // round about
rp = 0;
}
}
//
// Continue with next frame.
//
if (rp == wp) { // unreachable, no more points available
break;
}
ep = wp;
}
delete[] morg;
delete[] points;
return 0;
// look near (mine = ResourceOnMap(pos, resource, false) ?
return AiFindBuildingPlace2(worker, type, startPos, NULL, resultPos, false);
}
/**
** Find free building place.
**
@ -535,7 +451,7 @@ int AiFindBuildingPlace(const CUnit &worker, const CUnitType &type, const Vec2i
if (type.GivesResource == i) {
if (resinfo && resinfo->RefineryHarvester) {
//Mine have to be build ONTOP resources
return AiFindMiningPlace(worker, type, nearPos.x, nearPos.y, dpos, i);
return AiFindMiningPlace(worker, type, nearPos, i, dpos);
} else {
//Mine can be build without resource restrictions: solar panels, etc
const Vec2i &startPos = Map.Info.IsPointOnMap(nearPos) ? nearPos : worker.tilePos;

3
src/include/pathfinder.h
View file

@ -155,9 +155,10 @@ public:
// Accept pos to be at one inside the real map
unsigned char Get(const Vec2i &pos) const;
unsigned char& Get(const Vec2i &pos);
private:
void Set(const Vec2i &pos, unsigned char value);
struct PosNode
{
PosNode(const Vec2i &pos, const Vec2i &from) : pos(pos), from(from) {}

6
src/pathfinder/pathfinder.cpp
View file

@ -88,6 +88,7 @@ void TerrainTraversal::PushPos(const Vec2i &pos)
{
if (IsVisited(pos) == false) {
m_queue.push(PosNode(pos, pos));
Set(pos, 1);
}
}
@ -100,6 +101,7 @@ void TerrainTraversal::PushNeighboor(const Vec2i &pos)
if (IsVisited(newPos) == false) {
m_queue.push(PosNode(newPos, pos));
Set(newPos, Get(pos) + 1);
}
}
}
@ -114,9 +116,9 @@ unsigned char TerrainTraversal::Get(const Vec2i& pos) const
return m_values[m_extented_width + 1 + pos.y * m_extented_width + pos.x];
}
unsigned char& TerrainTraversal::Get(const Vec2i& pos)
void TerrainTraversal::Set(const Vec2i& pos, unsigned char value)
{
return m_values[m_extented_width + 1 + pos.y * m_extented_width + pos.x];
m_values[m_extented_width + 1 + pos.y * m_extented_width + pos.x] = value;
}
/**

3
src/unit/unit.cpp
View file

@ -2022,7 +2022,6 @@ private:
VisitResult TerrainFinder::Visit(TerrainTraversal &terrainTraversal, const Vec2i &pos, const Vec2i &from)
{
if (!player.AiEnabled && !Map.IsFieldExplored(player, pos)) {
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
// Look if found what was required.
@ -2033,14 +2032,12 @@ VisitResult TerrainFinder::Visit(TerrainTraversal &terrainTraversal, const Vec2i
return VisitResult_Finished;
}
if (CanMoveToMask(pos, movemask)) { // reachable
terrainTraversal.Get(pos) = terrainTraversal.Get(from) + 1;
if (terrainTraversal.Get(pos) <= maxDist) {
return VisitResult_Ok;
} else {
return VisitResult_DeadEnd;
}
} else { // unreachable
terrainTraversal.Get(pos) = -1;
return VisitResult_DeadEnd;
}
}