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

Added 3 unicode pages for font, fixed UI, added Block.breakable

Browse Source 
Added 1, 2, 3 and 4 unicode pages from Minecraft.
Font now uses std::wstring instead of std::string
Added Block.breakable field (the only unbreakable block is bedrock)
Bedrock is now selectable
This commit is contained in:
MihailRis
2022-07-14 19:23:31 +03:00
committed by GitHub
parent b2872650d6
commit bdd3fbf7d4
17 changed files with 94 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/world_render.h
+9 -10
View File
@@ -41,7 +41,7 @@ int attrs[] = {
2, 0 //null terminator
};
int uiscale = 2;
int uiscale = 1;
LineBatch *lineBatch;
Batch2D *batch;
@@ -127,14 +127,13 @@ void draw_hud(World* world, Level* level, Assets* assets, bool devdata, int fps)
// draw debug info
Font* font = assets->getFont("normal");
batch->begin();
batch->texture(font->texture);
if (devdata){
font->drawWithShadow(batch, "chunks: "+std::to_string(chunks->chunksCount), 16, 16);
font->drawWithShadow(batch, std::to_string((int)player->camera->position.x), 10, 30);
font->drawWithShadow(batch, std::to_string((int)player->camera->position.y), 50, 30);
font->drawWithShadow(batch, std::to_string((int)player->camera->position.z), 90, 30);
font->drawWithShadow(batch, "fps:", 16, 42);
font->drawWithShadow(batch, std::to_string(fps), 40, 42);
font->drawWithShadow(batch, L"рандом chunks: "+std::to_wstring(chunks->chunksCount), 16, 16);
font->drawWithShadow(batch, std::to_wstring((int)player->camera->position.x), 10, 30);
font->drawWithShadow(batch, std::to_wstring((int)player->camera->position.y), 50, 30);
font->drawWithShadow(batch, std::to_wstring((int)player->camera->position.z), 90, 30);
font->drawWithShadow(batch, L"fps:", 16, 42);
font->drawWithShadow(batch, std::to_wstring(fps), 40, 42);
}
batch->render();
@@ -143,8 +142,8 @@ void draw_hud(World* world, Level* level, Assets* assets, bool devdata, int fps)
batch->texture(blocks);
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->sprite(14, Window::height-82, 68, 68, 16, texid, vec4(0.0f, 0.0f, 0.0f, 1.0f));
batch->sprite(16, Window::height-80, 64, 64, 16, texid, vec4(1.0f));
batch->render();
}