lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix profiler values not being updated (F6) and not being logged

master
Craig Robbins 2014-11-11 20:58:57 +10:00
parent 0adadba218
commit 45ebaa3524
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/game.cpp
View File

@ -1438,6 +1438,8 @@ protected:
bool checkConnection(); bool checkConnection();
bool handleCallbacks(); bool handleCallbacks();
void processQueues(); void processQueues();
void updateProfilers(const GameRunData &run_data, const RunStats &stats,
const FpsControl &draw_times, f32 dtime);
void addProfilerGraphs(const RunStats &stats, const FpsControl &draw_times, void addProfilerGraphs(const RunStats &stats, const FpsControl &draw_times,
f32 dtime); f32 dtime);
void updateStats(RunStats *stats, const FpsControl &draw_times, f32 dtime); void updateStats(RunStats *stats, const FpsControl &draw_times, f32 dtime);
@ -1574,6 +1576,8 @@ private:
std::wstring statustext; std::wstring statustext;
KeyCache keycache; KeyCache keycache;
IntervalLimiter profiler_interval;
}; };
Game::Game() : Game::Game() :
@ -1722,7 +1726,8 @@ void Game::run()
infotext = L""; infotext = L"";
hud->resizeHotbar(); hud->resizeHotbar();
addProfilerGraphs(stats, draw_times, dtime);
updateProfilers(runData, stats, draw_times, dtime);
processUserInput(&flags, &runData, dtime); processUserInput(&flags, &runData, dtime);
// Update camera before player movement to avoid camera lag of one frame // Update camera before player movement to avoid camera lag of one frame
updateCameraDirection(&cam_view, &flags); updateCameraDirection(&cam_view, &flags);
@ -2319,6 +2324,34 @@ void Game::processQueues()
} }
void Game::updateProfilers(const GameRunData &run_data, const RunStats &stats,
const FpsControl &draw_times, f32 dtime)
{
float profiler_print_interval =
g_settings->getFloat("profiler_print_interval");
bool print_to_log = true;
if (profiler_print_interval == 0) {
print_to_log = false;
profiler_print_interval = 5;
}
if (profiler_interval.step(dtime, profiler_print_interval)) {
if (print_to_log) {
infostream << "Profiler:" << std::endl;
g_profiler->print(infostream);
}
update_profiler_gui(guitext_profiler, font, text_height,
run_data.profiler_current_page, run_data.profiler_max_page);
g_profiler->clear();
}
addProfilerGraphs(stats, draw_times, dtime);
}
void Game::addProfilerGraphs(const RunStats &stats, void Game::addProfilerGraphs(const RunStats &stats,
const FpsControl &draw_times, f32 dtime) const FpsControl &draw_times, f32 dtime)
{ {