X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=d6e5507ddf5777f1b061dca6e256099d34397c68;hb=1bc2f230105ad6e1ee8d999ddc079cd85d244bf9;hp=5059a999ca85d5e0010dd2f3b1a3ebe4830c8170;hpb=07b8335e7bfd631e0878e183c87238812d632c56;p=blank.git diff --git a/src/world/block.cpp b/src/world/block.cpp index 5059a99..d6e5507 100644 --- a/src/world/block.cpp +++ b/src/world/block.cpp @@ -2,8 +2,6 @@ #include "BlockType.hpp" #include "BlockTypeRegistry.hpp" -#include "../model/geometry.hpp" - #include #include #include @@ -119,10 +117,10 @@ void BlockType::FillBlockMesh( buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod); } -void BlockType::FillOutlineMesh(OutlineMesh::Buffer &buf) const noexcept { +void BlockType::OutlinePrimitiveMesh(PrimitiveMesh::Buffer &buf) const noexcept { if (!shape) return; shape->Outline(buf); - buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color); + buf.colors.insert(buf.colors.end(), shape->OutlineCount(), glm::vec4(outline_color, 1.0f)); }