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

removed commented code

This commit is contained in:
Mark Vejvoda 2013-06-22 18:09:29 +00:00
parent 3a88edf869
commit 4684779186
4 changed files with 0 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/glest_game/ai/ai_interface.cpp
View File

@ -734,30 +734,12 @@ bool AiInterface::isResourceNear(const Vec2i &pos, const ResourceType *rt, Vec2i
if(result.x >= 0) {
resourcePos = result;
//char szBuf[4096]="";
// sprintf(szBuf,"[%s::%s Line: %d] [isresourcenear] pos [%s] resourcePos [%s] fallbackToPeersHarvestingSameResource [%d] rt [%s]",
// __FILE__,__FUNCTION__,__LINE__,pos.getString().c_str(),resourcePos.getString().c_str(),fallbackToPeersHarvestingSameResource,rt->getName().c_str());
//SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"----------------------------------- START [%d] ------------------------------------------------\n",faction->getFrameCount());
//SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"%s",szBuf);
//SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"------------------------------------ END [%d] -------------------------------------------------\n",faction->getFrameCount());
if(pos.dist(resourcePos) <= size) {
return true;
}
}
}
//if(faction != NULL) {
// char szBuf[4096]="";
// sprintf(szBuf,"[%s::%s Line: %d] [isresourcenear] pos [%s] resourcePos [%s] fallbackToPeersHarvestingSameResource [%d] rt [%s] getCacheResourceTargetListSize() [%d]",
// __FILE__,__FUNCTION__,__LINE__,pos.getString().c_str(),resourcePos.getString().c_str(),fallbackToPeersHarvestingSameResource,rt->getName().c_str(),faction->getCacheResourceTargetListSize());
// SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"----------------------------------- START [%d] ------------------------------------------------\n",faction->getFrameCount());
// SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"%s",szBuf);
// SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"------------------------------------ END [%d] -------------------------------------------------\n",faction->getFrameCount());
//}
return false;
}
@ -795,7 +777,6 @@ bool AiInterface::getNearestSightedResource(const ResourceType *rt, const Vec2i
if(canUseResourceType == true) {
bool isResourceClose = isResourceNear(pos, rt, resultPos, faction, true);
//bool isResourceClose = false;
// Found a resource
if(isResourceClose == true || resultPos.x >= 0) {
@ -803,8 +784,6 @@ bool AiInterface::getNearestSightedResource(const ResourceType *rt, const Vec2i
}
else {
const Map *map = world->getMap();
//Faction *faction = world->getFaction(factionIndex);
for(int i = 0; i < map->getW(); ++i) {
for(int j = 0; j < map->getH(); ++j) {
Vec2i resPos = Vec2i(i, j);
@ -825,8 +804,6 @@ bool AiInterface::getNearestSightedResource(const ResourceType *rt, const Vec2i
resultPos= resPos;
}
}
//faction->addResourceTargetToCache(resPos,false);
}
}
}

237
source/glest_game/ai/path_finder.cpp
View File

@ -159,12 +159,6 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
//printf("Unit Pathfind Unit [%d - %s] from = %s to = %s frameIndex = %d\n",unit->getId(),unit->getType()->getName().c_str(),unit->getPos().getString().c_str(),finalPos.getString().c_str(),frameIndex);
if(frameIndex >= 0) {
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[findPath] ");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
clearUnitPrecache(unit);
}
if(unit->getFaction()->canUnitsPathfind() == true) {
@ -177,23 +171,10 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
snprintf(szBuf,8096,"canUnitsPathfind() == false");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"canUnitsPathfind() == false");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return tsBlocked;
}
// if(frameIndex != factions[unit->getFactionIndex()].lastFromToNodeListFrame) {
// if(factions[unit->getFactionIndex()].mapFromToNodeList.size() > 0) {
// printf("clear duplicate list = " MG_SIZE_T_SPECIFIER " for faction = %d frameIndex = %d\n",factions[unit->getFactionIndex()].mapFromToNodeList.size(),unit->getFactionIndex(),frameIndex);
// factions[unit->getFactionIndex()].mapFromToNodeList.clear();
// }
// factions[unit->getFactionIndex()].lastFromToNodeListFrame = frameIndex;
// }
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex < 0) {
char szBuf[8096]="";
snprintf(szBuf,8096,"[findPath] unit->getPos() [%s] finalPos [%s]",
@ -225,12 +206,6 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
unit->setCurrentUnitTitle(szBuf);
}
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return tsArrived");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return tsArrived;
}
@ -253,12 +228,6 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
}
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return tsMoving");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return tsMoving;
}
}
@ -272,12 +241,6 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
unit->setTargetPos(pos);
}
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return tsMoving");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return tsMoving;
}
}
@ -295,11 +258,6 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
snprintf(szBuf,8096,"path->isStuck() == true unit->getLastStuckPos() [%s] finalPos [%s] path->getBlockCount() [%d] tolerance: %d",unit->getLastStuckPos().getString().c_str(),finalPos.getString().c_str(),path->getBlockCount(),unit->isLastStuckFrameWithinCurrentFrameTolerance());
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"path->isStuck() == true unit->getLastStuckPos() [%s] finalPos [%s] path->getBlockCount() [%d] tolerance: %d",unit->getLastStuckPos().getString().c_str(),finalPos.getString().c_str(),path->getBlockCount(),unit->isLastStuckFrameWithinCurrentFrameTolerance());
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
//printf("$$$$ Unit STILL BLOCKED for [%d - %s]\n",unit->getId(),unit->getFullName().c_str());
return tsBlocked;
@ -322,19 +280,12 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
snprintf(szBuf,8096,"maxNodeCount: %d",maxNodeCount);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"maxNodeCount: %d",maxNodeCount);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
}
//int unitFactionIndex = unit->getFactionIndex();
bool minorDebugPathfinderPerformance = false;
Chrono chrono;
//if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled) chrono.start();
if(minorDebugPathfinderPerformance) chrono.start();
uint32 searched_node_count = 0;
@ -346,20 +297,9 @@ TravelState PathFinder::findPath(Unit *unit, const Vec2i &finalPos, bool *wasStu
snprintf(szBuf,8096,"calling aStar()");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"calling aStar()");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
ts = aStar(unit, finalPos, false, frameIndex, maxNodeCount,&searched_node_count);
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"called aStar() ts: %d",ts);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
//post actions
switch(ts) {
case tsBlocked:
@ -926,19 +866,14 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
}
const bool showConsoleDebugInfo = Config::getInstance().getBool("EnablePathfinderDistanceOutput","false");
//const bool tryLastPathCache = Config::getInstance().getBool("EnablePathfinderCache","false");
const bool tryLastPathCache = false;
if(maxNodeCount < 0) {
maxNodeCount = factions[unit->getFactionIndex()].useMaxNodeCount;
//printf("AStar set maxNodeCount = %d\n",maxNodeCount);
}
if(maxNodeCount >= 1 && unit->getPathfindFailedConsecutiveFrameCount() >= 3) {
//int orgmaxNodeCount = maxNodeCount;
maxNodeCount = 200;
//printf("AStar maxpath cut for unit [%d - %s] to %d [orig: %d] [unit->getPathfindFailedConsecutiveFrameCount(): %d]\n",unit->getId(),unit->getFullName().c_str(), maxNodeCount,orgmaxNodeCount,unit->getPathfindFailedConsecutiveFrameCount());
}
UnitPathInterface *path= unit->getPath();
@ -1011,11 +946,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
i < getPathFindExtendRefreshNodeCount(unitFactionIndex))) {
path->add(nodePos);
}
//else if(tryLastPathCache == false) {
// break;
//}
//if(tryLastPathCache == true && basicPathFinder) {
if(basicPathFinder) {
basicPathFinder->addToLastPathCache(nodePos);
}
@ -1027,21 +957,10 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"return factions[unitFactionIndex].precachedTravelState[unit->getId()];");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return factions[unitFactionIndex].precachedTravelState[unit->getId()];");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return factions[unitFactionIndex].precachedTravelState[unit->getId()];
}
else {
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"clearUnitPrecache(unit);");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
clearUnitPrecache(unit);
}
}
@ -1058,11 +977,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"return factions[unitFactionIndex].precachedTravelState[unit->getId()];");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return factions[unitFactionIndex].precachedTravelState[unit->getId()];");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return factions[unitFactionIndex].precachedTravelState[unit->getId()];
}
@ -1070,12 +984,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
}
}
else {
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"clearUnitPrecache(unit);");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
clearUnitPrecache(unit);
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex < 0) {
@ -1181,15 +1089,9 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"return ts: %d",ts);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return ts: %d",ts);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return ts;
}
//else if(j - i > pathFindRefresh) {
else if(j - i > unit->getPathFindRefreshCellCount()) {
//on the way
ts= tsMoving;
@ -1214,7 +1116,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
factions[unitFactionIndex].precachedPath[unit->getId()].push_back(cachedPath[k]);
}
else {
//if(pathCount < pathFindRefresh) {
if(pathCount < unit->getPathFindRefreshCellCount()) {
basicPathFinder->add(cachedPath[k]);
}
@ -1253,11 +1154,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"return ts: %d",ts);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return ts: %d",ts);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return ts;
}
@ -1377,16 +1273,12 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
//
// START
//Vec2i cameFrom= unit->getPos();
//Vec2i cameFrom(-1,-1);
std::map<std::pair<Vec2i,Vec2i> ,bool> canAddNode;
std::map<Vec2i,bool> closedNodes;
std::map<Vec2i,Vec2i> cameFrom;
cameFrom[unitPos] = Vec2i(-1,-1);
//cameFrom[unitPos] = unit->getPos();
// Do the a-star base pathfind work if required
int whileLoopCount = 0;
if(nodeLimitReached == false) {
//printf("\n\n\n====== START AStar-JPS Pathfinder start [%s] end [%s]\n",unitPos.getString().c_str(),finalPos.getString().c_str());
@ -1439,11 +1331,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"calling aStar()");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"calling aStar()");
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return aStar(unit, targetPos, false, frameIndex, pathFindNodesAbsoluteMax);
}
@ -1455,12 +1342,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"nodeLimitReached: %d",nodeLimitReached);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"nodeLimitReached: %d",nodeLimitReached);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
}
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled == true && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld nodeLimitReached = %d whileLoopCount = %d nodePoolCount = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis(),nodeLimitReached,whileLoopCount,factions[unitFactionIndex].nodePoolCount);
@ -1571,17 +1452,11 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
factions[unitFactionIndex].precachedPath[unit->getId()].push_back(nodePos);
}
else {
//if(i < pathFindRefresh ||
if(i < unit->getPathFindRefreshCellCount() ||
(whileLoopCount >= pathFindExtendRefreshForNodeCount &&
i < getPathFindExtendRefreshNodeCount(unitFactionIndex))) {
path->add(nodePos);
}
//else if(tryLastPathCache == false) {
// break;
//}
//if(tryLastPathCache == true && basicPathFinder) {
if(basicPathFinder) {
basicPathFinder->addToLastPathCache(nodePos);
}
@ -1643,11 +1518,6 @@ TravelState PathFinder::aStar(Unit *unit, const Vec2i &targetPos, bool inBailout
snprintf(szBuf,8096,"return ts: %d",ts);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"return ts: %d",ts);
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
return ts;
}
@ -1756,141 +1626,45 @@ void PathFinder::saveGame(XmlNode *rootNode) {
std::map<string,string> mapTagReplacements;
XmlNode *pathfinderNode = rootNode->addChild("PathFinder");
// static int pathFindNodesMax;
pathfinderNode->addAttribute("pathFindNodesMax",intToStr(pathFindNodesMax), mapTagReplacements);
// static int pathFindNodesAbsoluteMax;
pathfinderNode->addAttribute("pathFindNodesAbsoluteMax",intToStr(pathFindNodesAbsoluteMax), mapTagReplacements);
// FactionStateList factions;
for(unsigned int i = 0; i < factions.size(); ++i) {
FactionState &factionState = factions[i];
XmlNode *factionsNode = pathfinderNode->addChild("factions");
// std::map<Vec2i, bool> openPosList;
// XmlNode *openPosListNode = factionsNode->addChild("openPosList");
// for(std::map<Vec2i, bool>::iterator iterMap = factionState.openPosList.begin();
// iterMap != factionState.openPosList.end(); ++iterMap) {
// openPosListNode->addAttribute("key",iterMap->first.getString(), mapTagReplacements);
// openPosListNode->addAttribute("value",intToStr(iterMap->second), mapTagReplacements);
// }
//// std::map<float, Nodes> openNodesList;
// XmlNode *openNodesListNode = factionsNode->addChild("openNodesList");
// for(std::map<float, Nodes>::iterator iterMap = factionState.openNodesList.begin();
// iterMap != factionState.openNodesList.end(); ++iterMap) {
//
// Nodes &nodeList = iterMap->second;
// for(unsigned int j = 0; j < nodeList.size(); ++j) {
// Node *curNode = nodeList[j];
// XmlNode *openNodesListNodeNode = factionsNode->addChild("openNodesListNode");
// openNodesListNodeNode->addAttribute("key",floatToStr(iterMap->first), mapTagReplacements);
//
//// Vec2i pos;
// openNodesListNodeNode->addAttribute("pos",curNode->pos.getString(), mapTagReplacements);
//// Node *next;
// int nextIdx = findNodeIndex(curNode->next, nodeList);
// openNodesListNodeNode->addAttribute("next",intToStr(nextIdx), mapTagReplacements);
//// Node *prev;
// int prevIdx = findNodeIndex(curNode->prev, nodeList);
// openNodesListNodeNode->addAttribute("prev",intToStr(nextIdx), mapTagReplacements);
//// float heuristic;
// openNodesListNodeNode->addAttribute("heuristic",floatToStr(curNode->heuristic), mapTagReplacements);
//// bool exploredCell;
// openNodesListNodeNode->addAttribute("exploredCell",intToStr(curNode->exploredCell), mapTagReplacements);
// }
// }
//
//// std::map<float, Nodes> closedNodesList;
// XmlNode *closedNodesListNode = factionsNode->addChild("closedNodesList");
// for(std::map<float, Nodes>::iterator iterMap = factionState.closedNodesList.begin();
// iterMap != factionState.closedNodesList.end(); ++iterMap) {
//
// Nodes &nodeList = iterMap->second;
// for(unsigned int j = 0; j < nodeList.size(); ++j) {
// Node *curNode = nodeList[j];
// XmlNode *closedNodesListNodeNode = factionsNode->addChild("closedNodesListNode");
// closedNodesListNodeNode->addAttribute("key",floatToStr(iterMap->first), mapTagReplacements);
//
//// Vec2i pos;
// closedNodesListNodeNode->addAttribute("pos",curNode->pos.getString(), mapTagReplacements);
//// Node *next;
// int nextIdx = findNodeIndex(curNode->next, nodeList);
// closedNodesListNodeNode->addAttribute("next",intToStr(nextIdx), mapTagReplacements);
//// Node *prev;
// int prevIdx = findNodeIndex(curNode->prev, nodeList);
// closedNodesListNodeNode->addAttribute("prev",intToStr(nextIdx), mapTagReplacements);
//// float heuristic;
// closedNodesListNodeNode->addAttribute("heuristic",floatToStr(curNode->heuristic), mapTagReplacements);
//// bool exploredCell;
// closedNodesListNodeNode->addAttribute("exploredCell",intToStr(curNode->exploredCell), mapTagReplacements);
// }
// }
// std::vector<Node> nodePool;
for(unsigned int j = 0; j < factionState.nodePool.size(); ++j) {
Node *curNode = &factionState.nodePool[j];
XmlNode *nodePoolNode = factionsNode->addChild("nodePool");
//closedNodesListNodeNode->addAttribute("key",iterMap->first.getString(), mapTagReplacements);
// Vec2i pos;
nodePoolNode->addAttribute("pos",curNode->pos.getString(), mapTagReplacements);
// Node *next;
int nextIdx = findNodeIndex(curNode->next, factionState.nodePool);
nodePoolNode->addAttribute("next",intToStr(nextIdx), mapTagReplacements);
// Node *prev;
int prevIdx = findNodeIndex(curNode->prev, factionState.nodePool);
nodePoolNode->addAttribute("prev",intToStr(prevIdx), mapTagReplacements);
// float heuristic;
nodePoolNode->addAttribute("heuristic",floatToStr(curNode->heuristic,16), mapTagReplacements);
// bool exploredCell;
nodePoolNode->addAttribute("exploredCell",intToStr(curNode->exploredCell), mapTagReplacements);
}
// int nodePoolCount;
factionsNode->addAttribute("nodePoolCount",intToStr(factionState.nodePoolCount), mapTagReplacements);
// RandomGen random;
factionsNode->addAttribute("random",intToStr(factionState.random.getLastNumber()), mapTagReplacements);
// int useMaxNodeCount;
factionsNode->addAttribute("useMaxNodeCount",intToStr(factionState.useMaxNodeCount), mapTagReplacements);
//
// std::map<int,TravelState> precachedTravelState;
// std::map<int,std::vector<Vec2i> > precachedPath;
}
// const Map *map;
}
void PathFinder::loadGame(const XmlNode *rootNode) {
const XmlNode *pathfinderNode = rootNode->getChild("PathFinder");
//attackWarnRange = unitupdaterNode->getAttribute("attackWarnRange")->getFloatValue();
// static int pathFindNodesMax;
// pathFindNodesMax = pathfinderNode->getAttribute("pathFindNodesMax")->getIntValue();
// // static int pathFindNodesAbsoluteMax;
// pathFindNodesAbsoluteMax = pathfinderNode->getAttribute("pathFindNodesAbsoluteMax")->getIntValue();
//
// for(int i = 0; i < GameConstants::maxPlayers; ++i) {
// factions[i].nodePool.resize(pathFindNodesAbsoluteMax);
// factions[i].useMaxNodeCount = PathFinder::pathFindNodesMax;
// }
vector<XmlNode *> factionsNodeList = pathfinderNode->getChildList("factions");
for(unsigned int i = 0; i < factionsNodeList.size(); ++i) {
XmlNode *factionsNode = factionsNodeList[i];
FactionState &factionState = factions[i];
// std::vector<Node> nodePool;
vector<XmlNode *> nodePoolListNode = factionsNode->getChildList("nodePool");
for(unsigned int j = 0; j < nodePoolListNode.size() && j < pathFindNodesAbsoluteMax; ++j) {
XmlNode *nodePoolNode = nodePoolListNode[j];
Node *curNode = &factionState.nodePool[j];
//closedNodesListNodeNode->addAttribute("key",iterMap->first.getString(), mapTagReplacements);
// Vec2i pos;
curNode->pos = Vec2i::strToVec2(nodePoolNode->getAttribute("pos")->getValue());
// Node *next;
int nextNode = nodePoolNode->getAttribute("next")->getIntValue();
if(nextNode >= 0) {
curNode->next = &factionState.nodePool[nextNode];
@ -1899,7 +1673,6 @@ void PathFinder::loadGame(const XmlNode *rootNode) {
curNode->next = NULL;
}
// Node *prev;
int prevNode = nodePoolNode->getAttribute("prev")->getIntValue();
if(prevNode >= 0) {
curNode->prev = &factionState.nodePool[prevNode];
@ -1907,24 +1680,14 @@ void PathFinder::loadGame(const XmlNode *rootNode) {
else {
curNode->prev = NULL;
}
// float heuristic;
curNode->heuristic = nodePoolNode->getAttribute("heuristic")->getFloatValue();
// bool exploredCell;
curNode->exploredCell = nodePoolNode->getAttribute("exploredCell")->getIntValue() != 0;
}
// int nodePoolCount;
factionState.nodePoolCount = factionsNode->getAttribute("nodePoolCount")->getIntValue();
// RandomGen random;
factionState.random.setLastNumber(factionsNode->getAttribute("random")->getIntValue());
// int useMaxNodeCount;
//factionState.useMaxNodeCount = factionsNode->getAttribute("useMaxNodeCount")->getIntValue();
factionState.useMaxNodeCount = PathFinder::pathFindNodesMax;
//
// std::map<int,TravelState> precachedTravelState;
// std::map<int,std::vector<Vec2i> > precachedPath;
}
// const Map *map;
}
}} //end namespace

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

@ -1909,46 +1909,23 @@ void Faction::clearCaches() {
cachedCloseResourceTargetLookupList.clear();
mapSharedPathFinderCache.clear();
//Unit *firstUnit = NULL;
unsigned int unitCount = this->getUnitCount();
for(unsigned int i = 0; i < unitCount; ++i) {
Unit *unit = this->getUnit(i);
if(unit != NULL) {
//if(firstUnit == NULL) {
// firstUnit = unit;
//}
unit->clearCaches();
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[clearCaches unit check]");
// if(firstUnit != NULL) {
// firstUnit->logSynchData(__FILE__,__LINE__,szBuf);
// }
// }
}
}
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[clearCaches] cacheResourceTargetList.size() [" MG_SIZE_T_SPECIFIER "] cacheResourceTargetList.size() [" MG_SIZE_T_SPECIFIER "] mapSharedPathFinderCache" MG_SIZE_T_SPECIFIER "]",
// cacheResourceTargetList.size(),cacheResourceTargetList.size(),mapSharedPathFinderCache.size());
// if(firstUnit != NULL) {
// firstUnit->logSynchData(__FILE__,__LINE__,szBuf);
// }
// }
}
uint64 Faction::getCacheKBytes(uint64 *cache1Size, uint64 *cache2Size) {
uint64 cache1Count = 0;
uint64 cache2Count = 0;
//std::map<Vec2i,int> cacheResourceTargetList;
for(std::map<Vec2i,int>::iterator iterMap1 = cacheResourceTargetList.begin();
iterMap1 != cacheResourceTargetList.end(); ++iterMap1) {
cache1Count++;
}
//std::map<Vec2i,bool> cachedCloseResourceTargetLookupList;
for(std::map<Vec2i,bool>::iterator iterMap1 = cachedCloseResourceTargetLookupList.begin();
iterMap1 != cachedCloseResourceTargetLookupList.end(); ++iterMap1) {
cache2Count++;
@ -1975,12 +1952,10 @@ string Faction::getCacheStats() {
int cache1Count = 0;
int cache2Count = 0;
//std::map<Vec2i,int> cacheResourceTargetList;
for(std::map<Vec2i,int>::iterator iterMap1 = cacheResourceTargetList.begin();
iterMap1 != cacheResourceTargetList.end(); ++iterMap1) {
cache1Count++;
}
//std::map<Vec2i,bool> cachedCloseResourceTargetLookupList;
for(std::map<Vec2i,bool>::iterator iterMap1 = cachedCloseResourceTargetLookupList.begin();
iterMap1 != cachedCloseResourceTargetLookupList.end(); ++iterMap1) {
cache2Count++;

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

@ -356,11 +356,6 @@ void UnitUpdater::updateUnitCommand(Unit *unit, int frameIndex) {
void UnitUpdater::updateStop(Unit *unit, int frameIndex) {
// Nothing to do
if(frameIndex >= 0) {
// if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateStop]");
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
clearUnitPrecache(unit);
return;
}
@ -441,11 +436,6 @@ void UnitUpdater::updateMove(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateMove] pos [%s] unit [%d - %s] cmd [%s]",pos.getString().c_str(),unit->getId(),unit->getFullName(false).c_str(),command->toString().c_str());
unit->logSynchData(__FILE__,__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateMove] pos [%s] unit [%d - %s] cmd [%s]",pos.getString().c_str(),unit->getId(),unit->getFullName().c_str(),command->toString().c_str());
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
@ -484,11 +474,6 @@ void UnitUpdater::updateMove(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateMove] tsValue [%d]",tsValue);
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateMove] tsValue [%d]",tsValue);
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld --------------------------- [END OF METHOD] ---------------------------\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
}
@ -503,11 +488,6 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateAttack]");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateAttack]");
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
Chrono chrono;
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled) chrono.start();
@ -591,11 +571,6 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateAttack] pos [%s] unit->getPos() [%s]",pos.getString().c_str(),unit->getPos().getString().c_str());
unit->logSynchData(__FILE__,__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateAttack] pos [%s] unit->getPos() [%s]",pos.getString().c_str(),unit->getPos().getString().c_str());
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
@ -693,11 +668,6 @@ void UnitUpdater::updateAttack(Unit *unit, int frameIndex) {
}
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateAttack] tsValue [%d]",tsValue);
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
}
@ -840,11 +810,6 @@ void UnitUpdater::updateBuild(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateBuild]");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateBuild]");
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
Chrono chrono;
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled) chrono.start();
@ -854,9 +819,6 @@ void UnitUpdater::updateBuild(Unit *unit, int frameIndex) {
Command *command= unit->getCurrCommand();
const BuildCommandType *bct= static_cast<const BuildCommandType*>(command->getCommandType());
//std::pair<float,Vec2i> distance = map->getUnitDistanceToPos(unit,command->getPos(),command->getUnitType());
//unit->setCurrentUnitTitle("Distance: " + floatToStr(distance.first) + " build pos: " + distance.second.getString() + " current pos: " + unit->getPos().getString());
if(unit->getCurrSkill() != NULL && unit->getCurrSkill()->getClass() != scBuild) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugUnitCommands).enabled) SystemFlags::OutputDebug(SystemFlags::debugUnitCommands,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
@ -869,9 +831,7 @@ void UnitUpdater::updateBuild(Unit *unit, int frameIndex) {
switch(this->game->getGameSettings()->getPathFinderType()) {
case pfBasic:
{
//Vec2i buildPos = (command->getPos()-Vec2i(1));
Vec2i buildPos = map->findBestBuildApproach(unit, command->getPos(), ut);
//Vec2i buildPos = (command->getPos() + Vec2i(ut->getSize() / 2));
if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex < 0) {
char szBuf[8096]="";
@ -879,12 +839,6 @@ void UnitUpdater::updateBuild(Unit *unit, int frameIndex) {
unit->getPos().getString().c_str(),command->getPos().getString().c_str(),buildPos.getString().c_str());
unit->logSynchData(__FILE__,__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateBuild] unit->getPos() [%s] command->getPos() [%s] buildPos [%s]",
// unit->getPos().getString().c_str(),command->getPos().getString().c_str(),buildPos.getString().c_str());
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
tsValue = pathFinder->findPath(unit, buildPos, NULL, frameIndex);
@ -893,11 +847,6 @@ void UnitUpdater::updateBuild(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateBuild] tsValue: %d",tsValue);
unit->logSynchData(__FILE__,__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateBuild] tsValue: %d",tsValue);
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
}
break;
@ -1169,11 +1118,6 @@ void UnitUpdater::updateHarvest(Unit *unit, int frameIndex) {
snprintf(szBuf,8096,"[updateHarvest]");
unit->logSynchData(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateHarvest]");
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
Chrono chrono;
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled) chrono.start();
@ -1186,7 +1130,6 @@ void UnitUpdater::updateHarvest(Unit *unit, int frameIndex) {
//UnitPathInterface *path= unit->getPath();
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,chrono.getMillis());
//printf("In UpdateHarvest [%d - %s] unit->getCurrSkill()->getClass() = %d\n",unit->getId(),unit->getType()->getName().c_str(),unit->getCurrSkill()->getClass());
Resource *harvestResource = NULL;
@ -1264,11 +1207,6 @@ void UnitUpdater::updateHarvest(Unit *unit, int frameIndex) {
unit->setLastHarvestResourceTarget(NULL);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateHarvest]");
// unit->logSynchDataThreaded(extractFileFromDirectoryPath(__FILE__).c_str(),__LINE__,szBuf);
// }
canHarvestDestPos = (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
@ -1321,12 +1259,6 @@ void UnitUpdater::updateHarvest(Unit *unit, int frameIndex) {
unit->getPos().getString().c_str(),command->getPos().getString().c_str());
unit->logSynchData(__FILE__,__LINE__,szBuf);
}
// else if(SystemFlags::getSystemSettingType(SystemFlags::debugWorldSynch).enabled == true && frameIndex >= 0) {
// char szBuf[8096]="";
// snprintf(szBuf,8096,"[updateHarvest] unit->getPos() [%s] command->getPos() [%s]",
// unit->getPos().getString().c_str(),command->getPos().getString().c_str());
// unit->logSynchDataThreaded(__FILE__,__LINE__,szBuf);
// }
//if not continue walking
bool wasStuck = false;