0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache unit visibility in the pathfinder.

Browse source 
The performance problem is not completely solved: unit::invisible
(which spends CPU in unit::matches_filter) is also called when drawing.

If it is cached there instead, this commit can be reverted.
This commit is contained in:
Martin Renold 2007-02-18 22:14:00 +00:00
parent e234b52f6d
commit 558418b655
3 changed files with 84 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -172,6 +172,7 @@ Version 1.3-svn:
to the bottom
* scrolling performance improved
* overall game performance improved when many units are visible
* better performance when mouse is over a unit that sees many enemy units
* show full username at bottom of screen when moused over in MP Lobby
* friends list
* added a friend list in MP lobby, they will display a special icon in lobby,

98
src/pathfind.cpp
View file

@ -326,6 +326,28 @@ void get_tiles_radius(gamemap const &map, std::vector<gamemap::location> const &
}
}
ability_cache_item get_cached(ability_cache_map &cache, gamemap::location loc,
team const &team, unit_map const &units,
std::vector<team> const &teams, gamemap const &map)
{
ability_cache_map::iterator i;
i = cache.find(loc);
if (i == cache.end()) {
ability_cache_item item;
unit_map::const_iterator unit = find_visible_unit(units, loc, map, teams, team);
if (unit != units.end()) {
item.visible_unit = &unit->second;
} else {
item.visible_unit = NULL;
}
ability_cache_map::value_type tuple(loc, item);
i = cache.insert(tuple).first;
}
return i->second;
}
bool enemy_zoc(gamemap const &map,
unit_map const &units,
std::vector<team> const &teams,
@ -346,18 +368,42 @@ bool enemy_zoc(gamemap const &map,
return false;
}
bool enemy_zoc_cached(gamemap const &map,
unit_map const &units,
std::vector<team> const &teams,
gamemap::location const &loc, team const &viewing_team, unsigned int side,
ability_cache_map &cache)
{
gamemap::location locs[6];
const team &current_team = teams[side-1];
get_adjacent_tiles(loc,locs);
for(int i = 0; i != 6; ++i) {
ability_cache_item item;
item = ::get_cached(cache, locs[i], viewing_team, units, teams, map);
if (item.visible_unit && item.visible_unit->side() != side &&
current_team.is_enemy(item.visible_unit->side()) && item.visible_unit->emits_zoc()) {
return true;
}
}
return false;
}
namespace {
void find_routes(const gamemap& map, const gamestatus& status,
const game_data& gamedata,
const unit_map& units,
const unit& u,
const gamemap::location& loc,
int move_left,
std::map<gamemap::location,paths::route>& routes,
std::vector<team> const &teams,
bool ignore_zocs, bool allow_teleport, int turns_left,
bool starting_pos, const team &viewing_team)
const game_data& gamedata,
const unit_map& units,
const unit& u,
const gamemap::location& loc,
int move_left,
std::map<gamemap::location,paths::route>& routes,
std::vector<team> const &teams,
bool ignore_zocs, bool allow_teleport, int turns_left,
bool starting_pos, const team &viewing_team,
ability_cache_map &cache)
{
if(size_t(u.side()-1) >= teams.size()) {
return;
@ -398,11 +444,9 @@ namespace {
continue;
//see if the tile is on top of an enemy unit
const unit_map::const_iterator unit_it =
find_visible_unit(units, locs[i], map, teams, viewing_team);
ability_cache_item item = get_cached(cache, locs[i], viewing_team, units, teams, map);
if (unit_it != units.end() &&
current_team.is_enemy(unit_it->second.side()))
if (item.visible_unit && current_team.is_enemy(item.visible_unit->side()))
continue;
//find the terrain of the adjacent location
@ -428,8 +472,8 @@ namespace {
if(rtit != routes.end() && rtit->second.move_left >= total_movement)
continue;
const bool zoc = !ignore_zocs && enemy_zoc(map,units,teams,currentloc,
viewing_team,u.side());
const bool zoc = !ignore_zocs && enemy_zoc_cached(map,units,teams,currentloc,
viewing_team,u.side(), cache);
paths::route new_route = routes[loc];
new_route.steps.push_back(loc);
@ -440,7 +484,7 @@ namespace {
if (new_route.move_left > 0) {
find_routes(map, status, gamedata, units, u, currentloc,
zoc_move_left, routes, teams, ignore_zocs,
allow_teleport, new_turns_left, false, viewing_team);
allow_teleport, new_turns_left, false, viewing_team, cache);
}
}
}
@ -463,9 +507,10 @@ paths::paths(gamemap const &map, gamestatus const &status,
}
routes[loc].move_left = i->second.movement_left();
ability_cache_map cache;
find_routes(map,status,gamedata,units,i->second,loc,
i->second.movement_left(),routes,teams,
ignore_zocs,allow_teleport,additional_turns,true,viewing_team);
ignore_zocs,allow_teleport,additional_turns,true,viewing_team,cache);
}
int route_turns_to_complete(unit const &u, gamemap const &map, paths::route &rt)
@ -509,6 +554,13 @@ shortest_path_calculator::shortest_path_calculator(unit const &u, team const &t,
{
}
ability_cache_item shortest_path_calculator::get_cached(gamemap::location loc) const
{
return ::get_cached(cache_, loc, team_, units_, teams_, map_);
}
double shortest_path_calculator::cost(const gamemap::location& src,const gamemap::location& loc, const double so_far, const bool isDst) const
{
wassert(map_.on_board(loc));
@ -528,11 +580,9 @@ double shortest_path_calculator::cost(const gamemap::location& src,const gamemap
if (total_movement_ < base_cost)
return getNoPathValue();
unit_map::const_iterator
enemy_unit = find_visible_unit(units_, loc, map_, teams_, team_),
units_end = units_.end();
ability_cache_item item = get_cached(loc);
if (enemy_unit != units_end && team_.is_enemy(enemy_unit->second.side()))
if (item.visible_unit && team_.is_enemy(item.visible_unit->side()))
return getNoPathValue();
if (!isDst && !unit_.get_ability_bool("skirmisher",src)) {
@ -540,10 +590,10 @@ double shortest_path_calculator::cost(const gamemap::location& src,const gamemap
get_adjacent_tiles(loc, adj);
for (size_t i = 0; i != 6; ++i) {
enemy_unit = find_visible_unit(units_, adj[i], map_, teams_, team_);
item = get_cached(adj[i]);
if (enemy_unit != units_end && team_.is_enemy(enemy_unit->second.side()) &&
enemy_unit->second.emits_zoc())
if (item.visible_unit && team_.is_enemy(item.visible_unit->side()) &&
item.visible_unit->emits_zoc())
return getNoPathValue();
}
}

9
src/pathfind.hpp
View file

@ -111,12 +111,20 @@ paths::route a_star_search(gamemap::location const &src, gamemap::location const
int route_turns_to_complete(const unit& u, const gamemap& map,
paths::route& rt);
// cache used internally by the cost calculator because checking for
// an ability (visible) is expensive and needed often
struct ability_cache_item {
unit const *visible_unit; // NULL if no visible unit
};
typedef std::map<gamemap::location, ability_cache_item> ability_cache_map;
struct shortest_path_calculator : cost_calculator
{
shortest_path_calculator(const unit& u, const team& t,
const unit_map& units, const std::vector<team>& teams,
const gamemap& map);
virtual double cost(const gamemap::location& src, const gamemap::location& loc, const double so_far, const bool isDst) const;
ability_cache_item get_cached(gamemap::location loc) const;
private:
unit const &unit_;
@ -126,6 +134,7 @@ private:
gamemap const &map_;
int const movement_left_;
int const total_movement_;
mutable ability_cache_map cache_;
};
//function which only uses terrain, ignoring shroud, enemies, etc.