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

InventoryView.addGrid semantics changed

Browse Source
This commit is contained in:
MihailRis 2024-01-21 19:21:18 +03:00
parent 9e3c4fb00c
commit aa93c27159
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/InventoryView.cpp
View File

@ -72,7 +72,7 @@ InventoryBuilder::InventoryBuilder()
{}
void InventoryBuilder::addGrid(
int cols, int rows,
int cols, int count,
glm::vec2 coord,
int padding,
SlotLayout slotLayout)
@ -80,6 +80,8 @@ void InventoryBuilder::addGrid(
const int slotSize = InventoryView::SLOT_SIZE;
const int interval = InventoryView::SLOT_INTERVAL;
int rows = ceildiv(count, cols);
uint width = cols * (slotSize + interval) - interval + padding*2;
uint height = rows * (slotSize + interval) - interval + padding*2;

2
src/frontend/InventoryView.h
View File

@ -72,7 +72,7 @@ public:
InventoryBuilder();
void addGrid(
int cols, int rows,
int cols, int count,
glm::vec2 coord,
int padding,
SlotLayout slotLayout);

14
src/frontend/hud.cpp
View File

@ -186,12 +186,10 @@ std::shared_ptr<InventoryView> HudRenderer::createContentAccess() {
inventory->getSlot(player->getChosenSlot()).set(item);
});
int columns = 8;
int rows = ceildiv(itemsCount-1, columns);
InventoryBuilder builder;
builder.addGrid(columns, rows, glm::vec2(), 8, slotLayout);
builder.addGrid(8, itemsCount-1, glm::vec2(), 8, slotLayout);
auto layout = builder.build();
auto contentAccess = std::make_shared<InventoryView>(
content,
frontend,
@ -211,7 +209,7 @@ std::shared_ptr<InventoryView> HudRenderer::createHotbar() {
SlotLayout slotLayout(glm::vec2(), false, false, nullptr, nullptr);
InventoryBuilder builder;
builder.addGrid(10, 1, glm::vec2(), 4, slotLayout);
builder.addGrid(10, 10, glm::vec2(), 4, slotLayout);
auto layout = builder.build();
layout->setOrigin(glm::vec2(layout->getSize().x/2, 0));
@ -236,13 +234,9 @@ std::shared_ptr<InventoryView> HudRenderer::createInventory() {
SlotLayout slotLayout(glm::vec2(), true, false, [=](ItemStack& stack) {
stack.clear();
}, nullptr);
int columns = 10;
int rows = ceildiv(inventory->size(), columns);
int padding = 4;
InventoryBuilder builder;
builder.addGrid(columns, rows, glm::vec2(), padding, slotLayout);
builder.addGrid(10, inventory->size(), glm::vec2(), 4, slotLayout);
auto layout = builder.build();
auto view = std::make_shared<InventoryView>(