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

Fix f6 debug/profiler display

Browse Source 
After fonts were re-engineered the height of the f6 debug/profiler display would only display about 2-3 lines of text.
This commit is contained in:
Craig Robbins 2014-12-07 21:01:42 +10:00
parent bc2b8e9eef
commit 5c55738276
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game.cpp
View File

@ -439,7 +439,7 @@ PointedThing getPointedThing(Client *client, v3f player_position,
/* Profiler display */ /* Profiler display */
void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe, void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
u32 show_profiler, u32 show_profiler_max) u32 show_profiler, u32 show_profiler_max, s32 screen_height)
{ {
if (show_profiler == 0) { if (show_profiler == 0) {
guitext_profiler->setVisible(false); guitext_profiler->setVisible(false);
@ -456,9 +456,20 @@ void update_profiler_gui(gui::IGUIStaticText *guitext_profiler, FontEngine *fe,
if (w < 400) if (w < 400)
w = 400; w = 400;
core::rect<s32> rect(6, 4 + (fe->getTextHeight() + 5) * 2, 12 + w, unsigned text_height = fe->getTextHeight();
8 + (fe->getTextHeight() + 5) * 2 +
fe->getTextHeight()); core::position2di upper_left, lower_right;
upper_left.X = 6;
upper_left.Y = (text_height + 5) * 2;
lower_right.X = 12 + w;
lower_right.Y = upper_left.Y + (text_height + 1) * MAX_PROFILER_TEXT_ROWS;
if (lower_right.Y > screen_height * 2 / 3)
lower_right.Y = screen_height * 2 / 3;
core::rect<s32> rect(upper_left, lower_right);
guitext_profiler->setRelativePosition(rect); guitext_profiler->setRelativePosition(rect);
guitext_profiler->setVisible(true); guitext_profiler->setVisible(true);
} }
@ -2366,7 +2377,8 @@ void Game::updateProfilers(const GameRunData &run_data, const RunStats &stats,
} }
update_profiler_gui(guitext_profiler, g_fontengine, update_profiler_gui(guitext_profiler, g_fontengine,
run_data.profiler_current_page, run_data.profiler_max_page); run_data.profiler_current_page, run_data.profiler_max_page,
driver->getScreenSize().Height);
g_profiler->clear(); g_profiler->clear();
} }
@ -2778,7 +2790,7 @@ void Game::toggleProfiler(float *statustext_time, u32 *profiler_current_page,
// FIXME: This updates the profiler with incomplete values // FIXME: This updates the profiler with incomplete values
update_profiler_gui(guitext_profiler, g_fontengine, *profiler_current_page, update_profiler_gui(guitext_profiler, g_fontengine, *profiler_current_page,
profiler_max_page); profiler_max_page, driver->getScreenSize().Height);
if (*profiler_current_page != 0) { if (*profiler_current_page != 0) {
std::wstringstream sstr; std::wstringstream sstr;

2
src/profiler.h
View File

@ -30,6 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/numeric.h" // paging() #include "util/numeric.h" // paging()
#include "debug.h" // assert() #include "debug.h" // assert()
#define MAX_PROFILER_TEXT_ROWS 20
/* /*
Time profiler Time profiler
*/ */