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

fix: debug panel

Browse source
This commit is contained in:
alexei-zebra 2025-12-23 22:10:54 +03:00
parent 36efc9aa49
commit 21815a4fab
1 changed files with 68 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

104
src/frontend/debug_panel.cpp
View file

@ -1,28 +1,34 @@
#include "constants.hpp" #include <bitset>
#include <memory>
#include <sstream>
#include <string>
#include <utility>
#include "audio/audio.hpp" #include "audio/audio.hpp"
#include "constants.hpp"
#include "content/Content.hpp"
#include "delegates.hpp" #include "delegates.hpp"
#include "engine/Engine.hpp" #include "engine/Engine.hpp"
#include "settings.hpp"
#include "hud.hpp"
#include "content/Content.hpp"
#include "graphics/core/Mesh.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/ChunksRenderer.hpp"
#include "graphics/render/DebugLinesRenderer.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 "logic/scripting/scripting.hpp"
#include "network/Network.hpp" #include "network/Network.hpp"
#include "objects/Entities.hpp"
#include "objects/Entity.hpp"
#include "objects/EntityDef.hpp"
#include "objects/Player.hpp" #include "objects/Player.hpp"
#include "objects/Players.hpp" #include "objects/Players.hpp"
#include "objects/Entities.hpp"
#include "objects/EntityDef.hpp"
#include "objects/Entity.hpp"
#include "physics/Hitbox.hpp" #include "physics/Hitbox.hpp"
#include "settings.hpp"
#include "util/stringutil.hpp" #include "util/stringutil.hpp"
#include "voxels/Block.hpp" #include "voxels/Block.hpp"
#include "voxels/Chunk.hpp" #include "voxels/Chunk.hpp"
@ -31,12 +37,6 @@
#include "world/Level.hpp" #include "world/Level.hpp"
#include "world/World.hpp" #include "world/World.hpp"
#include <string>
#include <memory>
#include <sstream>
#include <bitset>
#include <utility>
using namespace gui; using namespace gui;
static std::shared_ptr<Label> create_label(GUI& gui, wstringsupplier supplier) { static std::shared_ptr<Label> create_label(GUI& gui, wstringsupplier supplier) {
@ -55,10 +55,7 @@ static bool should_keep_previous(GUI& gui) {
// TODO: move to xml finally // TODO: move to xml finally
// TODO: move to xml finally // TODO: move to xml finally
std::shared_ptr<UINode> create_debug_panel( std::shared_ptr<UINode> create_debug_panel(
Engine& engine, Engine& engine, Level& level, Player& player, bool allowDebugCheats
Level& level,
Player& player,
bool allowDebugCheats
) { ) {
auto network = engine.getNetwork(); auto network = engine.getNetwork();
auto& gui = engine.getGUI(); auto& gui = engine.getGUI();
@ -82,7 +79,7 @@ std::shared_ptr<UINode> create_debug_panel(
static int drawCallsMaxOld = drawCallsMax; static int drawCallsMaxOld = drawCallsMax;
static float drawCallsAvgLong = drawCalls; static float drawCallsAvgLong = drawCalls;
inline const float AVG_ALPHA = 0.01; const float AVG_ALPHA = 0.01;
static size_t lastTotalDownload = 0; static size_t lastTotalDownload = 0;
static size_t lastTotalUpload = 0; static size_t lastTotalUpload = 0;
@ -96,7 +93,8 @@ std::shared_ptr<UINode> create_debug_panel(
drawCallsMin = std::min(drawCalls, drawCallsMin); drawCallsMin = std::min(drawCalls, drawCallsMin);
drawCallsMax = std::max(drawCalls, drawCallsMax); drawCallsMax = std::max(drawCalls, drawCallsMax);
drawCallsAvgLong = drawCallsAvgLong * (1 - AVG_ALPHA) + drawCalls * AVG_ALPHA; drawCallsAvgLong =
drawCallsAvgLong * (1 - AVG_ALPHA) + drawCalls * AVG_ALPHA;
}); });
panel->listenInterval(2.0f, []() { panel->listenInterval(2.0f, []() {
@ -116,9 +114,10 @@ std::shared_ptr<UINode> create_debug_panel(
size_t totalDownload = network->getTotalDownload(); size_t totalDownload = network->getTotalDownload();
size_t totalUpload = network->getTotalUpload(); size_t totalUpload = network->getTotalUpload();
netSpeedString = netSpeedString =
L"download: " + std::to_wstring(totalDownload - lastTotalDownload) + L"download: " +
L" B/s upload: " + std::to_wstring(totalUpload - lastTotalUpload) + std::to_wstring(totalDownload - lastTotalDownload) +
L" B/s"; L" B/s upload: " +
std::to_wstring(totalUpload - lastTotalUpload) + L" B/s";
lastTotalDownload = totalDownload; lastTotalDownload = totalDownload;
lastTotalUpload = totalUpload; lastTotalUpload = totalUpload;
}); });
@ -126,7 +125,8 @@ std::shared_ptr<UINode> create_debug_panel(
panel->add(create_label(gui, []() { panel->add(create_label(gui, []() {
return L"fps: " + std::to_wstring(int(fpsAvgLong)) + L" / " + return L"fps: " + std::to_wstring(int(fpsAvgLong)) + L" / " +
std::to_wstring(std::min(fpsMinOld, fpsMin)) + L" / " + std::to_wstring(std::max(fpsMaxOld, fpsMax)); std::to_wstring(std::min(fpsMinOld, fpsMin)) + L" / " +
std::to_wstring(std::max(fpsMaxOld, fpsMax));
})); }));
panel->add(create_label(gui, []() { panel->add(create_label(gui, []() {
return L"meshes: " + std::to_wstring(MeshStats::meshesCount); return L"meshes: " + std::to_wstring(MeshStats::meshesCount);
@ -134,8 +134,10 @@ std::shared_ptr<UINode> create_debug_panel(
panel->add(create_label(gui, []() { panel->add(create_label(gui, []() {
drawCalls = MeshStats::drawCalls; drawCalls = MeshStats::drawCalls;
MeshStats::drawCalls = 0; MeshStats::drawCalls = 0;
return L"draw-calls: " + std::to_wstring(int(drawCallsAvgLong)) + L" / " + return L"draw-calls: " + std::to_wstring(int(drawCallsAvgLong)) +
std::to_wstring(std::min(drawCallsMinOld, drawCallsMin)) + L" / " + L" / " +
std::to_wstring(std::min(drawCallsMinOld, drawCallsMin)) +
L" / " +
std::to_wstring(std::max(drawCallsMaxOld, drawCallsMax)); std::to_wstring(std::max(drawCallsMaxOld, drawCallsMax));
})); }));
panel->add(create_label(gui, []() { panel->add(create_label(gui, []() {
@ -143,7 +145,8 @@ std::shared_ptr<UINode> create_debug_panel(
L" streams: " + std::to_wstring(audio::count_streams()); L" streams: " + std::to_wstring(audio::count_streams());
})); }));
panel->add(create_label(gui, []() { 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) { if (network) {
panel->add(create_label(gui, []() { return netSpeedString; })); panel->add(create_label(gui, []() { return netSpeedString; }));
@ -164,12 +167,12 @@ std::shared_ptr<UINode> create_debug_panel(
L" visible: " + std::to_wstring(ChunksRenderer::visibleChunks); L" visible: " + std::to_wstring(ChunksRenderer::visibleChunks);
})); }));
panel->add(create_label(gui, [&]() { panel->add(create_label(gui, [&]() {
return L"entities: "+std::to_wstring(level.entities->size())+L" next: "+ return L"entities: " + std::to_wstring(level.entities->size()) +
std::to_wstring(level.entities->peekNextID()); L" next: " + std::to_wstring(level.entities->peekNextID());
})); }));
panel->add(create_label(gui, [&]() { panel->add(create_label(gui, [&]() {
return L"players: "+std::to_wstring(level.players->size())+L" local: "+ return L"players: " + std::to_wstring(level.players->size()) +
std::to_wstring(player.getId()); L" local: " + std::to_wstring(player.getId());
})); }));
panel->add(create_label(gui, [&]() -> std::wstring { panel->add(create_label(gui, [&]() -> std::wstring {
// TODO: move to xml finally // TODO: move to xml finally
@ -183,14 +186,13 @@ std::shared_ptr<UINode> create_debug_panel(
} }
std::wstringstream stream; std::wstringstream stream;
stream << "r:" << vox.state.rotation << " s:" stream << "r:" << vox.state.rotation
<< std::bitset<3>(vox.state.segment) << " u:" << " s:" << std::bitset<3>(vox.state.segment)
<< std::bitset<8>(vox.state.userbits); << " u:" << std::bitset<8>(vox.state.userbits);
if (vox.id == BLOCK_VOID) { if (vox.id == BLOCK_VOID) {
return L"block: -"; return L"block: -";
} else { } else {
return L"block: "+std::to_wstring(vox.id)+ return L"block: " + std::to_wstring(vox.id) + L" " + stream.str();
L" "+stream.str();
} }
})); }));
panel->add(create_label(gui, [&]() -> std::wstring { panel->add(create_label(gui, [&]() -> std::wstring {
@ -208,9 +210,9 @@ std::shared_ptr<UINode> create_debug_panel(
if (vox.id == BLOCK_VOID) { if (vox.id == BLOCK_VOID) {
return L"x: - y: - z: -"; return L"x: - y: - z: -";
} }
return L"x: " + std::to_wstring(selection.actualPosition.x) + return L"x: " + std::to_wstring(selection.actualPosition.x) + L" y: " +
L" y: " + std::to_wstring(selection.actualPosition.y) + std::to_wstring(selection.actualPosition.y) + L" z: " +
L" z: " + std::to_wstring(selection.actualPosition.z); std::to_wstring(selection.actualPosition.z);
})); }));
panel->add(create_label(gui, [&]() { panel->add(create_label(gui, [&]() {
// TODO: move to xml finally // TODO: move to xml finally
@ -286,8 +288,8 @@ std::shared_ptr<UINode> create_debug_panel(
int hour, minute, second; int hour, minute, second;
timeutil::from_value(worldInfo.daytime, hour, minute, second); timeutil::from_value(worldInfo.daytime, hour, minute, second);
std::wstring timeString = std::wstring timeString = util::lfill(std::to_wstring(hour), 2, L'0') +
util::lfill(std::to_wstring(hour), 2, L'0') + L":" + L":" +
util::lfill(std::to_wstring(minute), 2, L'0'); util::lfill(std::to_wstring(minute), 2, L'0');
return L"time: " + timeString; return L"time: " + timeString;
})); }));
@ -331,9 +333,7 @@ std::shared_ptr<UINode> create_debug_panel(
auto checkbox = std::make_shared<FullCheckBox>( auto checkbox = std::make_shared<FullCheckBox>(
gui, L"Show Paths", glm::vec2(400, 24) gui, L"Show Paths", glm::vec2(400, 24)
); );
checkbox->setSupplier([=]() { checkbox->setSupplier([=]() { return DebugLinesRenderer::showPaths; });
return DebugLinesRenderer::showPaths;
});
checkbox->setConsumer([=](bool checked) { checkbox->setConsumer([=](bool checked) {
DebugLinesRenderer::showPaths = checked; DebugLinesRenderer::showPaths = checked;
}); });
@ -343,9 +343,7 @@ std::shared_ptr<UINode> create_debug_panel(
auto checkbox = std::make_shared<FullCheckBox>( auto checkbox = std::make_shared<FullCheckBox>(
gui, L"Show Generator Minimap", glm::vec2(400, 24) gui, L"Show Generator Minimap", glm::vec2(400, 24)
); );
checkbox->setSupplier([=]() { checkbox->setSupplier([=]() { return Hud::showGeneratorMinimap; });
return Hud::showGeneratorMinimap;
});
checkbox->setConsumer([=](bool checked) { checkbox->setConsumer([=](bool checked) {
Hud::showGeneratorMinimap = checked; Hud::showGeneratorMinimap = checked;
}); });