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

minor refactor

Browse source
This commit is contained in:
MihailRis 2024-03-06 11:30:33 +03:00
parent fa57a898d7
commit 7601bfad3a
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/frontend/hud.cpp
View file

@ -240,7 +240,7 @@ Hud::~Hud() {
// removing all controlled ui // removing all controlled ui
gui->remove(grabbedItemView); gui->remove(grabbedItemView);
for (auto& element : elements) { for (auto& element : elements) {
remove(element); onRemove(element);
} }
gui->remove(hotbarView); gui->remove(hotbarView);
gui->remove(darkOverlay); gui->remove(darkOverlay);
@ -331,7 +331,7 @@ void Hud::update(bool visible) {
for (auto& element : elements) { for (auto& element : elements) {
element.update(pause, inventoryOpen, player->debug); element.update(pause, inventoryOpen, player->debug);
if (element.isRemoved()) { if (element.isRemoved()) {
remove(element); onRemove(element);
} }
} }
} }
@ -440,7 +440,7 @@ void Hud::add(HudElement element) {
elements.push_back(element); elements.push_back(element);
} }
void Hud::remove(HudElement& element) { void Hud::onRemove(HudElement& element) {
auto document = element.getDocument(); auto document = element.getDocument();
if (document) { if (document) {
Inventory* inventory = nullptr; Inventory* inventory = nullptr;
@ -456,12 +456,11 @@ void Hud::remove(HudElement& element) {
gui->remove(element.getNode()); gui->remove(element.getNode());
} }
// todo: refactor this garbage
void Hud::remove(std::shared_ptr<gui::UINode> node) { void Hud::remove(std::shared_ptr<gui::UINode> node) {
for (auto& element : elements) { for (auto& element : elements) {
if (element.getNode() == node) { if (element.getNode() == node) {
element.setRemoved(); element.setRemoved();
remove(element); onRemove(element);
} }
} }
cleanup(); cleanup();

2
src/frontend/hud.h
View file

@ -148,7 +148,7 @@ public:
void openPermanent(UiDocument* doc); void openPermanent(UiDocument* doc);
void add(HudElement element); void add(HudElement element);
void remove(HudElement& element); void onRemove(HudElement& element);
void remove(std::shared_ptr<gui::UINode> node); void remove(std::shared_ptr<gui::UINode> node);
Player* getPlayer() const; Player* getPlayer() const;