X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.hpp;h=1c1dddb10c3e4377f6e5d1b6617be38eedf00674;hb=82426ae2997d2b21703d2d5afb631a84736e975f;hp=0f567c4b5fdf3400b5209ed64c76766a00f4fb88;hpb=7caa2326d25d4fc5ba98318dfccb508bb3e16820;p=blank.git diff --git a/src/block.hpp b/src/block.hpp index 0f567c4..1c1dddb 100644 --- a/src/block.hpp +++ b/src/block.hpp @@ -32,29 +32,17 @@ struct BlockType { static const NullShape DEFAULT_SHAPE; - void FillVBO( - const glm::vec3 &pos, - std::vector &vertices, - std::vector &colors, - std::vector &normals + void FillModel( + Model &m, + const glm::vec3 &pos_offset = { 0, 0, 0 }, + Model::Index idx_offset = 0 ) const; - - void FillModel(const glm::vec3 &pos, Model &m) const { - FillVBO(pos, m.vertices, m.colors, m.normals); - m.Invalidate(); - } - - - void FillOutlineVBO( - std::vector &vertices, - std::vector &colors + void FillOutlineModel( + OutlineModel &m, + const glm::vec3 &pos_offset = { 0, 0, 0 }, + OutlineModel::Index idx_offset = 0 ) const; - void FillOutlineModel(OutlineModel &m) const { - FillOutlineVBO(m.vertices, m.colors); - m.Invalidate(); - } - };