Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- changed resource faction cache to a map for better performance

Browse Source
This commit is contained in:
Mark Vejvoda 2010-10-21 21:53:08 +00:00
parent 07fe6a2196
commit 178809ada3
2 changed files with 42 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
source/glest_game/type_instances/faction.cpp
View File

@ -587,32 +587,24 @@ void Faction::resetResourceAmount(const ResourceType *rt){
void Faction::addResourceTargetToCache(const Vec2i &pos) { void Faction::addResourceTargetToCache(const Vec2i &pos) {
bool duplicateEntry = false; bool duplicateEntry = false;
if(cacheResourceTargetList.size() > 0) { if(cacheResourceTargetList.size() > 0) {
for(int i = 0; i < cacheResourceTargetList.size(); ++i) { std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.find(pos);
const Vec2i &cache = cacheResourceTargetList[i]; if(iter != cacheResourceTargetList.end()) {
if(cache == pos) { iter->second++;
duplicateEntry = true; duplicateEntry = true;
break;
}
} }
} }
if(duplicateEntry == false) { if(duplicateEntry == false) {
cacheResourceTargetList.push_back(pos); cacheResourceTargetList[pos] = 1;
} }
cleanupResourceTypeTargetCache();
} }
void Faction::removeResourceTargetFromCache(const Vec2i &pos) { void Faction::removeResourceTargetFromCache(const Vec2i &pos) {
if(cacheResourceTargetList.size() > 0) { if(cacheResourceTargetList.size() > 0) {
for(int i = 0; i < cacheResourceTargetList.size(); ++i) { std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.find(pos);
const Vec2i &cache = cacheResourceTargetList[i]; if(iter != cacheResourceTargetList.end()) {
if(cache == pos) { cacheResourceTargetList.erase(pos);
cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i);
break;
}
} }
} }
cleanupResourceTypeTargetCache();
} }
void Faction::addCloseResourceTargetToCache(const Vec2i &pos) { void Faction::addCloseResourceTargetToCache(const Vec2i &pos) {
@ -635,10 +627,11 @@ void Faction::addCloseResourceTargetToCache(const Vec2i &pos) {
Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type) { Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type) {
Vec2i result(-1); Vec2i result(-1);
if(cacheResourceTargetList.size() > 0) { if(cacheResourceTargetList.size() > 0) {
std::vector<Vec2i> deleteList;
const Map *map = world->getMap(); const Map *map = world->getMap();
for(int i = 0; i < cacheResourceTargetList.size(); ++i) { for(std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.begin();
const Vec2i &cache = cacheResourceTargetList[i]; iter != cacheResourceTargetList.end(); ++iter) {
const Vec2i &cache = iter->first;
const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(cache)); const SurfaceCell *sc = map->getSurfaceCell(map->toSurfCoords(cache));
if( sc != NULL && sc->getResource() != NULL) { if( sc != NULL && sc->getResource() != NULL) {
const Resource *resource = sc->getResource(); const Resource *resource = sc->getResource();
@ -646,52 +639,49 @@ Vec2i Faction::getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceT
if(result.x < 0 || unit->getPos().dist(cache) < unit->getPos().dist(result)) { if(result.x < 0 || unit->getPos().dist(cache) < unit->getPos().dist(result)) {
if(unit->isBadHarvestPos(cache) == false) { if(unit->isBadHarvestPos(cache) == false) {
result = cache; result = cache;
} // Close enough to our position, no more looking
else { if(unit->getPos().dist(result) <= 5) {
const int harvestDistance = 5; break;
int size = unit->getType()->getSize();
for(int j = -harvestDistance; j <= size; ++j) {
for(int k = -harvestDistance; k <= size; ++k) {
Vec2i newPos = unit->getPos() + Vec2i(j,k);
if(map->isInside(newPos.x, newPos.y)) {
Resource *r= map->getSurfaceCell(map->toSurfCoords(newPos))->getResource();
if(r != NULL) {
if(r->getType() == type) {
if(unit->isBadHarvestPos(newPos) == false) {
result= newPos;
}
}
}
}
}
} }
} }
} }
} }
} }
else {
deleteList.push_back(cache);
}
} }
cleanupResourceTypeTargetCache(&deleteList);
} }
cleanupResourceTypeTargetCache();
return result; return result;
} }
void Faction::cleanupResourceTypeTargetCache() { void Faction::cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr) {
if(cacheResourceTargetList.size() > 0) { if(cacheResourceTargetList.size() > 0) {
for(int i = cacheResourceTargetList.size() - 1; i >= 0; --i) { std::vector<Vec2i> deleteList;
const Vec2i &cache = cacheResourceTargetList[i]; if(deleteListPtr != NULL) {
deleteList = *deleteListPtr;
}
else {
for(std::map<Vec2i,int>::iterator iter = cacheResourceTargetList.begin();
iter != cacheResourceTargetList.end(); ++iter) {
const Vec2i &cache = iter->first;
if(world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache)) != NULL) { if(world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache)) != NULL) {
Resource *resource = world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache))->getResource(); Resource *resource = world->getMap()->getSurfaceCell(world->getMap()->toSurfCoords(cache))->getResource();
if(resource == NULL) { if(resource == NULL) {
cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i); deleteList.push_back(cache);
}
}
else {
deleteList.push_back(cache);
} }
} }
else { }
cacheResourceTargetList.erase(cacheResourceTargetList.begin() + i); for(int i = 0; i < deleteList.size(); ++i) {
} Vec2i &cache = deleteList[i];
cacheResourceTargetList.erase(cache);
} }
} }
} }

4
source/glest_game/type_instances/faction.h
View File

@ -84,7 +84,7 @@ private:
bool thisFaction; bool thisFaction;
std::map<Vec2i, std::vector<FactionPathSuccessCache> > successfulPathFinderTargetList; std::map<Vec2i, std::vector<FactionPathSuccessCache> > successfulPathFinderTargetList;
std::vector<Vec2i> cacheResourceTargetList; std::map<Vec2i,int> cacheResourceTargetList;
public: public:
Faction(); Faction();
@ -160,7 +160,7 @@ public:
void removeResourceTargetFromCache(const Vec2i &pos); void removeResourceTargetFromCache(const Vec2i &pos);
void addCloseResourceTargetToCache(const Vec2i &pos); void addCloseResourceTargetToCache(const Vec2i &pos);
Vec2i getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type); Vec2i getClosestResourceTypeTargetFromCache(Unit *unit, const ResourceType *type);
void cleanupResourceTypeTargetCache(); void cleanupResourceTypeTargetCache(std::vector<Vec2i> *deleteListPtr);
std::string toString() const; std::string toString() const;