Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Block] Draw type 'Glass' added.

Browse Source
This commit is contained in:
Quentin Bazin 2020-02-03 15:38:34 +09:00
parent 70e80d1e31
commit 9afa1b6202
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/source/world/ChunkBuilder.cpp
View File

@ -89,7 +89,8 @@ std::array<std::size_t, ChunkBuilder::layers> ChunkBuilder::buildChunk(const Cli
if (block.drawType() == BlockDrawType::Solid if (block.drawType() == BlockDrawType::Solid
|| block.drawType() == BlockDrawType::AllFaces || block.drawType() == BlockDrawType::AllFaces
|| block.drawType() == BlockDrawType::Liquid) { || block.drawType() == BlockDrawType::Liquid
|| block.drawType() == BlockDrawType::Glass) {
for(u8 i = 0 ; i < 6 ; i++) { for(u8 i = 0 ; i < 6 ; i++) {
addFace(x, y, z, i, chunk, &block, surroundingBlocksPos[i]); addFace(x, y, z, i, chunk, &block, surroundingBlocksPos[i]);
} }
@ -125,7 +126,7 @@ inline void ChunkBuilder::addFace(u8 x, u8 y, u8 z, u8 i, const ClientChunk &chu
// Skip hidden faces // Skip hidden faces
if (surroundingBlock && surroundingBlock->id() if (surroundingBlock && surroundingBlock->id()
&& ((block->drawType() == BlockDrawType::Solid && surroundingBlock->drawType() == BlockDrawType::Solid && surroundingBlock->isOpaque()) && ((block->drawType() == BlockDrawType::Solid && surroundingBlock->drawType() == BlockDrawType::Solid && surroundingBlock->isOpaque())
|| (block->id() == surroundingBlock->id() && block->drawType() == BlockDrawType::Liquid))) || (block->id() == surroundingBlock->id() && (block->drawType() == BlockDrawType::Liquid || block->drawType() == BlockDrawType::Glass))))
return; return;
static glm::vec3 a, b, c, v1, v2, normal; static glm::vec3 a, b, c, v1, v2, normal;

1
common/include/world/Block.hpp
View File

@ -35,6 +35,7 @@ enum class BlockDrawType {
XShape = 1, XShape = 1,
AllFaces = 2, AllFaces = 2,
Liquid = 3, Liquid = 3,
Glass = 4,
}; };
class Block : public ISerializable { class Block : public ISerializable {

3
mods/default/blocks.lua
View File

@ -65,7 +65,8 @@ mod:block {
mod:block { mod:block {
id = "glass", id = "glass",
name = "Glass", name = "Glass",
tiles = "glass.png" tiles = "glass.png",
draw_type = 4 -- FIXME: Use string instead
} }
mod:block { mod:block {