From bb7c63394b7f5207a24df63bb2d394d67f66b8d5 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 29 Jun 2022 15:05:21 +0300 Subject: [PATCH] Fixed block preview texture selection --- src/declarations.h | 1 - src/world_render.h | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/declarations.h b/src/declarations.h index 01407ffc..43bacaeb 100644 --- a/src/declarations.h +++ b/src/declarations.h @@ -61,7 +61,6 @@ int initialize_assets(Assets* assets) { LOAD_SHADER("res/ui.glslv", "res/ui.glslf", "ui"); LOAD_TEXTURE("res/block.png", "block"); - LOAD_TEXTURE("res/block_select.png", "block_select"); LOAD_FONT("res/font.png", "normal"); return 0; diff --git a/src/world_render.h b/src/world_render.h index 887eae32..f94617f0 100644 --- a/src/world_render.h +++ b/src/world_render.h @@ -132,10 +132,12 @@ void draw_hud(Player* player, Assets* assets, bool devdata, int fps){ batch->render(); // choosen block preview - Texture* blocks = assets->getTexture("block_select"); + Texture* blocks = assets->getTexture("block"); batch->texture(blocks); - batch->sprite(14, 278, 68, 68, 16, player->choosenBlock, vec4(0.0f, 0.0f, 0.0f, 1.0f)); - batch->sprite(16, 280, 64, 64, 16, player->choosenBlock, vec4(1.0f)); + + int texid = Block::blocks[player->choosenBlock]->textureFaces[3]; // face-3 is top face of block + batch->sprite(14, 278, 68, 68, 16, texid, vec4(0.0f, 0.0f, 0.0f, 1.0f)); + batch->sprite(16, 280, 64, 64, 16, texid, vec4(1.0f)); batch->render(); }