X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=8d49a645f8e2b24d0a7c1dc4fe30ae6a5f347e8d;hb=1daba5b2fa044c1822d104fb65eeb88b6aeb5499;hp=54ceba081b035036164e6537919c8feca29e085e;hpb=b0c2d423138dfb4849c679b3fb93e4336dcf5845;p=blank.git diff --git a/src/world/block.cpp b/src/world/block.cpp index 54ceba0..8d49a64 100644 --- a/src/world/block.cpp +++ b/src/world/block.cpp @@ -81,6 +81,20 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s) noexcept , block_light(false) , collision(false) , collide_block(false) +, generate(false) +, min_solidity(0.5f) +, mid_solidity(0.75f) +, max_solidity(1.0f) +, min_humidity(-1.0f) +, mid_humidity(0.0f) +, max_humidity(1.0f) +, min_temperature(-1.0f) +, mid_temperature(0.0f) +, max_temperature(1.0f) +, min_richness(-1.0f) +, mid_richness(0.0f) +, max_richness(1.0f) +, commonness(1.0f) , fill({ false, false, false, false, false, false }) { } @@ -103,12 +117,8 @@ void BlockType::FillBlockModel( buf.colors.insert(buf.colors.end(), shape->VertexCount(), color); } -void BlockType::FillOutlineModel( - OutlineModel::Buffer &buf, - const glm::vec3 &pos_offset, - OutlineModel::Index idx_offset -) const noexcept { - shape->Outline(buf, pos_offset, idx_offset); +void BlockType::FillOutlineModel(OutlineModel::Buffer &buf) const noexcept { + shape->Outline(buf); buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color); }