@@ -428,7 +428,7 @@ bool CPathFinder::TestSquare(const MoveData& moveData, const CPathFinderDef& pfD float heatCostMod = 1.0f; if (heatMapping && moveData.heatMapping && heatmap[square.x][square.y].ownerId != ownerId) { - heatCostMod += moveData.heatMod * heatmap[square.x][square.y].value; + heatCostMod += moveData.heatMod * std::max(0, heatmap[square.x][square.y].value - heatMapOffset); } float squareCost = heatCostMod * moveCost[enterDirection] / squareSpeedMod; @@ -520,7 +520,7 @@ void CPathFinder::FinishSearch(const MoveData& moveData, Path& foundPath) { if (false && heatMapping && moveData.heatMapping) { for (int i = 0; i < foundPath.squares.size(); ++i) { const int2& tmp = foundPath.squares[i]; - heatmap[tmp.x][tmp.y].value = std::max(heatmap[tmp.x][tmp.y].value, moveData.heatProduced); + heatmap[tmp.x][tmp.y].value = std::max(heatmap[tmp.x][tmp.y].value, moveData.heatProduced + heatMapOffset); } } } @@ -688,20 +688,13 @@ void CPathFinder::InitHeatMap() for (int i = 0; i<gs->mapx; ++i) { heatmap[i].resize(gs->mapy); } + heatMapOffset = 0; } void CPathFinder::UpdateHeatMap() { - if (heatmap.empty()) - return; - - for (int x = 0; x<gs->mapx; x += 2) { - for (int y = 0; y<gs->mapy; y += 2) { - if (heatmap[x][y].value > 0) - --heatmap[x][y].value; - } - } + ++heatMapOffset; } rts/Sim/Path/PathFinder.cpp @@ -81,17 +81,12 @@ public: bool GetHeatMapState() { return heatMapping; } void UpdateHeatMap(); - struct HeatMapValue { - int value; - int ownerId; - }; - void UpdateHeatValue(int x, int y, int value, int ownerId) { assert(!heatmap.empty()); - if (heatmap[x][y].value < value) { - heatmap[x][y].value = value; + if (heatmap[x][y].value < value + heatMapOffset) { + heatmap[x][y].value = value + heatMapOffset; heatmap[x][y].ownerId = ownerId; } } @@ -121,6 +116,7 @@ private: unsigned int status; float cost; }; + class myVector{ public: typedef OpenSquare* value_type; @@ -177,10 +173,11 @@ private: inline void clear() {bufPos=-1;} }; - class myPQ : public std::priority_queue<OpenSquare*,myVector,lessCost>{ + class myPQ : public std::priority_queue<OpenSquare*,myVector,lessCost>{ public: void DeleteAll(); - }; + }; + void ResetSearch(); SearchResult InitSearch(const MoveData& moveData, const CPathFinderDef& pfDef, int ownerId); SearchResult DoSearch(const MoveData& moveData, const CPathFinderDef& pfDef, int ownerId); @@ -218,8 +215,14 @@ private: OpenSquare openSquareBuffer[MAX_SEARCHED_SQUARES]; // Heat mapping + struct HeatMapValue { + int value; + int ownerId; + }; + bool heatMapping; std::vector<std::vector<HeatMapValue> > heatmap; + int heatMapOffset; // heatmap values are relative to this public: void Draw(void); rts/Sim/Path/PathFinder.h @@ -44,7 +44,7 @@ CPathManager::~CPathManager() { void CPathManager::SetHeatMappingEnabled(bool enabled) { pf->SetHeatMapState(enabled); -}; +} bool CPathManager::GetHeatMappingEnabled() { rts/Sim/Path/PathManager.cpp bba10b61bcd91eedc4e08fc7bdda6c2680b8d3e6 Tobi Vollebregt tobivollebregt@gmail.com http://github.com/spring/spring/commit/35a923037035addc8d050219d1351afa619ab7f4 35a923037035addc8d050219d1351afa619ab7f4 2009-10-07T08:53:06-07:00 2009-10-07T08:53:06-07:00 got rid of expensive UpdateHeatMap implementation (by storing heat+heatMapOffset, and only incrementing heatMapOffset every frame) 160dcfc7321da125dd27d66aefa16208c4a72140 Tobi Vollebregt tobivollebregt@gmail.com