mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
Merge branch 'main' into volume-renderer
This commit is contained in:
MihailRis
commit
d14f5d6dfd
2 changed files with 110 additions and 74 deletions
8
.github/workflows/windows.yml
vendored
8
.github/workflows/windows.yml
vendored
|
|
@ -32,18 +32,18 @@ jobs:
|
|||
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
|
||||
run: |
|
||||
cmake --preset default-vs-msvc-windows
|
||||
cmake --build --preset default-vs-msvc-windows --config Release
|
||||
cmake --build --preset default-vs-msvc-windows --config RelWithDebInfo
|
||||
- name: Run tests
|
||||
run: ctest --preset default-vs-msvc-windows
|
||||
- name: Run engine tests
|
||||
run: |
|
||||
build/vctest/Release/vctest.exe -e build/Release/VoxelEngine.exe -d dev/tests -u build
|
||||
build/vctest/RelWithDebInfo/vctest.exe -e build/RelWithDebInfo/VoxelEngine.exe -d dev/tests -u build
|
||||
timeout-minutes: 1
|
||||
- name: Package for Windows
|
||||
run: |
|
||||
mkdir packaged
|
||||
cp -r build/Release/* packaged/
|
||||
cp build/vctest/Release/vctest.exe packaged/
|
||||
cp -r build/RelWithDebInfo/* packaged/
|
||||
cp build/vctest/RelWithDebInfo/vctest.exe packaged/
|
||||
cp C:/Windows/System32/msvcp140.dll packaged/msvcp140.dll
|
||||
mv packaged/VoxelEngine.exe packaged/VoxelCore.exe
|
||||
working-directory: ${{ github.workspace }}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
@ -70,22 +68,58 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
static int fps = 0;
|
||||
static int fpsMin = fps;
|
||||
static int fpsMax = fps;
|
||||
static int framesCount = 0;
|
||||
static float deltaSum = 0.;
|
||||
static int drawCallsSum = 0;
|
||||
static std::wstring fpsString = L"";
|
||||
|
||||
static int drawCalls = 0;
|
||||
static int drawCallsMin = drawCalls;
|
||||
static int drawCallsMax = drawCalls;
|
||||
static std::wstring drawCallsAvgString = L"";
|
||||
static std::wstring drawCallsMinMaxString = L"";
|
||||
|
||||
static size_t lastTotalDownload = 0;
|
||||
static size_t lastTotalUpload = 0;
|
||||
static std::wstring netSpeedString = L"";
|
||||
|
||||
panel->listenInterval(0.016f, [&engine]() {
|
||||
fps = 1.0f / engine.getTime().getDelta();
|
||||
double delta = engine.getTime().getDelta();
|
||||
fps = 1.0f / delta;
|
||||
fpsMin = std::min(fps, fpsMin);
|
||||
fpsMax = std::max(fps, fpsMax);
|
||||
drawCallsMin = std::min(drawCalls, drawCallsMin);
|
||||
drawCallsMax = std::max(drawCalls, drawCallsMax);
|
||||
|
||||
framesCount++;
|
||||
deltaSum += delta;
|
||||
drawCallsSum += drawCalls;
|
||||
});
|
||||
|
||||
panel->listenInterval(0.5f, []() {
|
||||
fpsString = std::to_wstring(fpsMax)+L" / "+std::to_wstring(fpsMin);
|
||||
if (framesCount < 1) {
|
||||
return;
|
||||
}
|
||||
int avgFps = glm::round(framesCount / deltaSum);
|
||||
int avgDrawCalls = drawCallsSum / framesCount;
|
||||
framesCount = 0;
|
||||
deltaSum = 0.0;
|
||||
drawCallsSum = 0;
|
||||
|
||||
fpsString = L"fps: " + std::to_wstring(avgFps) + L" / " +
|
||||
std::to_wstring(fpsMin) + L" / " +
|
||||
std::to_wstring(fpsMax);
|
||||
drawCallsAvgString = std::to_wstring(avgDrawCalls);
|
||||
drawCallsMinMaxString = L" min/max: " +
|
||||
std::to_wstring(drawCallsMin) +
|
||||
L" / " +
|
||||
std::to_wstring(drawCallsMax);
|
||||
|
||||
fpsMin = fps;
|
||||
fpsMax = fps;
|
||||
|
||||
drawCallsMin = drawCalls;
|
||||
drawCallsMax = drawCalls;
|
||||
});
|
||||
|
||||
if (network) {
|
||||
|
|
@ -93,30 +127,37 @@ 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 fpsString; }));
|
||||
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: " + drawCallsAvgString + L")";
|
||||
}));
|
||||
panel->add(create_label(gui, []() {
|
||||
return L"speakers: " + std::to_wstring(audio::count_speakers())+
|
||||
return drawCallsMinMaxString;
|
||||
}));
|
||||
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; }));
|
||||
|
|
@ -124,7 +165,7 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
panel->add(create_label(gui, [&engine]() {
|
||||
auto& settings = engine.getSettings();
|
||||
bool culling = settings.graphics.frustumCulling.get();
|
||||
return L"frustum-culling: "+std::wstring(culling ? L"on" : L"off");
|
||||
return L"frustum-culling: " + std::wstring(culling ? L"on" : L"off");
|
||||
}));
|
||||
panel->add(create_label(gui, [=]() {
|
||||
return L"particles: " +
|
||||
|
|
@ -133,16 +174,16 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
std::to_wstring(ParticlesRenderer::aliveEmitters);
|
||||
}));
|
||||
panel->add(create_label(gui, [&]() {
|
||||
return L"chunks: "+std::to_wstring(level.chunks->size())+
|
||||
L" visible: "+std::to_wstring(ChunksRenderer::visibleChunks);
|
||||
return L"chunks: " + std::to_wstring(level.chunks->size()) +
|
||||
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 +197,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 +221,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
|
||||
|
|
@ -199,13 +239,13 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
if (eid == ENTITY_NONE) {
|
||||
return std::wstring {L"entity: -"};
|
||||
} else if (auto entity = level.entities->get(eid)) {
|
||||
return L"entity: "+util::str2wstr_utf8(entity->getDef().name)+
|
||||
L" uid: "+std::to_wstring(entity->getUID());
|
||||
return L"entity: " + util::str2wstr_utf8(entity->getDef().name) +
|
||||
L" uid: " + std::to_wstring(entity->getUID());
|
||||
} else {
|
||||
return std::wstring {L"entity: error (invalid UID)"};
|
||||
}
|
||||
}));
|
||||
panel->add(create_label(gui, [&](){
|
||||
panel->add(create_label(gui, [&]() {
|
||||
auto indices = level.content.getIndices();
|
||||
if (auto def = indices->blocks.get(player.selection.vox.id)) {
|
||||
return L"name: " + util::str2wstr_utf8(def->name);
|
||||
|
|
@ -213,8 +253,8 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
return std::wstring {L"name: void"};
|
||||
}
|
||||
}));
|
||||
panel->add(create_label(gui, [&](){
|
||||
return L"seed: "+std::to_wstring(level.getWorld()->getSeed());
|
||||
panel->add(create_label(gui, [&]() {
|
||||
return L"seed: " + std::to_wstring(level.getWorld()->getSeed());
|
||||
}));
|
||||
|
||||
for (int ax = 0; ax < 3; ax++) {
|
||||
|
|
@ -240,7 +280,7 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
glm::vec3 position = player.getPosition();
|
||||
position[ax] = std::stoi(text);
|
||||
player.teleport(position);
|
||||
} catch (std::exception& _){
|
||||
} catch (std::exception& _) {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -255,25 +295,25 @@ std::shared_ptr<UINode> create_debug_panel(
|
|||
panel->add(sub);
|
||||
}
|
||||
auto& worldInfo = level.getWorld()->getInfo();
|
||||
panel->add(create_label(gui, [&](){
|
||||
panel->add(create_label(gui, [&]() {
|
||||
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":" +
|
||||
util::lfill(std::to_wstring(minute), 2, L'0');
|
||||
return L"time: "+timeString;
|
||||
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;
|
||||
}));
|
||||
if (allowDebugCheats) {
|
||||
auto bar = std::make_shared<TrackBar>(gui, 0.0f, 1.0f, 1.0f, 0.005f, 8);
|
||||
bar->setSupplier([&]() {return worldInfo.daytime;});
|
||||
bar->setConsumer([&](double val) {worldInfo.daytime = val;});
|
||||
bar->setSupplier([&]() { return worldInfo.daytime; });
|
||||
bar->setConsumer([&](double val) { worldInfo.daytime = val; });
|
||||
panel->add(bar);
|
||||
}
|
||||
if (allowDebugCheats) {
|
||||
auto bar = std::make_shared<TrackBar>(gui, 0.0f, 1.0f, 0.0f, 0.005f, 8);
|
||||
bar->setSupplier([&]() {return worldInfo.fog;});
|
||||
bar->setConsumer([&](double val) {worldInfo.fog = val;});
|
||||
bar->setSupplier([&]() { return worldInfo.fog; });
|
||||
bar->setConsumer([&](double val) { worldInfo.fog = val; });
|
||||
panel->add(bar);
|
||||
}
|
||||
{
|
||||
|
|
@ -304,9 +344,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 +354,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;
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue