luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-18 04:55:20 +01:00
Code Activity

Profiler and profiler graph improvements

Browse Source
This commit is contained in:
sfan5
2025-12-03 19:32:23 +01:00
parent 607531ea6b
commit cf696239e4
13 changed files with 130 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gui/profilergraph.cpp
View File

@@ -7,6 +7,7 @@
#include "profilergraph.h"
#include "IVideoDriver.h"
#include "util/string.h"
#include "util/basic_macros.h"
void ProfilerGraph::put(const Profiler::GraphValues &values)
{
@@ -34,35 +35,33 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
continue;
}
if (value < j->second.min)
j->second.min = value;
if (value > j->second.max)
j->second.max = value;
j->second.min = std::min(j->second.min, value);
j->second.max = std::max(j->second.max, value);
}
}
if (m_meta.empty())
return;
// Assign colors
static const video::SColor usable_colors[] = {video::SColor(255, 255, 100, 100),
video::SColor(255, 90, 225, 90),
video::SColor(255, 100, 100, 255),
video::SColor(255, 255, 150, 50),
video::SColor(255, 220, 220, 100)};
static const u32 usable_colors_count =
sizeof(usable_colors) / sizeof(*usable_colors);
static const video::SColor usable_colors[] = {
0xffc5000b, 0xffff950e, 0xffaecf00, 0xffffd320,
0xffff420e, 0xffff8080, 0xff729fcf, 0xffff99cc,
};
u32 next_color_i = 0;
for (auto &i : m_meta) {
Meta &meta = i.second;
video::SColor color(255, 200, 200, 200);
if (next_color_i < usable_colors_count)
if (next_color_i < ARRLEN(usable_colors))
color = usable_colors[next_color_i++];
meta.color = color;
}
s32 graphh = 50;
const s32 texth = font->getDimension(L"Ay").Height;
const s32 graphh = 52;
s32 textx = x_left + m_log_max_size + 15;
s32 textx2 = textx + 200 - 15;
s32 meta_i = 0;
@@ -71,23 +70,22 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
const std::string &id = p.first;
const Meta &meta = p.second;
s32 x = x_left;
s32 y = y_bottom - meta_i * 50;
s32 y = y_bottom - meta_i * graphh;
float show_min = meta.min;
float show_max = meta.max;
if (show_min >= -0.0001 && show_max >= -0.0001) {
if (show_min <= show_max * 0.5)
if (show_min >= -0.0001f && show_max >= -0.0001f) {
if (show_min <= show_max * 0.5f || show_max <= graphh)
show_min = 0;
}
const s32 texth = 15;
char buf[20];
if (floorf(show_max) == show_max)
porting::mt_snprintf(buf, sizeof(buf), "%.5g", show_max);
else
porting::mt_snprintf(buf, sizeof(buf), "%.3g", show_max);
font->draw(utf8_to_wide(buf).c_str(),
core::rect<s32>(textx, y - graphh, textx2,
core::recti(textx, y - graphh, textx2,
y - graphh + texth),
meta.color);
@@ -96,23 +94,23 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
else
porting::mt_snprintf(buf, sizeof(buf), "%.3g", show_min);
font->draw(utf8_to_wide(buf).c_str(),
core::rect<s32>(textx, y - texth, textx2, y), meta.color);
core::recti(textx, y - texth, textx2, y), meta.color);
font->draw(utf8_to_wide(id).c_str(),
core::rect<s32>(textx, y - graphh / 2 - texth / 2, textx2,
core::recti(textx, y - graphh / 2 - texth / 2, textx2,
y - graphh / 2 + texth / 2),
meta.color);
s32 graph1y = y;
s32 graph1h = graphh;
bool relativegraph = (show_min != 0 && show_min != show_max);
float lastscaledvalue = 0.0;
float lastscaledvalue = 0;
bool lastscaledvalue_exists = false;
for (const Piece &piece : m_log) {
float value = 0;
bool value_exists = false;
Profiler::GraphValues::const_iterator k = piece.values.find(id);
auto k = piece.values.find(id);
if (k != piece.values.end()) {
value = k->second;
@@ -125,12 +123,12 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
continue;
}
float scaledvalue = 1.0;
float scaledvalue = 1.0f;
if (show_max != show_min)
scaledvalue = (value - show_min) / (show_max - show_min);
if (scaledvalue == 1.0 && value == 0) {
if (scaledvalue == 1.0f && value == 0) {
x++;
lastscaledvalue_exists = false;
continue;