voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-15 07:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #751 from alexei-zebra/update-debug-panel

Browse source 
Update debug panel
This commit is contained in:
MihailRis 2025-12-25 20:12:52 +03:00 • committed by GitHub
commit 764d280a4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 117 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

153
src/frontend/debug_panel.cpp
View file

@ -1,27 +1,34 @@
#include <bitset>
#include <memory>
#include <sstream>
#include <string>
#include <utility>
#include "audio/audio.hpp"
#include "constants.hpp"
#include "content/Content.hpp"
#include "delegates.hpp"
#include "engine/Engine.hpp"
#include "settings.hpp"
#include "hud.hpp"
#include "content/Content.hpp"
#include "graphics/core/Mesh.hpp"
#include "graphics/ui/elements/CheckBox.hpp"
#include "graphics/ui/elements/TextBox.hpp"
#include "graphics/ui/elements/TrackBar.hpp"
#include "graphics/ui/elements/InputBindBox.hpp"
#include "graphics/ui/GUI.hpp"
#include "graphics/render/WorldRenderer.hpp"
#include "graphics/render/ParticlesRenderer.hpp"
#include "graphics/render/ChunksRenderer.hpp"
#include "graphics/render/DebugLinesRenderer.hpp"
#include "graphics/render/ParticlesRenderer.hpp"
#include "graphics/render/WorldRenderer.hpp"
#include "graphics/ui/GUI.hpp"
#include "graphics/ui/elements/CheckBox.hpp"
#include "graphics/ui/elements/InputBindBox.hpp"
#include "graphics/ui/elements/TextBox.hpp"
#include "graphics/ui/elements/TrackBar.hpp"
#include "hud.hpp"
#include "logic/scripting/scripting.hpp"
#include "network/Network.hpp"
#include "objects/Entities.hpp"
#include "objects/Entity.hpp"
#include "objects/EntityDef.hpp"
#include "objects/Player.hpp"
#include "objects/Players.hpp"
#include "objects/Entities.hpp"
#include "objects/EntityDef.hpp"
#include "objects/Entity.hpp"
#include "physics/Hitbox.hpp"
#include "settings.hpp"
#include "util/stringutil.hpp"
#include "voxels/Block.hpp"
#include "voxels/Chunk.hpp"
@ -30,12 +37,6 @@
#include "world/Level.hpp"
#include "world/World.hpp"
#include <string>
#include <memory>
#include <sstream>
#include <bitset>
#include <utility>
using namespace gui;
static std::shared_ptr<Label> create_label(GUI& gui, wstringsupplier supplier) {
@ -54,10 +55,7 @@ static bool should_keep_previous(GUI& gui) {
// TODO: move to xml finally
// TODO: move to xml finally
std::shared_ptr<UINode> create_debug_panel(
Engine& engine,
Level& level,
Player& player,
bool allowDebugCheats
Engine& engine, Level& level, Player& player, bool allowDebugCheats
) {
auto network = engine.getNetwork();
auto& gui = engine.getGUI();
@ -69,9 +67,24 @@ std::shared_ptr<UINode> create_debug_panel(
static int fps = 0;
static int fpsMin = fps;
static int fpsMinOld = fpsMin;
static int fpsMax = fps;
static int fpsMaxOld = fpsMax;
static int framesCount = 0;
static float deltaSum = 0.;
static float fpsAvgLong = fps;
static std::wstring fpsString = L"";
static int drawCalls = 0;
static int drawCallsMin = drawCalls;
static int drawCallsMinOld = drawCallsMin;
static int drawCallsMax = drawCalls;
static int drawCallsMaxOld = drawCallsMax;
static float drawCallsAvgLong = drawCalls;
static std::wstring drawCallsString = L"";
static const float AVG_ALPHA = 0.3;
static size_t lastTotalDownload = 0;
static size_t lastTotalUpload = 0;
static std::wstring netSpeedString = L"";
@ -80,12 +93,37 @@ std::shared_ptr<UINode> create_debug_panel(
fps = 1.0f / engine.getTime().getDelta();
fpsMin = std::min(fps, fpsMin);
fpsMax = std::max(fps, fpsMax);
framesCount++;
deltaSum += engine.getTime().getDelta();
drawCallsMin = std::min(drawCalls, drawCallsMin);
drawCallsMax = std::max(drawCalls, drawCallsMax);
drawCallsAvgLong =
drawCallsAvgLong * (1 - AVG_ALPHA) + drawCalls * AVG_ALPHA;
});
panel->listenInterval(0.5f, []() {
fpsString = std::to_wstring(fpsMax)+L" / "+std::to_wstring(fpsMin);
panel->listenInterval(0.2f, []() {
if (framesCount < 1) {
return;
}
fpsAvgLong = framesCount / deltaSum;
framesCount = 0;
deltaSum = 0.0;
fpsString = std::to_wstring(int(fpsAvgLong));
drawCallsString = std::to_wstring(int(drawCallsAvgLong));
});
panel->listenInterval(2.0f, []() {
fpsMinOld = fpsMin;
fpsMin = fps;
fpsMaxOld = fpsMax;
fpsMax = fps;
drawCallsMinOld = drawCallsMin;
drawCallsMin = drawCalls;
drawCallsMaxOld = drawCallsMax;
drawCallsMax = drawCalls;
});
if (network) {
@ -93,30 +131,44 @@ std::shared_ptr<UINode> create_debug_panel(
size_t totalDownload = network->getTotalDownload();
size_t totalUpload = network->getTotalUpload();
netSpeedString =
L"download: " + std::to_wstring(totalDownload - lastTotalDownload) +
L" B/s upload: " + std::to_wstring(totalUpload - lastTotalUpload) +
L" B/s";
L"download: " +
std::to_wstring(totalDownload - lastTotalDownload) +
L" B/s upload: " +
std::to_wstring(totalUpload - lastTotalUpload) + L" B/s";
lastTotalDownload = totalDownload;
lastTotalUpload = totalUpload;
});
}
panel->add(create_label(gui, []() { return L"fps: "+fpsString;}));
panel->add(create_label(gui, []() {
return L"fps: " + fpsString + L" / " +
std::to_wstring(std::min(fpsMinOld, fpsMin)) + L" / " +
std::to_wstring(std::max(fpsMaxOld, fpsMax));
}));
panel->add(create_label(gui, []() {
return L"meshes: " + std::to_wstring(MeshStats::meshesCount);
}));
panel->add(create_label(gui, []() {
int drawCalls = MeshStats::drawCalls;
drawCalls = MeshStats::drawCalls;
MeshStats::drawCalls = 0;
return L"draw-calls: " + std::to_wstring(drawCalls);
auto drawCallsStr = std::to_wstring(drawCalls);
drawCallsStr.resize(6, ' ');
return L"draw-calls: " + drawCallsStr +
L" ( avg: " + drawCallsString + L" )";
}));
panel->add(create_label(gui, []() {
return L" min/max: " +
std::to_wstring(std::min(drawCallsMinOld, drawCallsMin)) +
L" / " +
std::to_wstring(std::max(drawCallsMaxOld, drawCallsMax));
}));
panel->add(create_label(gui, []() {
return L"speakers: " + std::to_wstring(audio::count_speakers()) +
L" streams: " + std::to_wstring(audio::count_streams());
}));
panel->add(create_label(gui, []() {
return L"lua-stack: " + std::to_wstring(scripting::get_values_on_stack());
return L"lua-stack: " +
std::to_wstring(scripting::get_values_on_stack());
}));
if (network) {
panel->add(create_label(gui, []() { return netSpeedString; }));
@ -137,12 +189,12 @@ std::shared_ptr<UINode> create_debug_panel(
L" visible: " + std::to_wstring(ChunksRenderer::visibleChunks);
}));
panel->add(create_label(gui, [&]() {
return L"entities: "+std::to_wstring(level.entities->size())+L" next: "+
std::to_wstring(level.entities->peekNextID());
return L"entities: " + std::to_wstring(level.entities->size()) +
L" next: " + std::to_wstring(level.entities->peekNextID());
}));
panel->add(create_label(gui, [&]() {
return L"players: "+std::to_wstring(level.players->size())+L" local: "+
std::to_wstring(player.getId());
return L"players: " + std::to_wstring(level.players->size()) +
L" local: " + std::to_wstring(player.getId());
}));
panel->add(create_label(gui, [&]() -> std::wstring {
// TODO: move to xml finally
@ -156,14 +208,13 @@ std::shared_ptr<UINode> create_debug_panel(
}
std::wstringstream stream;
stream << "r:" << vox.state.rotation << " s:"
<< std::bitset<3>(vox.state.segment) << " u:"
<< std::bitset<8>(vox.state.userbits);
stream << "r:" << vox.state.rotation
<< " s:" << std::bitset<3>(vox.state.segment)
<< " u:" << std::bitset<8>(vox.state.userbits);
if (vox.id == BLOCK_VOID) {
return L"block: -";
} else {
return L"block: "+std::to_wstring(vox.id)+
L" "+stream.str();
return L"block: " + std::to_wstring(vox.id) + L" " + stream.str();
}
}));
panel->add(create_label(gui, [&]() -> std::wstring {
@ -181,9 +232,9 @@ std::shared_ptr<UINode> create_debug_panel(
if (vox.id == BLOCK_VOID) {
return L"x: - y: - z: -";
}
return L"x: " + std::to_wstring(selection.actualPosition.x) +
L" y: " + std::to_wstring(selection.actualPosition.y) +
L" z: " + std::to_wstring(selection.actualPosition.z);
return L"x: " + std::to_wstring(selection.actualPosition.x) + L" y: " +
std::to_wstring(selection.actualPosition.y) + L" z: " +
std::to_wstring(selection.actualPosition.z);
}));
panel->add(create_label(gui, [&]() {
// TODO: move to xml finally
@ -259,8 +310,8 @@ std::shared_ptr<UINode> create_debug_panel(
int hour, minute, second;
timeutil::from_value(worldInfo.daytime, hour, minute, second);
std::wstring timeString =
util::lfill(std::to_wstring(hour), 2, L'0') + L":" +
std::wstring timeString = util::lfill(std::to_wstring(hour), 2, L'0') +
L":" +
util::lfill(std::to_wstring(minute), 2, L'0');
return L"time: " + timeString;
}));
@ -304,9 +355,7 @@ std::shared_ptr<UINode> create_debug_panel(
auto checkbox = std::make_shared<FullCheckBox>(
gui, L"Show Paths", glm::vec2(400, 24)
);
checkbox->setSupplier([=]() {
return DebugLinesRenderer::showPaths;
});
checkbox->setSupplier([=]() { return DebugLinesRenderer::showPaths; });
checkbox->setConsumer([=](bool checked) {
DebugLinesRenderer::showPaths = checked;
});
@ -316,9 +365,7 @@ std::shared_ptr<UINode> create_debug_panel(
auto checkbox = std::make_shared<FullCheckBox>(
gui, L"Show Generator Minimap", glm::vec2(400, 24)
);
checkbox->setSupplier([=]() {
return Hud::showGeneratorMinimap;
});
checkbox->setSupplier([=]() { return Hud::showGeneratorMinimap; });
checkbox->setConsumer([=](bool checked) {
Hud::showGeneratorMinimap = checked;
});