upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 16:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove new_haloes

Browse Source 
New haloes were sometimes added to both new_haloes and invalidated_haloes,
and were therefore rendered twice in the same frame. As a result, the halo
added itself to its unrender buffer, and therefore remained on screen even
after unrendering.

Eliminating the entire new_haloes set fixes the issue. Fixes #2187.
This commit is contained in:
Jyrki Vesterinen 2017-11-12 19:21:01 +02:00
parent f065b91708
commit 80d42597b8
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/halo.cpp
View File

@ -87,14 +87,6 @@ int halo_id;
*/
std::set<int> invalidated_haloes;
/**
* A newly added halo will be added to this list, these haloes don't need to be
* unrendered but do not to be rendered regardless which tiles are invalidated.
* These haloes will stay in this set until there're really rendered (rendering
* won't happen if for example the halo is offscreen).
*/
std::set<int> new_haloes;
/**
* Upon deleting, a halo isn't deleted but added to this set, upon unrendering
* the image is unrendered and deleted.
@ -117,7 +109,6 @@ explicit halo_impl(display & screen) :
haloes(),
halo_id(1),
invalidated_haloes(),
new_haloes(),
deleted_haloes(),
changing_haloes()
{}
@ -335,7 +326,6 @@ int halo_impl::add(int x, int y, const std::string& image, const map_location& l
}
haloes.emplace(id, effect(disp, x, y, image_vector, loc, orientation, infinite));
new_haloes.insert(id);
if(haloes.find(id)->second.does_change() || !infinite) {
changing_haloes.insert(id);
}
@ -428,9 +418,6 @@ void halo_impl::unrender(std::set<map_location> invalidated_locations)
// Really delete the haloes marked for deletion
for(set_itor = deleted_haloes.begin(); set_itor != deleted_haloes.end(); ++set_itor) {
// It can happen a deleted halo hasn't been rendered yet, invalidate them as well
new_haloes.erase(*set_itor);
changing_haloes.erase(*set_itor);
invalidated_haloes.erase(*set_itor);
haloes.erase(*set_itor);
@ -442,30 +429,16 @@ void halo_impl::unrender(std::set<map_location> invalidated_locations)
void halo_impl::render()
{
if(preferences::show_haloes() == false || haloes.empty() ||
(new_haloes.empty() && invalidated_haloes.empty())) {
invalidated_haloes.empty()) {
return;
}
// Keep track of not rendered new images they have to be kept scheduled
// for rendering otherwise the invalidation area is never properly set
std::set<int> unrendered_new_haloes;
// Render the haloes:
// iterate through all the haloes and draw if in either set
for(std::map<int, effect>::iterator itor = haloes.begin();
itor != haloes.end(); ++itor) {
if(new_haloes.find(itor->first) != new_haloes.end() &&
! itor->second.render()) {
unrendered_new_haloes.insert(itor->first);
} else if(invalidated_haloes.find(itor->first) != invalidated_haloes.end()) {
itor->second.render();
}
// Render the haloes: draw all invalidated haloes
for(int halo_id : invalidated_haloes) {
haloes.at(halo_id).render();
}
invalidated_haloes.clear();
new_haloes = unrendered_new_haloes;
}
// end halo_impl implementations