mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-08 20:41:49 +00:00
switch to inventory drop area
This commit is contained in:
parent
2a4b8b0297
commit
7c97966377
5 changed files with 75 additions and 41 deletions
|
|
@ -1,3 +1,5 @@
|
|||
#include <sstream>
|
||||
|
||||
#include "hud.hpp"
|
||||
|
||||
#include "ContentGfxCache.hpp"
|
||||
|
|
@ -174,6 +176,14 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
|
|||
gui,
|
||||
"<container size='4000' color='#00000080' z-index='-1' visible='false'/>"
|
||||
);
|
||||
|
||||
inventoryDropArea = guiutil::create(
|
||||
gui,
|
||||
R"(<container size='4000' color='#00000000' z-index='-1' visible='false'
|
||||
onclick='events.emit(\"core:drop_outside_inventory\", 0)'
|
||||
onrightclick='events.emit(\"core:drop_outside_inventory\", 1)'
|
||||
/>)"
|
||||
);
|
||||
|
||||
uicamera = std::make_unique<Camera>(glm::vec3(), 1);
|
||||
uicamera->perspective = false;
|
||||
|
|
@ -188,6 +198,7 @@ Hud::Hud(Engine& engine, LevelFrontend& frontend, Player& player)
|
|||
|
||||
gui.add(debugPanel);
|
||||
gui.add(darkOverlay);
|
||||
gui.add(inventoryDropArea);
|
||||
gui.add(hotbarView);
|
||||
gui.add(contentAccessPanel);
|
||||
|
||||
|
|
@ -213,6 +224,7 @@ Hud::~Hud() {
|
|||
}
|
||||
gui.remove(hotbarView);
|
||||
gui.remove(darkOverlay);
|
||||
gui.remove(inventoryDropArea);
|
||||
gui.remove(contentAccessPanel);
|
||||
gui.remove(debugPanel);
|
||||
}
|
||||
|
|
@ -358,6 +370,7 @@ void Hud::update(bool visible) {
|
|||
contentAccess->setMinSize(glm::vec2(1, windowSize.y));
|
||||
hotbarView->setVisible(visible && !(secondUI && !inventoryView));
|
||||
darkOverlay->setVisible(isMenuOpen);
|
||||
inventoryDropArea->setVisible(inventoryOpen);
|
||||
menu.setVisible(isMenuOpen);
|
||||
|
||||
if (visible) {
|
||||
|
|
@ -739,6 +752,10 @@ std::shared_ptr<Inventory> Hud::getSecondInventory() {
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
std::shared_ptr<Inventory> Hud::getExchangeInventory() {
|
||||
return exchangeSlotInv;
|
||||
}
|
||||
|
||||
bool Hud::isContentAccess() const {
|
||||
return showContentPanel;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ class Hud : public util::ObjectsKeeper {
|
|||
std::shared_ptr<gui::UINode> debugPanel;
|
||||
/// @brief Overlay used in pause mode
|
||||
std::shared_ptr<gui::UINode> darkOverlay;
|
||||
/// @brief Overlay used in inventory
|
||||
std::shared_ptr<gui::UINode> inventoryDropArea;
|
||||
/// @brief Inventories interaction agent (grabbed item)
|
||||
std::shared_ptr<gui::SlotView> exchangeSlot;
|
||||
/// @brief Exchange slot inventory (1 slot only)
|
||||
|
|
@ -207,6 +209,8 @@ public:
|
|||
|
||||
std::shared_ptr<Inventory> getSecondInventory();
|
||||
|
||||
std::shared_ptr<Inventory> getExchangeInventory();
|
||||
|
||||
bool isContentAccess() const;
|
||||
|
||||
void setContentAccess(bool flag);
|
||||
|
|
|
|||
|
|
@ -149,6 +149,15 @@ static int l_get_second_inventory(lua::State* L) {
|
|||
}
|
||||
}
|
||||
|
||||
static int l_get_exchange_inventory(lua::State* L) {
|
||||
auto inventory = hud->getExchangeInventory();
|
||||
if (inventory == nullptr) {
|
||||
return lua::pushinteger(L, 0);
|
||||
} else {
|
||||
return lua::pushinteger(L, inventory->getId());
|
||||
}
|
||||
}
|
||||
|
||||
static int l_get_player(lua::State* L) {
|
||||
auto player = hud->getPlayer();
|
||||
return lua::pushinteger(L, player->getId());
|
||||
|
|
@ -216,6 +225,7 @@ const luaL_Reg hudlib[] = {
|
|||
{"show_overlay", wrap_hud<l_show_overlay>},
|
||||
{"get_block_inventory", wrap_hud<l_get_block_inventory>},
|
||||
{"get_second_inventory", wrap_hud<l_get_second_inventory>},
|
||||
{"get_exchange_inventory", wrap_hud<l_get_exchange_inventory>},
|
||||
{"close", wrap_hud<l_close>},
|
||||
{"pause", wrap_hud<l_pause>},
|
||||
{"resume", wrap_hud<l_resume>},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue