BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Don't use unordered maps for ProfilerGraph (fixes flickering)

Browse Source
This commit is contained in:
sfan5 2016-10-12 18:39:35 +02:00
parent 4f684b589d
commit 0b27a70b29
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.cpp
View File

@ -605,7 +605,9 @@ public:
void draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver, void draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
gui::IGUIFont *font) const gui::IGUIFont *font) const
{ {
UNORDERED_MAP<std::string, Meta> m_meta; // Do *not* use UNORDERED_MAP here as the order needs
// to be the same for each call to prevent flickering
std::map<std::string, Meta> m_meta;
for (std::deque<Piece>::const_iterator k = m_log.begin(); for (std::deque<Piece>::const_iterator k = m_log.begin();
k != m_log.end(); ++k) { k != m_log.end(); ++k) {
@ -615,7 +617,7 @@ public:
i != piece.values.end(); ++i) { i != piece.values.end(); ++i) {
const std::string &id = i->first; const std::string &id = i->first;
const float &value = i->second; const float &value = i->second;
UNORDERED_MAP<std::string, Meta>::iterator j = m_meta.find(id); std::map<std::string, Meta>::iterator j = m_meta.find(id);
if (j == m_meta.end()) { if (j == m_meta.end()) {
m_meta[id] = Meta(value); m_meta[id] = Meta(value);
@ -642,7 +644,7 @@ public:
sizeof(usable_colors) / sizeof(*usable_colors); sizeof(usable_colors) / sizeof(*usable_colors);
u32 next_color_i = 0; u32 next_color_i = 0;
for (UNORDERED_MAP<std::string, Meta>::iterator i = m_meta.begin(); for (std::map<std::string, Meta>::iterator i = m_meta.begin();
i != m_meta.end(); ++i) { i != m_meta.end(); ++i) {
Meta &meta = i->second; Meta &meta = i->second;
video::SColor color(255, 200, 200, 200); video::SColor color(255, 200, 200, 200);
@ -658,7 +660,7 @@ public:
s32 textx2 = textx + 200 - 15; s32 textx2 = textx + 200 - 15;
s32 meta_i = 0; s32 meta_i = 0;
for (UNORDERED_MAP<std::string, Meta>::const_iterator i = m_meta.begin(); for (std::map<std::string, Meta>::const_iterator i = m_meta.begin();
i != m_meta.end(); ++i) { i != m_meta.end(); ++i) {
const std::string &id = i->first; const std::string &id = i->first;
const Meta &meta = i->second; const Meta &meta = i->second;