From 41a45fc43275192bcf0109f70139bd029a33dceb Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 12 Feb 2025 00:09:44 +0300 Subject: [PATCH] rename hud_element_mode to HudElementMode --- src/frontend/hud.cpp | 27 +++++++++++++-------------- src/frontend/hud.hpp | 16 ++++++++-------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 3095ed1e..1684799f 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -70,7 +70,7 @@ std::shared_ptr create_debug_panel( ); HudElement::HudElement( - hud_element_mode mode, + HudElementMode mode, UiDocument* document, std::shared_ptr node, bool debug @@ -83,16 +83,16 @@ void HudElement::update(bool pause, bool inventoryOpen, bool debugMode) { return; } switch (mode) { - case hud_element_mode::permanent: + case HudElementMode::PERMANENT: node->setVisible(true); break; - case hud_element_mode::ingame: + case HudElementMode::INGAME: node->setVisible(!pause && !inventoryOpen); break; - case hud_element_mode::inventory_any: + case HudElementMode::INVENTORY_ANY: node->setVisible(inventoryOpen); break; - case hud_element_mode::inventory_bound: + case HudElementMode::INVENTORY: removed = !inventoryOpen; break; } @@ -192,7 +192,7 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player) auto dplotter = std::make_shared(350, 250, 2000, 16); dplotter->setGravity(Gravity::bottom_right); dplotter->setInteractive(false); - add(HudElement(hud_element_mode::permanent, nullptr, dplotter, true)); + add(HudElement(HudElementMode::PERMANENT, nullptr, dplotter, true)); assets.store(Texture::from(debugImgWorldGen.get()), DEBUG_WORLDGEN_IMAGE); @@ -200,7 +200,7 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player) "" ); - add(HudElement(hud_element_mode::permanent, nullptr, debugMinimap, true)); + add(HudElement(HudElementMode::PERMANENT, nullptr, debugMinimap, true)); } Hud::~Hud() { @@ -372,8 +372,8 @@ void Hud::openInventory() { auto inventoryDocument = assets.get("core:inventory"); inventoryView = std::dynamic_pointer_cast(inventoryDocument->getRoot()); inventoryView->bind(inventory, &content); - add(HudElement(hud_element_mode::inventory_bound, inventoryDocument, inventoryView, false)); - add(HudElement(hud_element_mode::inventory_bound, nullptr, exchangeSlot, false)); + add(HudElement(HudElementMode::INVENTORY, inventoryDocument, inventoryView, false)); + add(HudElement(HudElementMode::INVENTORY, nullptr, exchangeSlot, false)); } std::shared_ptr Hud::openInventory( @@ -401,7 +401,7 @@ std::shared_ptr Hud::openInventory( inv = level.inventories->createVirtual(secondInvView->getSlotsCount()); } secondInvView->bind(inv, &content); - add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false)); + add(HudElement(HudElementMode::INVENTORY, doc, secondUI, false)); scripting::on_inventory_open(&player, *inv); return inv; } @@ -436,7 +436,7 @@ void Hud::openInventory( blockUI->bind(blockinv, &content); blockPos = block; currentblockid = chunks.require(block.x, block.y, block.z).id; - add(HudElement(hud_element_mode::inventory_bound, doc, blockUI, false)); + add(HudElement(HudElementMode::INVENTORY, doc, blockUI, false)); scripting::on_inventory_open(&player, *blockinv); } @@ -468,8 +468,7 @@ void Hud::showOverlay( showExchangeSlot(); inventoryOpen = true; } - add(HudElement(hud_element_mode::inventory_bound, doc, secondUI, false), - args); + add(HudElement(HudElementMode::INVENTORY, doc, secondUI, false), args); } void Hud::openPermanent(UiDocument* doc) { @@ -480,7 +479,7 @@ void Hud::openPermanent(UiDocument* doc) { if (invview) { invview->bind(player.getInventory(), &frontend.getLevel().content); } - add(HudElement(hud_element_mode::permanent, doc, doc->getRoot(), false)); + add(HudElement(HudElementMode::PERMANENT, doc, doc->getRoot(), false)); } void Hud::dropExchangeSlot() { diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp index 07affc66..a978e282 100644 --- a/src/frontend/hud.hpp +++ b/src/frontend/hud.hpp @@ -30,26 +30,26 @@ namespace gui { class SlotView; } -enum class hud_element_mode { +enum class HudElementMode { // element is hidden if menu or inventory open - ingame, + INGAME, // element is visible if hud is visible - permanent, + PERMANENT, // element is visible in inventory mode - inventory_any, + INVENTORY_ANY, // element will be removed on inventory close - inventory_bound + INVENTORY }; class HudElement { - hud_element_mode mode; + HudElementMode mode; UiDocument* document; std::shared_ptr node; bool debug; bool removed = false; public: - HudElement(hud_element_mode mode, UiDocument* document, std::shared_ptr node, bool debug); + HudElement(HudElementMode mode, UiDocument* document, std::shared_ptr node, bool debug); void update(bool pause, bool inventoryOpen, bool debug); @@ -57,7 +57,7 @@ public: std::shared_ptr getNode() const; bool isInventoryBound() const { - return mode == hud_element_mode::inventory_bound; + return mode == HudElementMode::INVENTORY; } void setRemoved() {