Skip to content

クラフト機能実装 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ishi-eenn merged 1 commit into from
May 29, 2026
Merged

クラフト機能実装 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
| `Space` ×2（ダブルタップ） | 飛行モード / 重力モード切替 |
| `左クリック` | ブロックを壊す / モブを攻撃 |
| `右クリック` | ブロックを置く（弓装備中はチャージ→離して発射） |
| `1` 〜 `6` | ブロック種別選択（石 / 草 / 土 / 砂 / 雪 / 木材） |
| `9` | 弓を選択（ホットバー最後のスロットに常備） |
| `1` 〜 `9` | ホットバースロット選択 |
| `C` | クラフトメニュー表示 / 非表示 |
| `↑` `↓` | クラフトレシピ選択 |
| `Enter` | 選択中レシピをクラフト |
| `Esc` | カーソル解放 |

---
Expand Down Expand Up @@ -48,4 +50,4 @@ Cntlで下降できない場合は、以下のコマンドでアクセシビリ
```
# アクセシビリティのCtrl+マウスでカーソル位置表示を無効化
gsettings set org.gnome.desktop.interface locate-pointer false
```
```
275 changes: 144 additions & 131 deletions srcs/core/engine.cpp
View file
Open in desktop

Large diffs are not rendered by default.

219 changes: 212 additions & 7 deletions srcs/renderer/renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "renderer/renderer.hpp"
#include "types.hpp"
#include "world/world.hpp"
#include "world/recipe.hpp"
#include "network/client.hpp"
#include "mob/zombie.hpp"

Expand Down Expand Up @@ -1023,8 +1024,7 @@ void Renderer::drawHotbar(const Inventory& inv) {
for (int i = 0; i < HOTBAR_SIZE; ++i) {
const ItemStack& s = inv.slots[i];
if (s.type == BlockType::Air || s.count <= 0) continue;
if (s.type == BlockType::Bow) continue;
if (s.type == BlockType::Torch) continue;
if (isItem(s.type) || s.type == BlockType::Torch) continue;

AtlasUV uv = atlas_.getUV(s.type);
float uc = (uv.u0 + uv.u1) * 0.5f;
Expand Down Expand Up @@ -1086,16 +1086,16 @@ void Renderer::drawHotbar(const Inventory& inv) {
}
}

// 弓・松明は立方体としてではなく 2D アイコンとして表示する。
// アイテムと松明は立方体としてではなく 2D アイコンとして表示する。
{
hotbar_shader_.setFloat("uBright", 1.0f);
float verts[HOTBAR_SIZE * 6 * 4] = {};
int vc = 0, drawn = 0;

for (int i = 0; i < HOTBAR_SIZE; ++i) {
const ItemStack& s = inv.slots[i];
if ((s.type != BlockType::Bow && s.type != BlockType::Torch)
|| s.count <= 0) continue;
if (!(isItem(s.type) || s.type == BlockType::Torch) ||
s.count <= 0) continue;

AtlasUV uv = atlas_.getUV(s.type);
const float cx = nx(sx0_px + i * (SLOT_PX + GAP_PX) + SLOT_PX * 0.5f);
Expand Down Expand Up @@ -1146,9 +1146,9 @@ void Renderer::drawHotbar(const Inventory& inv) {
appendLine(verts.data(), cnt, x0, sy0, x0, sy1);
appendLine(verts.data(), cnt, x1, sy0, x1, sy1);

// 個数（2個以上のとき右下に表示）。Torch は無限供給なので個数は隠す。
// 個数（2個以上のとき右下に表示）。
const ItemStack& s = inv.slots[i];
if (s.type != BlockType::Air && s.type != BlockType::Torch && s.count > 1) {
if (s.type != BlockType::Air && s.count > 1) {
float dw = 8.0f / hw, dh = 11.0f / hh, dg = 2.0f / hw;
appendNumber(verts.data(), cnt, s.count,
x1 - 3.0f / hw, sy0 + dh + 3.0f / hh, dw, dh, dg);
Expand Down Expand Up @@ -1180,6 +1180,211 @@ void Renderer::drawHotbar(const Inventory& inv) {
glEnable(GL_DEPTH_TEST);
}

// ─────────────────────────────────────────────────────────────────────────────
// drawCraftMenu() — クラフトレシピ一覧をHUDに重ねて描画する
// ─────────────────────────────────────────────────────────────────────────────
void Renderer::drawCraftMenu(const Inventory& inv,
const std::vector<Recipe>& recipes,
int selected_recipe) {
if (recipes.empty()) return;

const float hw = static_cast<float>(width_) * 0.5f;
const float hh = static_cast<float>(height_) * 0.5f;

auto nx = [&](float px) { return px / hw - 1.0f; };
auto ny = [&](float py) { return py / hh - 1.0f; };

const int recipe_count = static_cast<int>(recipes.size());
selected_recipe %= recipe_count;
if (selected_recipe < 0) selected_recipe += recipe_count;

const float panel_w_px = std::min(500.0f, static_cast<float>(width_) - 40.0f);
const float row_h_px = 58.0f;
const float panel_h_px = 76.0f + row_h_px * static_cast<float>(recipe_count);
const float panel_x_px = (static_cast<float>(width_) - panel_w_px) * 0.5f;
const float panel_y_px = (static_cast<float>(height_) - panel_h_px) * 0.5f + 32.0f;
const float panel_top_px = panel_y_px + panel_h_px;

auto drawQuad = [&](float qx0, float qy0, float qx1, float qy1,
float r, float g, float b, float a) {
float q[12] = {
qx0, qy0, qx1, qy0, qx1, qy1,
qx0, qy0, qx1, qy1, qx0, qy1
};
glBindBuffer(GL_ARRAY_BUFFER, hotbar_vbo_);
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(q), q);
hud_shader_.setVec4("uColor", r, g, b, a);
glBindVertexArray(hotbar_vao_);
glDrawArrays(GL_TRIANGLES, 0, 6);
};

glDisable(GL_DEPTH_TEST);
hud_shader_.use();
drawQuad(nx(panel_x_px), ny(panel_y_px),
nx(panel_x_px + panel_w_px), ny(panel_top_px),
0.02f, 0.025f, 0.03f, 0.78f);
drawQuad(nx(panel_x_px), ny(panel_top_px - 5.0f),
nx(panel_x_px + panel_w_px), ny(panel_top_px),
0.95f, 0.70f, 0.22f, 0.92f);

for (int i = 0; i < recipe_count; ++i) {
const bool selected = i == selected_recipe;
const bool ready = canCraft(inv, recipes[i]);
const float row_top_px = panel_top_px - 58.0f - row_h_px * static_cast<float>(i);
const float row_bot_px = row_top_px - 48.0f;
const float x0 = nx(panel_x_px + 14.0f);
const float x1 = nx(panel_x_px + panel_w_px - 14.0f);

if (selected) {
drawQuad(x0, ny(row_bot_px), x1, ny(row_top_px),
ready ? 0.16f : 0.18f,
ready ? 0.20f : 0.12f,
ready ? 0.15f : 0.11f,
0.82f);
drawQuad(x0, ny(row_top_px - 3.0f), x1, ny(row_top_px),
0.95f, 0.70f, 0.22f, 0.95f);
} else {
drawQuad(x0, ny(row_bot_px), x1, ny(row_top_px),
ready ? 0.07f : 0.09f,
ready ? 0.10f : 0.075f,
ready ? 0.08f : 0.075f,
0.62f);
}
}

glDisable(GL_CULL_FACE);
hotbar_shader_.use();
hotbar_shader_.setInt("uAtlas", 0);
hotbar_shader_.setFloat("uBright", 1.0f);
atlas_.bind(0);
glBindVertexArray(hotbar_tex_vao_);

auto drawIcon = [&](BlockType type, float cx_px, float cy_px, float size_px) {
if (type == BlockType::Air) return;
AtlasUV uv = atlas_.getUV(type);
const float cx = nx(cx_px);
const float cy = ny(cy_px);
const float iw = size_px / hw;
const float ih = size_px / hh;
const float x0 = cx - iw * 0.5f;
const float x1 = cx + iw * 0.5f;
const float y0 = cy - ih * 0.5f;
const float y1 = cy + ih * 0.5f;
const float verts[24] = {
x0, y0, uv.u0, uv.v1,
x1, y0, uv.u1, uv.v1,
x1, y1, uv.u1, uv.v0,
x0, y0, uv.u0, uv.v1,
x1, y1, uv.u1, uv.v0,
x0, y1, uv.u0, uv.v0,
};
glBindBuffer(GL_ARRAY_BUFFER, hotbar_tex_vbo_);
glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(verts), verts);
glDrawArrays(GL_TRIANGLES, 0, 6);
};

for (int i = 0; i < recipe_count; ++i) {
const Recipe& r = recipes[i];
const float row_top_px = panel_top_px - 58.0f - row_h_px * static_cast<float>(i);
const float row_bot_px = row_top_px - 48.0f;
const float cy_px = (row_top_px + row_bot_px) * 0.5f;
drawIcon(r.output.type, panel_x_px + 38.0f, cy_px, 34.0f);
for (size_t j = 0; j < r.inputs.size() && j < 4; ++j)
drawIcon(r.inputs[j].type,
panel_x_px + panel_w_px - 178.0f + 44.0f * static_cast<float>(j),
cy_px, 30.0f);
}
glBindVertexArray(0);
glEnable(GL_CULL_FACE);

std::array<float, 2048> verts{};
int count = 0;

auto appendWord = [&](const char* word, float left_px, float top_px,
float w_px, float h_px, float gap_px) {
float x = nx(left_px);
const float y = ny(top_px);
const float w = w_px / hw;
const float h = h_px / hh;
const float gap = gap_px / hw;
for (int i = 0; word[i] != '\0'; ++i) {
if (word[i] == ' ') {
x += w * 0.55f + gap;
continue;
}
appendLetter(verts.data(), count, word[i], x, y, w, h);
x += w + gap;
}
};

auto appendWordRight = [&](const char* word, float right_px, float top_px,
float w_px, float h_px, float gap_px) {
int visible = 0;
int spaces = 0;
for (int i = 0; word[i] != '\0'; ++i) {
if (word[i] == ' ') ++spaces;
else ++visible;
}
const float total = static_cast<float>(visible) * w_px
+ static_cast<float>(visible + spaces - 1) * gap_px
+ static_cast<float>(spaces) * w_px * 0.55f;
appendWord(word, right_px - total, top_px, w_px, h_px, gap_px);
};

auto appendCount = [&](int value, float right_px, float top_px) {
appendNumber(verts.data(), count, value, nx(right_px), ny(top_px),
7.0f / hw, 10.0f / hh, 2.0f / hw);
};

appendWord("CRAFT", panel_x_px + 20.0f, panel_top_px - 18.0f,
13.0f, 19.0f, 5.0f);
appendWordRight("MATS", panel_x_px + panel_w_px - 36.0f,
panel_top_px - 18.0f, 10.0f, 15.0f, 4.0f);

for (int i = 0; i < recipe_count; ++i) {
const Recipe& r = recipes[i];
const bool ready = canCraft(inv, r);
const bool selected = i == selected_recipe;
const float row_top_px = panel_top_px - 58.0f - row_h_px * static_cast<float>(i);
const float row_bot_px = row_top_px - 48.0f;
const float cy_px = (row_top_px + row_bot_px) * 0.5f;

appendWord(r.name, panel_x_px + 68.0f, row_top_px - 14.0f,
11.0f, 16.0f, 4.0f);
appendWordRight(ready ? "CAN" : "NEED",
panel_x_px + panel_w_px - 18.0f,
row_top_px - 16.0f, 9.0f, 13.0f, 3.0f);

if (r.output.count > 1)
appendCount(r.output.count, panel_x_px + 58.0f, cy_px - 8.0f);
for (size_t j = 0; j < r.inputs.size() && j < 4; ++j) {
const float x = panel_x_px + panel_w_px - 160.0f
+ 44.0f * static_cast<float>(j);
appendCount(r.inputs[j].count, x, cy_px - 8.0f);
}

if (selected) {
const float x0 = nx(panel_x_px + 14.0f);
const float x1 = nx(panel_x_px + panel_w_px - 14.0f);
const float y0 = ny(row_bot_px);
const float y1 = ny(row_top_px);
appendLine(verts.data(), count, x0, y0, x1, y0);
appendLine(verts.data(), count, x0, y1, x1, y1);
appendLine(verts.data(), count, x0, y0, x0, y1);
appendLine(verts.data(), count, x1, y0, x1, y1);
}
}

glBindBuffer(GL_ARRAY_BUFFER, hud_vbo_);
glBufferSubData(GL_ARRAY_BUFFER, 0, count * sizeof(float), verts.data());
hud_shader_.use();
hud_shader_.setVec4("uColor", 0.95f, 0.92f, 0.80f, 0.96f);
glBindVertexArray(hud_vao_);
glDrawArrays(GL_LINES, 0, count / 2);
glBindVertexArray(0);
glEnable(GL_DEPTH_TEST);
}

// ─────────────────────────────────────────────────────────────────────────────
// drawUnderwaterOverlay() — 水中にいるとき画面を青くするオーバーレイ
//
Expand Down
3 changes: 3 additions & 0 deletions srcs/renderer/renderer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
struct GLFWwindow;
class World;
struct RemotePlayer;
struct Recipe;

class Renderer : public IRenderer {
public:
Expand All @@ -41,6 +42,8 @@ class Renderer : public IRenderer {
bool multiplayer);
void drawDeathScreen();
void drawHotbar(const Inventory& inv);
void drawCraftMenu(const Inventory& inv, const std::vector<Recipe>& recipes,
int selected_recipe);
void drawUnderwaterOverlay();
void drawFirstPersonHand(float walk_phase, float attack_timer_norm,
bool bow_equipped = false, float bow_charge = 0.0f);
Expand Down
15 changes: 10 additions & 5 deletions srcs/world/inventory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@
// ─────────────────────────────────────────────────────────────────────────────
#include "inventory.hpp"

static int stackLimit(BlockType type) {
return type == BlockType::Bow ? 1 : STACK_MAX;
}

void inventoryAdd(Inventory& inv, BlockType type, int n) {
if (n <= 0) return;
if (type == BlockType::Air || type == BlockType::Water ||
type == BlockType::ShortGrass || type == BlockType::Flower ||
type == BlockType::Mushroom)
return;

const int limit = stackLimit(type);

// 既存スタックに積む
for (int i = 0; i < HOTBAR_SIZE && n > 0; ++i) {
if (inv.slots[i].type == type && inv.slots[i].count < STACK_MAX) {
int add = STACK_MAX - inv.slots[i].count;
if (inv.slots[i].type == type && inv.slots[i].count < limit) {
int add = limit - inv.slots[i].count;
if (add > n) add = n;
inv.slots[i].count += add;
n -= add;
Expand All @@ -22,13 +28,12 @@ void inventoryAdd(Inventory& inv, BlockType type, int n) {
// 空きスロットを埋める
for (int i = 0; i < HOTBAR_SIZE && n > 0; ++i) {
if (inv.slots[i].type == BlockType::Air) {
int add = n > STACK_MAX ? STACK_MAX : n;
int add = n > limit ? limit : n;
inv.slots[i] = {type, add};
n -= add;
}
}
// インベントリ満杯: 残りは捨てる (Bow 等の上限1は STACK_MAX 側で表現される想定だが
// 現状 STACK_MAX=64 のため Bow も技術上は 64 まで積める。仕様上は気にしない)
// インベントリ満杯: 残りは捨てる
}

bool inventoryConsumeSelected(Inventory& inv) {
Expand Down
Loading