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

- removed one lookup key from new cache as it was not required

This commit is contained in:
Mark Vejvoda 2010-08-25 15:55:17 +00:00
parent 855443d98f
commit 49978632c4
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/glest_game/world/unit_updater.cpp
View File

@ -1131,28 +1131,25 @@ bool UnitUpdater::attackableOnRange(const Unit *unit, Unit **rangedPtr, const At
return unitOnRange(unit, range, rangedPtr, ast); return unitOnRange(unit, range, rangedPtr, ast);
} }
bool UnitUpdater::findCachedCellsEnemies(Vec2i center, Vec2f floatCenter, bool UnitUpdater::findCachedCellsEnemies(Vec2i center, int range, int size, vector<Unit*> &enemies,
int range, int size, vector<Unit*> &enemies,
const AttackSkillType *ast, const Unit *unit, const AttackSkillType *ast, const Unit *unit,
const Unit *commandTarget) { const Unit *commandTarget) {
bool result = false; bool result = false;
//return result;
std::map<Vec2i, std::map<Vec2f, std::map<int, std::map<int, UnitRangeCellsLookupItem > > > >::iterator iterFind = UnitRangeCellsLookupItemCache.find(center); std::map<Vec2i, std::map<int, std::map<int, UnitRangeCellsLookupItem > > >::iterator iterFind = UnitRangeCellsLookupItemCache.find(center);
if(iterFind != UnitRangeCellsLookupItemCache.end()) { if(iterFind != UnitRangeCellsLookupItemCache.end()) {
std::map<Vec2f, std::map<int, std::map<int, UnitRangeCellsLookupItem > > >::iterator iterFind2 = iterFind->second.find(floatCenter); std::map<int, std::map<int, UnitRangeCellsLookupItem > >::iterator iterFind3 = iterFind->second.find(size);
if(iterFind2 != iterFind->second.end()) { if(iterFind3 != iterFind->second.end()) {
std::map<int, std::map<int, UnitRangeCellsLookupItem > >::iterator iterFind3 = iterFind2->second.find(range); std::map<int, UnitRangeCellsLookupItem>::iterator iterFind4 = iterFind3->second.find(range);
if(iterFind3 != iterFind2->second.end()) { if(iterFind4 != iterFind3->second.end()) {
std::map<int, UnitRangeCellsLookupItem>::iterator iterFind4 = iterFind3->second.find(size); result = true;
if(iterFind4 != iterFind3->second.end()) {
result = true;
std::vector<Cell *> &cellList = iterFind4->second.rangeCellList; std::vector<Cell *> &cellList = iterFind4->second.rangeCellList;
for(int idx = 0; idx < cellList.size(); ++idx) { for(int idx = 0; idx < cellList.size(); ++idx) {
Cell *cell = cellList[idx]; Cell *cell = cellList[idx];
findEnemiesForCell(ast,cell,unit,commandTarget,enemies); findEnemiesForCell(ast,cell,unit,commandTarget,enemies);
}
} }
} }
} }
@ -1205,7 +1202,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
Vec2f floatCenter = unit->getFloatCenteredPos(); Vec2f floatCenter = unit->getFloatCenteredPos();
bool foundInCache = true; bool foundInCache = true;
if(findCachedCellsEnemies(center,floatCenter,range,size,enemies,ast, if(findCachedCellsEnemies(center,range,size,enemies,ast,
unit,commandTarget) == false) { unit,commandTarget) == false) {
foundInCache = false; foundInCache = false;
@ -1231,7 +1228,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
// Ok update our caches with the latest info // Ok update our caches with the latest info
if(cacheItem.rangeCellList.size() > 0) { if(cacheItem.rangeCellList.size() > 0) {
cacheItem.UnitRangeCellsLookupItemCacheTimerCountIndex = UnitRangeCellsLookupItemCacheTimerCount++; cacheItem.UnitRangeCellsLookupItemCacheTimerCountIndex = UnitRangeCellsLookupItemCacheTimerCount++;
UnitRangeCellsLookupItemCache[center][floatCenter][range][size] = cacheItem; UnitRangeCellsLookupItemCache[center][size][range] = cacheItem;
} }
} }

4
source/glest_game/world/unit_updater.h
View File

@ -69,11 +69,11 @@ private:
Game *game; Game *game;
RandomGen random; RandomGen random;
std::map<Vec2i, std::map<Vec2f, std::map<int, std::map<int, UnitRangeCellsLookupItem > > > > UnitRangeCellsLookupItemCache; std::map<Vec2i, std::map<int, std::map<int, UnitRangeCellsLookupItem > > > UnitRangeCellsLookupItemCache;
//std::map<int,ExploredCellsLookupKey> ExploredCellsLookupItemCacheTimer; //std::map<int,ExploredCellsLookupKey> ExploredCellsLookupItemCacheTimer;
int UnitRangeCellsLookupItemCacheTimerCount; int UnitRangeCellsLookupItemCacheTimerCount;
bool findCachedCellsEnemies(Vec2i center, Vec2f floatCenter, int range, bool findCachedCellsEnemies(Vec2i center, int range,
int size, vector<Unit*> &enemies, int size, vector<Unit*> &enemies,
const AttackSkillType *ast, const Unit *unit, const AttackSkillType *ast, const Unit *unit,
const Unit *commandTarget); const Unit *commandTarget);