From f49feebd5cb0ffaf8fe1b7e721161be1a535ec1a Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sat, 21 Dec 2024 09:55:44 +0300
Subject: [PATCH] refactor

---
 src/frontend/hud.cpp | 38 +++++++++++++++++++-------------------
 src/frontend/hud.hpp |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 33f8436b..95fd47dc 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -154,7 +154,7 @@ static constexpr uint WORLDGEN_IMG_SIZE = 128U;
 Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
     : engine(engine),
       assets(*engine.getAssets()),
-      gui(engine.getGUI()),
+      gui(*engine.getGUI()),
       frontend(frontend),
       player(player),
       debugImgWorldGen(std::make_unique<ImageData>(
@@ -183,11 +183,11 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
         engine, frontend.getLevel(), player, allowDebugCheats
     );
     debugPanel->setZIndex(2);
-    gui->add(debugPanel);
+    gui.add(debugPanel);
     
-    gui->add(darkOverlay);
-    gui->add(hotbarView);
-    gui->add(contentAccessPanel);
+    gui.add(darkOverlay);
+    gui.add(hotbarView);
+    gui.add(contentAccessPanel);
 
     auto dplotter = std::make_shared<Plotter>(350, 250, 2000, 16);
     dplotter->setGravity(Gravity::bottom_right);
@@ -208,10 +208,10 @@ Hud::~Hud() {
     for (auto& element : elements) {
         onRemove(element);
     }
-    gui->remove(hotbarView);
-    gui->remove(darkOverlay);
-    gui->remove(contentAccessPanel);
-    gui->remove(debugPanel);
+    gui.remove(hotbarView);
+    gui.remove(darkOverlay);
+    gui.remove(contentAccessPanel);
+    gui.remove(debugPanel);
 }
 
 /// @brief Remove all elements marked as removed
@@ -322,7 +322,7 @@ void Hud::updateWorldGenDebugVisualization() {
 void Hud::update(bool visible) {
     const auto& level = frontend.getLevel();
     const auto& chunks = *player.chunks;
-    auto menu = gui->getMenu();
+    const auto& menu = gui.getMenu();
 
     debugPanel->setVisible(player.debug && visible);
 
@@ -333,7 +333,7 @@ void Hud::update(bool visible) {
         setPause(false);
     }
 
-    if (!gui->isFocusCaught()) {
+    if (!gui.isFocusCaught()) {
         processInput(visible);
     }
     if ((pause || inventoryOpen) == Events::_cursor_locked) {
@@ -460,7 +460,7 @@ void Hud::showExchangeSlot() {
     exchangeSlot->setColor(glm::vec4());
     exchangeSlot->setInteractive(false);
     exchangeSlot->setZIndex(1);
-    gui->store(SlotView::EXCHANGE_SLOT_NAME, exchangeSlot);
+    gui.store(SlotView::EXCHANGE_SLOT_NAME, exchangeSlot);
 
 }
 
@@ -494,7 +494,7 @@ void Hud::openPermanent(UiDocument* doc) {
 
 void Hud::dropExchangeSlot() {
     auto slotView = std::dynamic_pointer_cast<SlotView>(
-        gui->get(SlotView::EXCHANGE_SLOT_NAME)
+        gui.get(SlotView::EXCHANGE_SLOT_NAME)
     );
     if (slotView == nullptr) {
         return;
@@ -518,7 +518,7 @@ void Hud::dropExchangeSlot() {
 
 void Hud::closeInventory() {
     dropExchangeSlot();
-    gui->remove(SlotView::EXCHANGE_SLOT_NAME);
+    gui.remove(SlotView::EXCHANGE_SLOT_NAME);
     exchangeSlot = nullptr;
     exchangeSlotInv = nullptr;
     inventoryOpen = false;
@@ -536,7 +536,7 @@ void Hud::closeInventory() {
 }
 
 void Hud::add(const HudElement& element, const dv::value& argsArray) {
-    gui->add(element.getNode());
+    gui.add(element.getNode());
     auto document = element.getDocument();
     if (document) {
         auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode());
@@ -572,7 +572,7 @@ void Hud::onRemove(const HudElement& element) {
             invview->unbind();
         }
     }
-    gui->remove(element.getNode());
+    gui.remove(element.getNode());
 }
 
 void Hud::remove(const std::shared_ptr<UINode>& node) {
@@ -681,7 +681,7 @@ void Hud::setPause(bool pause) {
         closeInventory();
     }
     
-    auto menu = gui->getMenu();
+    const auto& menu = gui.getMenu();
     if (pause) {
         menu->setPage("pause");
     } else {
@@ -713,10 +713,10 @@ void Hud::setContentAccess(bool flag) {
 void Hud::setDebugCheats(bool flag) {
     allowDebugCheats = flag;
     
-    gui->remove(debugPanel);
+    gui.remove(debugPanel);
     debugPanel = create_debug_panel(
         engine, frontend.getLevel(), player, allowDebugCheats
     );
     debugPanel->setZIndex(2);
-    gui->add(debugPanel);
+    gui.add(debugPanel);
 }
diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp
index ff518d07..79d183fa 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -73,7 +73,7 @@ class Hud : public util::ObjectsKeeper {
     Engine& engine;
     Assets& assets;
     std::unique_ptr<Camera> uicamera;
-    gui::GUI* gui;
+    gui::GUI& gui;
     LevelFrontend& frontend;
     Player& player;