X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=d2453cf534a705fe5435a030500ca3e3960f64db;hb=3542823a1af7f5063d7cc8da84efa248eb889b8a;hp=aa8fc7772732f765ef684fdbed7e4d1b261936a7;hpb=957b1df87d9a692c517a269221da81227100240e;p=blank.git diff --git a/src/world/block.cpp b/src/world/block.cpp index aa8fc77..d2453cf 100644 --- a/src/world/block.cpp +++ b/src/world/block.cpp @@ -100,27 +100,27 @@ BlockType::BlockType() noexcept } -void BlockType::FillEntityModel( - EntityModel::Buffer &buf, +void BlockType::FillEntityMesh( + EntityMesh::Buffer &buf, const glm::mat4 &transform, - EntityModel::Index idx_offset + EntityMesh::Index idx_offset ) const noexcept { shape->Vertices(buf, transform, texture, idx_offset); buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod); buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod); } -void BlockType::FillBlockModel( - BlockModel::Buffer &buf, +void BlockType::FillBlockMesh( + BlockMesh::Buffer &buf, const glm::mat4 &transform, - BlockModel::Index idx_offset + BlockMesh::Index idx_offset ) const noexcept { shape->Vertices(buf, transform, texture, idx_offset); buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod); buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod); } -void BlockType::FillOutlineModel(OutlineModel::Buffer &buf) const noexcept { +void BlockType::FillOutlineMesh(OutlineMesh::Buffer &buf) const noexcept { shape->Outline(buf); buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color); }