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

check the actual reach_map change instead of calling invalidate_all

Browse source 
this speeds up switching between two controlled units a lot
This commit is contained in:
Martin Renold 2007-02-15 14:33:55 +00:00
parent 7da1363882
commit 807508a0e7
2 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/display.cpp
View file

@ -815,6 +815,8 @@ void display::draw(bool update,bool force)
//log_scope("Drawing");
invalidate_animations();
process_reachmap_changes();
if(!panelsDrawn_) {
surface const screen(screen_.getSurface());
@ -1854,14 +1856,58 @@ void display::highlight_another_reach(const paths &paths_list)
// Fold endpoints of routes into reachability map.
for (r = paths_list.routes.begin(); r != paths_list.routes.end(); ++r) {
reach_map_[r->first]++;
invalidate(r->first);
}
reach_map_changed_ = true;
}
void display::unhighlight_reach()
{
reach_map_ = reach_map();
invalidate_all();
reach_map_changed_ = true;
}
void display::process_reachmap_changes()
{
if (!reach_map_changed_) return;
if (reach_map_.empty() != reach_map_old_.empty()) {
// invalidate everything except the non-darkened tiles
reach_map &full = reach_map_.empty() ? reach_map_old_ : reach_map_;
gamemap::location topleft;
gamemap::location bottomright;
get_visible_hex_bounds(topleft, bottomright);
for(int x = topleft.x; x <= bottomright.x; ++x) {
for(int y = topleft.y; y <= bottomright.y; ++y) {
gamemap::location loc(x, y);
reach_map::iterator reach = full.find(loc);
if (reach == full.end()) {
// location needs to be darkened or brightened
invalidate(loc);
} else if (reach->second != 1) {
// number needs to be displayed or cleared
invalidate(loc);
}
}
}
} else if (!reach_map_.empty()) {
// invalidate only changes
reach_map::iterator reach, reach_old;
for (reach = reach_map_.begin(); reach != reach_map_.end(); ++reach) {
reach_old = reach_map_old_.find(reach->first);
if (reach_old == reach_map_old_.end()) {
invalidate(reach->first);
} else {
if (reach_old->second != reach->second) {
invalidate(reach->first);
}
reach_map_old_.erase(reach_old);
}
}
for (reach_old = reach_map_old_.begin(); reach_old != reach_map_old_.end(); ++reach_old) {
invalidate(reach_old->first);
}
}
reach_map_old_ = reach_map_;
reach_map_changed_ = false;
}
void display::invalidate_route()

5
src/display.hpp
View file

@ -152,7 +152,7 @@ public:
//given x,y co-ordinates of a pixel on the map, will return the
//location of the hex that this pixel corresponds to. Returns an
//invalid location is the mouse isn't over any valid location.
//invalid location if the mouse isn't over any valid location.
gamemap::location pixel_position_to_hex(int x, int y, gamemap::location::DIRECTION* nearest_hex=NULL, gamemap::location::DIRECTION* second_nearest_hex=NULL);
//given x,y co-ordinates of the mouse, will return the location of the
@ -505,6 +505,9 @@ private:
//tiles lit for showing where unit(s) can reach
typedef std::map<gamemap::location,unsigned int> reach_map;
reach_map reach_map_;
reach_map reach_map_old_;
bool reach_map_changed_;
void process_reachmap_changes();
//for debug mode
static std::map<gamemap::location,fixed_t> debugHighlights_;