summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/guiFormSpecMenu.cpp13
-rw-r--r--src/gui/guiFormSpecMenu.h2
-rw-r--r--src/gui/profilergraph.cpp45
-rw-r--r--src/gui/profilergraph.h19
4 files changed, 40 insertions, 39 deletions
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 4acc4b94a..89cf19973 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -44,6 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "gettime.h"
#include "gettext.h"
#include "scripting_server.h"
+#include "mainmenumanager.h"
#include "porting.h"
#include "settings.h"
#include "client.h"
@@ -131,13 +132,13 @@ GUIFormSpecMenu::~GUIFormSpecMenu()
delete m_text_dst;
}
-void GUIFormSpecMenu::create(GUIFormSpecMenu **cur_formspec, Client *client,
+void GUIFormSpecMenu::create(GUIFormSpecMenu *&cur_formspec, Client *client,
JoystickController *joystick, IFormSource *fs_src, TextDest *txt_dest)
{
- if (*cur_formspec == 0) {
- *cur_formspec = new GUIFormSpecMenu(joystick, guiroot, -1, &g_menumgr,
+ if (cur_formspec == nullptr) {
+ cur_formspec = new GUIFormSpecMenu(joystick, guiroot, -1, &g_menumgr,
client, client->getTextureSource(), fs_src, txt_dest);
- (*cur_formspec)->doPause = false;
+ cur_formspec->doPause = false;
/*
Caution: do not call (*cur_formspec)->drop() here --
@@ -148,8 +149,8 @@ void GUIFormSpecMenu::create(GUIFormSpecMenu **cur_formspec, Client *client,
*/
} else {
- (*cur_formspec)->setFormSource(fs_src);
- (*cur_formspec)->setTextDest(txt_dest);
+ cur_formspec->setFormSource(fs_src);
+ cur_formspec->setTextDest(txt_dest);
}
}
diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
index 9cd98f806..8b16f24cf 100644
--- a/src/gui/guiFormSpecMenu.h
+++ b/src/gui/guiFormSpecMenu.h
@@ -291,7 +291,7 @@ public:
~GUIFormSpecMenu();
- static void create(GUIFormSpecMenu **cur_formspec, Client *client,
+ static void create(GUIFormSpecMenu *&cur_formspec, Client *client,
JoystickController *joystick, IFormSource *fs_src, TextDest *txt_dest);
void setFormSpec(const std::string &formspec_string,
diff --git a/src/gui/profilergraph.cpp b/src/gui/profilergraph.cpp
index 314796106..740dfa35c 100644
--- a/src/gui/profilergraph.cpp
+++ b/src/gui/profilergraph.cpp
@@ -30,7 +30,7 @@ void ProfilerGraph::put(const Profiler::GraphValues &values)
}
void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
- gui::IGUIFont *font) const
+ gui::IGUIFont *font) const
{
// Do *not* use UNORDERED_MAP here as the order needs
// to be the same for each call to prevent flickering
@@ -56,15 +56,13 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
}
// 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 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);
+ sizeof(usable_colors) / sizeof(*usable_colors);
u32 next_color_i = 0;
for (auto &i : m_meta) {
@@ -82,7 +80,7 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
s32 textx2 = textx + 200 - 15;
s32 meta_i = 0;
- for (const auto &p: m_meta) {
+ for (const auto &p : m_meta) {
const std::string &id = p.first;
const Meta &meta = p.second;
s32 x = x_left;
@@ -99,18 +97,16 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
char buf[10];
snprintf(buf, 10, "%.3g", show_max);
font->draw(utf8_to_wide(buf).c_str(),
- core::rect<s32>(textx, y - graphh,
- textx2, y - graphh + texth),
- meta.color);
+ core::rect<s32>(textx, y - graphh, textx2,
+ y - graphh + texth),
+ meta.color);
snprintf(buf, 10, "%.3g", show_min);
font->draw(utf8_to_wide(buf).c_str(),
- core::rect<s32>(textx, y - texth,
- textx2, y),
- meta.color);
+ core::rect<s32>(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, y - graphh / 2 + texth / 2),
- meta.color);
+ core::rect<s32>(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);
@@ -120,8 +116,7 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
for (const Piece &piece : m_log) {
float value = 0;
bool value_exists = false;
- Profiler::GraphValues::const_iterator k =
- piece.values.find(id);
+ Profiler::GraphValues::const_iterator k = piece.values.find(id);
if (k != piece.values.end()) {
value = k->second;
@@ -149,8 +144,10 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
if (lastscaledvalue_exists) {
s32 ivalue1 = lastscaledvalue * graph1h;
s32 ivalue2 = scaledvalue * graph1h;
- driver->draw2DLine(v2s32(x - 1, graph1y - ivalue1),
- v2s32(x, graph1y - ivalue2), meta.color);
+ driver->draw2DLine(
+ v2s32(x - 1, graph1y - ivalue1),
+ v2s32(x, graph1y - ivalue2),
+ meta.color);
}
lastscaledvalue = scaledvalue;
@@ -158,7 +155,7 @@ void ProfilerGraph::draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
} else {
s32 ivalue = scaledvalue * graph1h;
driver->draw2DLine(v2s32(x, graph1y),
- v2s32(x, graph1y - ivalue), meta.color);
+ v2s32(x, graph1y - ivalue), meta.color);
}
x++;
diff --git a/src/gui/profilergraph.h b/src/gui/profilergraph.h
index 9f2c87853..6354ac9ef 100644
--- a/src/gui/profilergraph.h
+++ b/src/gui/profilergraph.h
@@ -30,22 +30,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class ProfilerGraph
{
private:
- struct Piece {
+ struct Piece
+ {
Piece(Profiler::GraphValues v) : values(std::move(v)) {}
Profiler::GraphValues values;
};
- struct Meta {
+ struct Meta
+ {
float min;
float max;
video::SColor color;
Meta(float initial = 0,
- video::SColor color = video::SColor(255, 255, 255, 255)):
- min(initial),
- max(initial),
- color(color)
- {}
+ video::SColor color = video::SColor(255, 255, 255, 255)) :
+ min(initial),
+ max(initial), color(color)
+ {
+ }
};
std::deque<Piece> m_log;
+
public:
u32 m_log_max_size = 200;
@@ -54,5 +57,5 @@ public:
void put(const Profiler::GraphValues &values);
void draw(s32 x_left, s32 y_bottom, video::IVideoDriver *driver,
- gui::IGUIFont *font) const;
+ gui::IGUIFont *font) const;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 08:43:47 +0000