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

Reduce cache lookups in is_empty_hex

Browse source
This commit is contained in:
Charles Dang 2024-08-21 00:44:37 -04:00
parent e22c376d01
commit a6e931af11
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/picture.cpp
View file

@ -799,21 +799,22 @@ bool is_in_hex(const locator& i_locator)
bool is_empty_hex(const locator& i_locator)
{
if(!is_empty_hex_.in_cache(i_locator)) {
surface surf = get_surface(i_locator, HEXED).clone();
// emptiness of terrain image is checked during hex cut
// so, maybe in cache now, let's recheck
if(!is_empty_hex_.in_cache(i_locator)) {
// should never reach here
// but do it manually if it happens
// assert(false);
bool is_empty = false;
mask_surface(surf, get_hexmask(), &is_empty);
is_empty_hex_.add_to_cache(i_locator, is_empty);
}
if(const bool* cached_value = is_empty_hex_.locate_in_cache(i_locator)) {
return *cached_value;
}
return is_empty_hex_.access_in_cache(i_locator);
surface surf = get_surface(i_locator, HEXED).clone();
// Empty state should be cached during surface fetch. Let's check again
if(const bool* cached_value = is_empty_hex_.locate_in_cache(i_locator)) {
return *cached_value;
}
// Should never reach this point, but let's manually do it anyway.
bool is_empty = false;
mask_surface(surf, get_hexmask(), &is_empty);
is_empty_hex_.add_to_cache(i_locator, is_empty);
return is_empty;
}
bool exists(const image::locator& i_locator)