PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor

Browse Source
This commit is contained in:
MihailRis
2024-12-21 09:55:44 +03:00
parent ba0610d857
commit f49feebd5c
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/hud.cpp
+19 -19
View File
@@ -154,7 +154,7 @@ static constexpr uint WORLDGEN_IMG_SIZE = 128U;
Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player) Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
: engine(engine), : engine(engine),
assets(*engine.getAssets()), assets(*engine.getAssets()),
gui(engine.getGUI()), gui(*engine.getGUI()),
frontend(frontend), frontend(frontend),
player(player), player(player),
debugImgWorldGen(std::make_unique<ImageData>( debugImgWorldGen(std::make_unique<ImageData>(
@@ -183,11 +183,11 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
engine, frontend.getLevel(), player, allowDebugCheats engine, frontend.getLevel(), player, allowDebugCheats
); );
debugPanel->setZIndex(2); debugPanel->setZIndex(2);
gui->add(debugPanel); gui.add(debugPanel);
gui->add(darkOverlay); gui.add(darkOverlay);
gui->add(hotbarView); gui.add(hotbarView);
gui->add(contentAccessPanel); gui.add(contentAccessPanel);
auto dplotter = std::make_shared<Plotter>(350, 250, 2000, 16); auto dplotter = std::make_shared<Plotter>(350, 250, 2000, 16);
dplotter->setGravity(Gravity::bottom_right); dplotter->setGravity(Gravity::bottom_right);
@@ -208,10 +208,10 @@ Hud::~Hud() {
for (auto& element : elements) { for (auto& element : elements) {
onRemove(element); onRemove(element);
} }
gui->remove(hotbarView); gui.remove(hotbarView);
gui->remove(darkOverlay); gui.remove(darkOverlay);
gui->remove(contentAccessPanel); gui.remove(contentAccessPanel);
gui->remove(debugPanel); gui.remove(debugPanel);
} }
/// @brief Remove all elements marked as removed /// @brief Remove all elements marked as removed
@@ -322,7 +322,7 @@ void Hud::updateWorldGenDebugVisualization() {
void Hud::update(bool visible) { void Hud::update(bool visible) {
const auto& level = frontend.getLevel(); const auto& level = frontend.getLevel();
const auto& chunks = *player.chunks; const auto& chunks = *player.chunks;
auto menu = gui->getMenu(); const auto& menu = gui.getMenu();
debugPanel->setVisible(player.debug && visible); debugPanel->setVisible(player.debug && visible);
@@ -333,7 +333,7 @@ void Hud::update(bool visible) {
setPause(false); setPause(false);
} }
if (!gui->isFocusCaught()) { if (!gui.isFocusCaught()) {
processInput(visible); processInput(visible);
} }
if ((pause || inventoryOpen) == Events::_cursor_locked) { if ((pause || inventoryOpen) == Events::_cursor_locked) {
@@ -460,7 +460,7 @@ void Hud::showExchangeSlot() {
exchangeSlot->setColor(glm::vec4()); exchangeSlot->setColor(glm::vec4());
exchangeSlot->setInteractive(false); exchangeSlot->setInteractive(false);
exchangeSlot->setZIndex(1); 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() { void Hud::dropExchangeSlot() {
auto slotView = std::dynamic_pointer_cast<SlotView>( auto slotView = std::dynamic_pointer_cast<SlotView>(
gui->get(SlotView::EXCHANGE_SLOT_NAME) gui.get(SlotView::EXCHANGE_SLOT_NAME)
); );
if (slotView == nullptr) { if (slotView == nullptr) {
return; return;
@@ -518,7 +518,7 @@ void Hud::dropExchangeSlot() {
void Hud::closeInventory() { void Hud::closeInventory() {
dropExchangeSlot(); dropExchangeSlot();
gui->remove(SlotView::EXCHANGE_SLOT_NAME); gui.remove(SlotView::EXCHANGE_SLOT_NAME);
exchangeSlot = nullptr; exchangeSlot = nullptr;
exchangeSlotInv = nullptr; exchangeSlotInv = nullptr;
inventoryOpen = false; inventoryOpen = false;
@@ -536,7 +536,7 @@ void Hud::closeInventory() {
} }
void Hud::add(const HudElement& element, const dv::value& argsArray) { void Hud::add(const HudElement& element, const dv::value& argsArray) {
gui->add(element.getNode()); gui.add(element.getNode());
auto document = element.getDocument(); auto document = element.getDocument();
if (document) { if (document) {
auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode()); auto invview = std::dynamic_pointer_cast<InventoryView>(element.getNode());
@@ -572,7 +572,7 @@ void Hud::onRemove(const HudElement& element) {
invview->unbind(); invview->unbind();
} }
} }
gui->remove(element.getNode()); gui.remove(element.getNode());
} }
void Hud::remove(const std::shared_ptr<UINode>& node) { void Hud::remove(const std::shared_ptr<UINode>& node) {
@@ -681,7 +681,7 @@ void Hud::setPause(bool pause) {
closeInventory(); closeInventory();
} }
auto menu = gui->getMenu(); const auto& menu = gui.getMenu();
if (pause) { if (pause) {
menu->setPage("pause"); menu->setPage("pause");
} else { } else {
@@ -713,10 +713,10 @@ void Hud::setContentAccess(bool flag) {
void Hud::setDebugCheats(bool flag) { void Hud::setDebugCheats(bool flag) {
allowDebugCheats = flag; allowDebugCheats = flag;
gui->remove(debugPanel); gui.remove(debugPanel);
debugPanel = create_debug_panel( debugPanel = create_debug_panel(
engine, frontend.getLevel(), player, allowDebugCheats engine, frontend.getLevel(), player, allowDebugCheats
); );
debugPanel->setZIndex(2); debugPanel->setZIndex(2);
gui->add(debugPanel); gui.add(debugPanel);
} }
src/frontend/hud.hpp
+1 -1
View File
@@ -73,7 +73,7 @@ class Hud : public util::ObjectsKeeper {
Engine& engine; Engine& engine;
Assets& assets; Assets& assets;
std::unique_ptr<Camera> uicamera; std::unique_ptr<Camera> uicamera;
gui::GUI* gui; gui::GUI& gui;
LevelFrontend& frontend; LevelFrontend& frontend;
Player& player; Player& player;