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

Merge branch 'main' into volume-renderer

Browse source
This commit is contained in:
MihailRis 2025-12-29 22:10:36 +03:00
commit 32a26ebbcc
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/graphics/ui/elements/SelectBox.cpp
View file

@ -21,7 +21,8 @@ SelectBox::SelectBox(
listenAction(UIAction::CLICK, [this](GUI& gui) { listenAction(UIAction::CLICK, [this](GUI& gui) {
auto panel = std::make_shared<Panel>(gui, getSize()); auto panel = std::make_shared<Panel>(gui, getSize());
panel->setPos(calcPos() + glm::vec2(0, size.y)); panel->setPadding(glm::vec4(0, size.y, 0, 0));
panel->setPos(calcPos() + glm::vec2(0, 0));
for (const auto& option : this->options) { for (const auto& option : this->options) {
auto button = std::make_shared<Button>( auto button = std::make_shared<Button>(
gui, option.text, glm::vec4(10.0f), nullptr, glm::vec2(-1.0f) gui, option.text, glm::vec4(10.0f), nullptr, glm::vec2(-1.0f)
@ -37,6 +38,9 @@ SelectBox::SelectBox(
panel->listenAction(UIAction::DEFOCUS, [panel=panel.get()](GUI& gui) { panel->listenAction(UIAction::DEFOCUS, [panel=panel.get()](GUI& gui) {
gui.remove(panel); gui.remove(panel);
}); });
panel->listenAction(UIAction::CLICK, [panel=panel.get()](GUI& gui) {
gui.remove(panel);
});
gui.add(panel); gui.add(panel);
}); });
} }

4
src/logic/BlocksController.cpp
View file

@ -24,7 +24,7 @@ BlocksController::BlocksController(const Level& level, Lighting* lighting)
chunks(*level.chunks), chunks(*level.chunks),
lighting(lighting), lighting(lighting),
randTickClock(20, 3), randTickClock(20, 3),
blocksTickClock(20, 1), blocksTickClock(20, 3),
worldTickClock(20, 1) { worldTickClock(20, 1) {
} }
@ -124,7 +124,7 @@ void BlocksController::update(float delta, uint padding) {
randomTick(randTickClock.getPart(), randTickClock.getParts(), padding); randomTick(randTickClock.getPart(), randTickClock.getParts(), padding);
} }
if (blocksTickClock.update(delta)) { if (blocksTickClock.update(delta)) {
onBlocksTick(blocksTickClock.getPart(), blocksTickClock.getParts()); onBlocksTick(blocksTickClock.getTickId(), blocksTickClock.getParts());
} }
if (worldTickClock.update(delta)) { if (worldTickClock.update(delta)) {
scripting::on_world_tick(worldTickClock.getTickRate()); scripting::on_world_tick(worldTickClock.getTickRate());

1
src/util/Clock.cpp
View file

@ -18,6 +18,7 @@ bool Clock::update(float delta) {
tickTimer = std::fmod(tickTimer, delay); tickTimer = std::fmod(tickTimer, delay);
tickPartsUndone = tickParts - 1; tickPartsUndone = tickParts - 1;
} }
++tickId;
return true; return true;
} }
return false; return false;